X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2Fhud_config.qc;h=80a28a48a96eec7c8f487bf7c985b64bfe70e9a1;hb=6f964ff41762dd2ccb8627aa54dc7e10070e1962;hp=5fca9d28fa7444ff22544445a895fee4a2c8c194;hpb=423c31082a256c5082afb5532c3fe5c788315708;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc index 5fca9d28f..80a28a48a 100644 --- a/qcsrc/client/hud_config.qc +++ b/qcsrc/client/hud_config.qc @@ -45,9 +45,6 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_Cvar_q("hud_configure_grid_ysize"); HUD_Write("\n"); - HUD_Write_Cvar_q("scr_centerpos"); - HUD_Write("\n"); - // common cvars for all panels float i; for (i = 0; i < HUD_PANEL_NUM; ++i) @@ -103,6 +100,7 @@ void HUD_Panel_ExportCfg(string cfgname) break; case HUD_PANEL_NOTIFY: HUD_Write_PanelCvar_q("_flip"); + HUD_Write_PanelCvar_q("_fontsize"); HUD_Write_PanelCvar_q("_print"); break; case HUD_PANEL_RADAR: @@ -121,17 +119,23 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write_PanelCvar_q("_flip"); HUD_Write_PanelCvar_q("_baralign"); HUD_Write_PanelCvar_q("_progressbar"); + HUD_Write_PanelCvar_q("_acceleration_mode"); + break; + case HUD_PANEL_CENTERPRINT: + HUD_Write_PanelCvar_q("_align"); + HUD_Write_PanelCvar_q("_fontscale"); + HUD_Write_PanelCvar_q("_time"); break; } HUD_Write("\n"); } HUD_Write("menu_sync\n"); // force the menu to reread the cvars, so that the dialogs are updated - print("^2Successfully exported to ", filename, "! (Note: It's saved in data/data/)\n"); + print(sprintf(_("^2Successfully exported to %s! (Note: It's saved in data/data/)\n"), filename)); fclose(fh); } else - print("^1Couldn't write to ", filename, "\n"); + print(sprintf(_("^1Couldn't write to %s\n"), filename)); } // check if move will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector @@ -543,10 +547,13 @@ void HUD_Panel_Arrow_Action(float nPrimary) } } +const float S_MOUSE1 = 1; +const float S_MOUSE2 = 2; +const float S_MOUSE3 = 4; float mouseClicked; float prevMouseClicked; // previous state -float prevMouseClickedTime; // time during previous mouse click, to check for doubleclicks -vector prevMouseClickedPos; // pos during previous mouse click, to check for doubleclicks +float prevMouseClickedTime; // time during previous left mouse click, to check for doubleclicks +vector prevMouseClickedPos; // pos during previous left mouse click, to check for doubleclicks void HUD_Panel_EnableMenu(); float tab_panels[HUD_PANEL_NUM]; @@ -608,14 +615,17 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) if(nPrimary == K_MOUSE1) { - if(bInputType == 0) { // key pressed - mouseClicked = 1; - return true; - } - else if(bInputType == 1) {// key released - mouseClicked = 0; - return true; - } + if(bInputType == 0) // key pressed + mouseClicked |= S_MOUSE1; + else if(bInputType == 1) // key released + mouseClicked -= (mouseClicked & S_MOUSE1); + } + else if(nPrimary == K_MOUSE2) + { + if(bInputType == 0) // key pressed + mouseClicked |= S_MOUSE2; + else if(bInputType == 1) // key released + mouseClicked -= (mouseClicked & S_MOUSE2); } else if(nPrimary == K_ESCAPE) { @@ -625,6 +635,13 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) menu_enabled_time = time; localcmd("menu_showhudexit\n"); } + else if(nPrimary == K_BACKSPACE && hudShiftState & S_CTRL) + { + if (bInputType == 1) + return true; + if (!menu_enabled) + cvar_set("_hud_configure", "0"); + } else if(nPrimary == K_TAB && hudShiftState & S_CTRL) // select and highlight another panel { if (bInputType == 1 || mouseClicked) @@ -804,7 +821,7 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary) return true; } -float HUD_Panel_Check_Mouse_Pos() +float HUD_Panel_Check_Mouse_Pos(float allow_move) { float i, j, border; @@ -818,7 +835,7 @@ float HUD_Panel_Check_Mouse_Pos() border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize // move - if(mousepos_x >= panel_pos_x && mousepos_y >= panel_pos_y && mousepos_x <= panel_pos_x + panel_size_x && mousepos_y <= panel_pos_y + panel_size_y) + if(allow_move && mousepos_x >= panel_pos_x && mousepos_y >= panel_pos_y && mousepos_x <= panel_pos_x + panel_size_x && mousepos_y <= panel_pos_y + panel_size_y) { return 1; } @@ -884,7 +901,7 @@ void HUD_Panel_FirstInDrawQ(float id) hud_panelorder_prev = strzone(autocvar__hud_panelorder); // prevent HUD_Main from doing useless update, we already updated here } -void HUD_Panel_Highlight() +void HUD_Panel_Highlight(float allow_move) { float i, j, border; @@ -898,7 +915,7 @@ void HUD_Panel_Highlight() border = max(8, panel_bg_border); // FORCED border so a small border size doesn't mean you can't resize // move - if(mousepos_x >= panel_pos_x && mousepos_y >= panel_pos_y && mousepos_x <= panel_pos_x + panel_size_x && mousepos_y <= panel_pos_y + panel_size_y) + if(allow_move && mousepos_x >= panel_pos_x && mousepos_y >= panel_pos_y && mousepos_x <= panel_pos_x + panel_size_x && mousepos_y <= panel_pos_y + panel_size_y) { highlightedPanel = i; HUD_Panel_FirstInDrawQ(i); @@ -998,7 +1015,7 @@ void HUD_Panel_Mouse() tab_panel = -1; reset_tab_panels(); } - HUD_Panel_Highlight(); // sets highlightedPanel, highlightedAction, panel_click_distance, panel_click_resizeorigin + HUD_Panel_Highlight(mouseClicked & S_MOUSE1); // sets highlightedPanel, highlightedAction, panel_click_distance, panel_click_resizeorigin // and calls HUD_Panel_UpdatePosSizeForId() for the highlighted panel if (highlightedPanel != -1) { @@ -1006,15 +1023,19 @@ void HUD_Panel_Mouse() highlightedPanel_initial_size = panel_size; } // doubleclick check - if (time - prevMouseClickedTime < 0.4 && highlightedPanel != -1 && prevMouseClickedPos == mousepos) + if ((mouseClicked & S_MOUSE1) && time - prevMouseClickedTime < 0.4 && highlightedPanel != -1 && prevMouseClickedPos == mousepos) { mouseClicked = 0; // to prevent spam, I guess. HUD_Panel_EnableMenu(); } else { - prevMouseClickedTime = time; - prevMouseClickedPos = mousepos; + if (mouseClicked & S_MOUSE1) + { + prevMouseClickedTime = time; + prevMouseClickedPos = mousepos; + } + mouse_over_panel = HUD_Panel_Check_Mouse_Pos(mouseClicked & S_MOUSE1); } } else @@ -1064,7 +1085,7 @@ void HUD_Panel_Mouse() if(menu_enabled == 2) mouse_over_panel = 0; else - mouse_over_panel = HUD_Panel_Check_Mouse_Pos(); + mouse_over_panel = HUD_Panel_Check_Mouse_Pos(TRUE); if (mouse_over_panel && tab_panel == -1) drawfill(panel_pos - '1 1 0' * panel_bg_border, panel_size + '2 2 0' * panel_bg_border, '1 1 1', .1, DRAWFLAG_NORMAL); } @@ -1093,4 +1114,4 @@ void HUD_Panel_HlBorder(float myBorder, vector color, float alpha) drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * (panel_size_y + 2 * myBorder - hlBorderSize), hlBorder, '8 1 0' * hlBorderSize, eX * (panel_size_x + 2 * myBorder) + eY * hlBorderSize, color, alpha, DRAWFLAG_NORMAL); drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize, hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, alpha, DRAWFLAG_NORMAL); drawpic_tiled(panel_pos - '1 1 0' * myBorder + eY * hlBorderSize + eX * (panel_size_x + 2 * myBorder - hlBorderSize), hlBorder2, '1 8 0' * hlBorderSize, eY * (panel_size_y + 2 * myBorder - 2 * hlBorderSize) + eX * hlBorderSize, color, alpha, DRAWFLAG_NORMAL); -} \ No newline at end of file +}