From c06b1c24897a0612937e16b9b109b3001e705c73 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Sat, 25 Jan 2003 14:35:40 +0000
Subject: [PATCH] Small bugfix: click_to_raise wasn't correctly set at first
run (ie when no config file was found)
(Old svn revision: 10867)
---
mcs-plugin/xfwm4_plugin.c | 2 +-
src/events.c | 2 +-
src/settings.c | 79 ++++++++++++++++++++-------------------
3 files changed, 43 insertions(+), 40 deletions(-)
diff --git a/mcs-plugin/xfwm4_plugin.c b/mcs-plugin/xfwm4_plugin.c
index f1b76dfe7..5ae668de4 100644
--- a/mcs-plugin/xfwm4_plugin.c
+++ b/mcs-plugin/xfwm4_plugin.c
@@ -1646,7 +1646,7 @@ static void create_channel(McsPlugin * mcs_plugin)
else
{
raise_on_click = TRUE;
- mcs_manager_set_int(mcs_plugin->manager, "Xfwm/RaiseOnClick", CHANNEL, focus_raise ? 1 : 0);
+ mcs_manager_set_int(mcs_plugin->manager, "Xfwm/RaiseOnClick", CHANNEL, raise_on_click ? 1 : 0);
}
setting = mcs_manager_setting_lookup(mcs_plugin->manager, "Xfwm/SnapToBorder", CHANNEL);
diff --git a/src/events.c b/src/events.c
index 556287d58..206fb7cbc 100644
--- a/src/events.c
+++ b/src/events.c
@@ -437,7 +437,7 @@ static inline void handleButtonPress(XButtonEvent * ev)
{
clientClose(c);
}
- else if(ev->button == Button3 && tclick == XFWM_BUTTON_DRAG)
+ else if(ev->button == Button3 && (tclick == XFWM_BUTTON_DRAG))
{
_moveRequest(c, (XEvent *) ev);
}
diff --git a/src/settings.c b/src/settings.c
index 52eea4080..2af1751e5 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -545,6 +545,7 @@ static gboolean loadKeyBindings(Settings rc[])
gboolean loadSettings(void)
{
Settings rc[] = {
+ /* Do not chnage the order of the following parameters */
{"active_text_color", NULL, FALSE},
{"inactive_text_color", NULL, FALSE},
{"active_border_color", NULL, FALSE},
@@ -565,51 +566,65 @@ gboolean loadSettings(void)
{"inactive_hilight_2", NULL, FALSE},
{"inactive_shadow_2", NULL, FALSE},
{"inactive_mid_2", NULL, FALSE},
- {"theme", NULL, TRUE},
- {"keytheme", NULL, TRUE},
- {"title_font", NULL, FALSE},
- {"title_alignment", NULL, TRUE},
- {"full_width_title", NULL, TRUE},
- {"title_shadow_active", NULL, TRUE},
- {"title_shadow_inactive", NULL, TRUE},
- {"button_layout", NULL, TRUE},
- {"button_spacing", NULL, TRUE},
- {"title_vertical_offset_active", NULL, TRUE},
- {"title_vertical_offset_inactive", NULL, TRUE},
- {"title_horizontal_offset", NULL, TRUE},
- {"button_offset", NULL, TRUE},
- {"double_click_action", NULL, TRUE},
+ /* You can change the order of the following parameters */
{"box_move", NULL, TRUE},
{"box_resize", NULL, TRUE},
+ {"button_layout", NULL, TRUE},
+ {"button_offset", NULL, TRUE},
+ {"button_spacing", NULL, TRUE},
{"click_to_focus", NULL, TRUE},
+ {"dbl_click_time", NULL, TRUE},
+ {"double_click_action", NULL, TRUE},
{"focus_hint", NULL, TRUE},
{"focus_new", NULL, TRUE},
- {"raise_on_focus", NULL, TRUE},
+ {"full_width_title", NULL, TRUE},
+ {"keytheme", NULL, TRUE},
{"raise_delay", NULL, TRUE},
+ {"raise_on_click", NULL, TRUE},
+ {"raise_on_focus", NULL, TRUE},
{"snap_to_border", NULL, TRUE},
{"snap_width", NULL, TRUE},
- {"dbl_click_time", NULL, TRUE},
+ {"theme", NULL, TRUE},
+ {"title_alignment", NULL, TRUE},
+ {"title_font", NULL, FALSE},
+ {"title_horizontal_offset", NULL, TRUE},
+ {"title_shadow_active", NULL, TRUE},
+ {"title_shadow_inactive", NULL, TRUE},
+ {"title_vertical_offset_active", NULL, TRUE},
+ {"title_vertical_offset_inactive", NULL, TRUE},
{"workspace_count", NULL, TRUE},
{"wrap_workspaces", NULL, TRUE},
+ /* Keys */
+ {"add_workspace_key", NULL, TRUE},
{"close_window_key", NULL, TRUE},
+ {"cycle_windows_key", NULL, TRUE},
+ {"del_workspace_key", NULL, TRUE},
{"hide_window_key", NULL, TRUE},
- {"maximize_window_key", NULL, TRUE},
- {"maximize_vert_key", NULL, TRUE},
{"maximize_horiz_key", NULL, TRUE},
- {"shade_window_key", NULL, TRUE},
- {"cycle_windows_key", NULL, TRUE},
- {"move_window_up_key", NULL, TRUE},
+ {"maximize_vert_key", NULL, TRUE},
+ {"maximize_window_key", NULL, TRUE},
{"move_window_down_key", NULL, TRUE},
{"move_window_left_key", NULL, TRUE},
+ {"move_window_next_workspace_key", NULL, TRUE},
+ {"move_window_prev_workspace_key", NULL, TRUE},
{"move_window_right_key", NULL, TRUE},
- {"resize_window_up_key", NULL, TRUE},
+ {"move_window_up_key", NULL, TRUE},
+ {"move_window_workspace_1_key", NULL, TRUE},
+ {"move_window_workspace_2_key", NULL, TRUE},
+ {"move_window_workspace_3_key", NULL, TRUE},
+ {"move_window_workspace_4_key", NULL, TRUE},
+ {"move_window_workspace_5_key", NULL, TRUE},
+ {"move_window_workspace_6_key", NULL, TRUE},
+ {"move_window_workspace_7_key", NULL, TRUE},
+ {"move_window_workspace_8_key", NULL, TRUE},
+ {"move_window_workspace_9_key", NULL, TRUE},
+ {"next_workspace_key", NULL, TRUE},
+ {"prev_workspace_key", NULL, TRUE},
{"resize_window_down_key", NULL, TRUE},
{"resize_window_left_key", NULL, TRUE},
{"resize_window_right_key", NULL, TRUE},
- {"next_workspace_key", NULL, TRUE},
- {"prev_workspace_key", NULL, TRUE},
- {"add_workspace_key", NULL, TRUE},
- {"del_workspace_key", NULL, TRUE},
+ {"resize_window_up_key", NULL, TRUE},
+ {"shade_window_key", NULL, TRUE},
{"stick_window_key", NULL, TRUE},
{"workspace_1_key", NULL, TRUE},
{"workspace_2_key", NULL, TRUE},
@@ -620,18 +635,6 @@ gboolean loadSettings(void)
{"workspace_7_key", NULL, TRUE},
{"workspace_8_key", NULL, TRUE},
{"workspace_9_key", NULL, TRUE},
- {"move_window_next_workspace_key", NULL, TRUE},
- {"move_window_prev_workspace_key", NULL, TRUE},
- {"move_window_workspace_1_key", NULL, TRUE},
- {"move_window_workspace_2_key", NULL, TRUE},
- {"move_window_workspace_3_key", NULL, TRUE},
- {"move_window_workspace_4_key", NULL, TRUE},
- {"move_window_workspace_5_key", NULL, TRUE},
- {"move_window_workspace_6_key", NULL, TRUE},
- {"move_window_workspace_7_key", NULL, TRUE},
- {"move_window_workspace_8_key", NULL, TRUE},
- {"move_window_workspace_9_key", NULL, TRUE},
- {"raise_on_click", NULL, TRUE},
{NULL, NULL, FALSE}
};
GValue tmp_val = { 0, };
--
GitLab