From 54a70700bcd37e5450f09c7bd12d8717e4e0ce42 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Mon, 31 Mar 2008 19:20:55 +0200 Subject: Center the moveresize popup even when shaded. --- openbox/moveresize.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'openbox') diff --git a/openbox/moveresize.c b/openbox/moveresize.c index c023340e..333144bc 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -108,10 +108,8 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b) c->frame->area.y - ob_rr_theme->fbwidth); else if (config_resize_popup_pos == OB_RESIZE_POS_CENTER) popup_position(popup, CenterGravity, - c->frame->area.x + c->frame->size.left + - c->area.width / 2, - c->frame->area.y + c->frame->size.top + - c->area.height / 2); + c->frame->area.x + c->frame->area.width / 2, + c->frame->area.y + c->frame->area.height / 2); else /* Fixed */ { Rect *area = screen_physical_area_active(); gint gravity, x, y; -- cgit v1.2.3 From 0e92465751019197a19680c56984664afb7c7999 Mon Sep 17 00:00:00 2001 From: Kadlcik Libor Date: Wed, 2 Apr 2008 22:24:41 +0200 Subject: Move "if"s out of the loop and rewrite the loop to use parse_find_node() to search for "file". --- openbox/config.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'openbox') diff --git a/openbox/config.c b/openbox/config.c index 00efd5ec..d2745178 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -788,25 +788,25 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, gpointer data) { xmlNodePtr n; - for (node = node->children; node; node = node->next) { - if (!xmlStrcasecmp(node->name, (const xmlChar*) "file")) { - gchar *c; + node = node->children; - c = parse_string(doc, node); + if ((n = parse_find_node("hideDelay", node))) + config_menu_hide_delay = parse_int(doc, n); + if ((n = parse_find_node("middle", node))) + config_menu_middle = parse_bool(doc, n); + if ((n = parse_find_node("submenuShowDelay", node))) + config_submenu_show_delay = parse_int(doc, n); + if ((n = parse_find_node("applicationIcons", node))) + config_menu_client_list_icons = parse_bool(doc, n); + if ((n = parse_find_node("manageDesktops", node))) + config_menu_manage_desktops = parse_bool(doc, n); + + while ((node = parse_find_node("file", node))) { + gchar *c = parse_string(doc, node); config_menu_files = g_slist_append(config_menu_files, parse_expand_tilde(c)); g_free(c); - } - if ((n = parse_find_node("hideDelay", node))) - config_menu_hide_delay = parse_int(doc, n); - if ((n = parse_find_node("middle", node))) - config_menu_middle = parse_bool(doc, n); - if ((n = parse_find_node("submenuShowDelay", node))) - config_submenu_show_delay = parse_int(doc, n); - if ((n = parse_find_node("applicationIcons", node))) - config_menu_client_list_icons = parse_bool(doc, n); - if ((n = parse_find_node("manageDesktops", node))) - config_menu_manage_desktops = parse_bool(doc, n); + node = node->next; } } -- cgit v1.2.3 From fe7e51af32fecb116a4bfce57dc95ad111c4333a Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Tue, 18 Mar 2008 21:51:34 +0100 Subject: Show the resize popup right away. Previously, it would wait for a resize step before showing it, when resizing windows with resize increments that were bigger than the moveresize threshold. --- openbox/moveresize.c | 89 ++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 45 deletions(-) (limited to 'openbox') diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 333144bc..fb527767 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -63,6 +63,8 @@ static gboolean waiting_for_sync; static ObPopup *popup = NULL; +static void do_move(gboolean keyboard, gint keydist); +static void do_resize(void); static void do_edge_warp(gint x, gint y); static void cancel_edge_warp(); #ifdef SYNC @@ -357,53 +359,52 @@ static void do_resize(void) h = cur_h; client_try_configure(moveresize_client, &x, &y, &w, &h, &lw, &lh, TRUE); - if (w == moveresize_client->area.width && - h == moveresize_client->area.height) + if (!w == moveresize_client->area.width && + h == moveresize_client->area.height) { - return; - } #ifdef SYNC - if (config_resize_redraw && extensions_sync && - moveresize_client->sync_request && moveresize_client->sync_counter && - !moveresize_client->not_responding) - { - XEvent ce; - XSyncValue val; - - /* are we already waiting for the sync counter to catch up? */ - if (waiting_for_sync) - return; - - /* increment the value we're waiting for */ - ++moveresize_client->sync_counter_value; - XSyncIntToValue(&val, moveresize_client->sync_counter_value); - - /* tell the client what we're waiting for */ - ce.xclient.type = ClientMessage; - ce.xclient.message_type = prop_atoms.wm_protocols; - ce.xclient.display = ob_display; - ce.xclient.window = moveresize_client->window; - ce.xclient.format = 32; - ce.xclient.data.l[0] = prop_atoms.net_wm_sync_request; - ce.xclient.data.l[1] = event_curtime; - ce.xclient.data.l[2] = XSyncValueLow32(val); - ce.xclient.data.l[3] = XSyncValueHigh32(val); - ce.xclient.data.l[4] = 0l; - XSendEvent(ob_display, moveresize_client->window, FALSE, - NoEventMask, &ce); - - waiting_for_sync = TRUE; - - ob_main_loop_timeout_remove(ob_main_loop, sync_timeout_func); - ob_main_loop_timeout_add(ob_main_loop, G_USEC_PER_SEC * 2, - sync_timeout_func, - NULL, NULL, NULL); - } + if (config_resize_redraw && extensions_sync && + moveresize_client->sync_request && + moveresize_client->sync_counter && + !moveresize_client->not_responding) + { + XEvent ce; + XSyncValue val; + + /* are we already waiting for the sync counter to catch up? */ + if (waiting_for_sync) + return; + + /* increment the value we're waiting for */ + ++moveresize_client->sync_counter_value; + XSyncIntToValue(&val, moveresize_client->sync_counter_value); + + /* tell the client what we're waiting for */ + ce.xclient.type = ClientMessage; + ce.xclient.message_type = prop_atoms.wm_protocols; + ce.xclient.display = ob_display; + ce.xclient.window = moveresize_client->window; + ce.xclient.format = 32; + ce.xclient.data.l[0] = prop_atoms.net_wm_sync_request; + ce.xclient.data.l[1] = event_curtime; + ce.xclient.data.l[2] = XSyncValueLow32(val); + ce.xclient.data.l[3] = XSyncValueHigh32(val); + ce.xclient.data.l[4] = 0l; + XSendEvent(ob_display, moveresize_client->window, FALSE, + NoEventMask, &ce); + + waiting_for_sync = TRUE; + + ob_main_loop_timeout_remove(ob_main_loop, sync_timeout_func); + ob_main_loop_timeout_add(ob_main_loop, G_USEC_PER_SEC * 2, + sync_timeout_func, NULL, NULL, NULL); + } #endif - client_configure(moveresize_client, cur_x, cur_y, cur_w, cur_h, - TRUE, FALSE, FALSE); + client_configure(moveresize_client, cur_x, cur_y, cur_w, cur_h, + TRUE, FALSE, FALSE); + } /* this would be better with a fixed width font ... XXX can do it better if there are 2 text boxes */ @@ -411,9 +412,7 @@ static void do_resize(void) (config_resize_popup_show == 1 && /* == "Nonpixel" */ moveresize_client->size_inc.width > 1 && moveresize_client->size_inc.height > 1)) - popup_coords(moveresize_client, "%d x %d", - moveresize_client->logical_size.width, - moveresize_client->logical_size.height); + popup_coords(moveresize_client, "%d x %d", lw, lh); } #ifdef SYNC -- cgit v1.2.3 From 92bba40cf21cb13aad1fccb421e131ea3049688f Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Wed, 19 Mar 2008 12:49:50 +0100 Subject: Don't use GrabModeSync, it hangs the xserver on chains sometimes. More or less a revert of 5bfa48dcffec3b00d119d851cb2427a43f80aa7b "Grab key bindings with GrabModeSync" See also bug #3582. --- openbox/keyboard.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'openbox') diff --git a/openbox/keyboard.c b/openbox/keyboard.c index e62cff8a..8c5b5543 100644 --- a/openbox/keyboard.c +++ b/openbox/keyboard.c @@ -53,13 +53,13 @@ static void grab_keys(gboolean grab) while (p) { if (p->key) grab_key(p->key, p->state, RootWindow(ob_display, ob_screen), - GrabModeSync); + GrabModeAsync); p = p->next_sibling; } if (curpos) grab_key(config_keyboard_reset_keycode, config_keyboard_reset_state, - RootWindow(ob_display, ob_screen), GrabModeSync); + RootWindow(ob_display, ob_screen), GrabModeAsync); } } @@ -263,8 +263,6 @@ void keyboard_event(ObClient *client, const XEvent *e) } p = p->next_sibling; } - - XAllowEvents(ob_display, AsyncKeyboard, event_curtime); } static void node_rebind(KeyBindingTree *node) -- cgit v1.2.3 From a7bbdf7d6199d1289f5ecc1b4e25632d88d75387 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Wed, 23 Apr 2008 16:40:22 +0200 Subject: Fix typo introduced a few commits ago that made resizing windows hard. --- openbox/moveresize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openbox') diff --git a/openbox/moveresize.c b/openbox/moveresize.c index fb527767..f324818d 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -359,8 +359,8 @@ static void do_resize(void) h = cur_h; client_try_configure(moveresize_client, &x, &y, &w, &h, &lw, &lh, TRUE); - if (!w == moveresize_client->area.width && - h == moveresize_client->area.height) + if (!(w == moveresize_client->area.width && + h == moveresize_client->area.height)) { #ifdef SYNC -- cgit v1.2.3