#include "propwin.h"
#include "mouse.h"
#include "mainloop.h"
-#include "framerender.h"
#include "focus.h"
#include "focus_cycle.h"
#include "moveresize.h"
focus_left_screen = FALSE;
- focus_fallback(FALSE, FALSE, TRUE);
+ focus_fallback(FALSE, config_focus_under_mouse, TRUE);
/* We don't get a FocusOut for this case, because it's just moving
from our Inferior up to us. This happens when iconifying a
*/
if (!focus_left_screen)
- focus_fallback(FALSE, FALSE, TRUE);
+ focus_fallback(FALSE, config_focus_under_mouse, TRUE);
}
}
else if (!client)
ob_debug_type(OB_DEBUG_FOCUS,
"Focus went to an unmanaged window 0x%x !\n",
ce.xfocus.window);
- focus_fallback(TRUE, FALSE, TRUE);
+ focus_fallback(TRUE, config_focus_under_mouse, TRUE);
}
}
} else if (msgtype == prop_atoms.net_showing_desktop) {
screen_show_desktop(e->xclient.data.l[0] != 0, NULL);
} else if (msgtype == prop_atoms.ob_control) {
+ ob_debug("OB_CONTROL: %d\n", e->xclient.data.l[0]);
if (e->xclient.data.l[0] == 1)
ob_reconfigure();
else if (e->xclient.data.l[0] == 2)
}
break;
case PropertyNotify:
- if (e->xproperty.atom == prop_atoms.net_desktop_names)
+ if (e->xproperty.atom == prop_atoms.net_desktop_names) {
+ ob_debug("UPDATE DESKTOP NAMES\n");
screen_update_desktop_names();
+ }
else if (e->xproperty.atom == prop_atoms.net_desktop_layout)
screen_update_layout();
break;
switch (con) {
case OB_FRAME_CONTEXT_MAXIMIZE:
client->frame->max_press = (e->type == ButtonPress);
- framerender_frame(client->frame);
+ frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_CLOSE:
client->frame->close_press = (e->type == ButtonPress);
- framerender_frame(client->frame);
+ frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_ICONIFY:
client->frame->iconify_press = (e->type == ButtonPress);
- framerender_frame(client->frame);
+ frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_ALLDESKTOPS:
client->frame->desk_press = (e->type == ButtonPress);
- framerender_frame(client->frame);
+ frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_SHADE:
client->frame->shade_press = (e->type == ButtonPress);
- framerender_frame(client->frame);
+ frame_adjust_state(client->frame);
break;
default:
/* nothing changes with clicks for any other contexts */
notify is sent or not */
}
- if (move || resize) {
+ {
gint lw,lh;
client_try_configure(client, &x, &y, &w, &h, &lw, &lh, FALSE);
client_find_onscreen(client, &x, &y, w, h, FALSE);
- /* if they requested something that moves the window, or if
- the window is actually being changed then configure it and
- send a configure notify to them */
- if (move || !RECT_EQUAL_DIMS(client->area, x, y, w, h)) {
- gulong ignore_start;
-
- ob_debug("Granting ConfigureRequest x %d y %d w %d h %d\n",
- x, y, w, h);
- ignore_start = event_start_ignore_all_enters();
- client_configure(client, x, y, w, h, FALSE, TRUE);
- event_end_ignore_all_enters(ignore_start);
- }
+ ob_debug("Granting ConfigureRequest x %d y %d w %d h %d\n",
+ x, y, w, h);
+ client_configure(client, x, y, w, h, FALSE, TRUE, TRUE);
}
break;
}
if ((unsigned)e->xclient.data.l[0] < screen_num_desktops ||
(unsigned)e->xclient.data.l[0] == DESKTOP_ALL)
client_set_desktop(client, (unsigned)e->xclient.data.l[0],
- FALSE);
+ FALSE, FALSE);
} else if (msgtype == prop_atoms.net_wm_state) {
gulong ignore_start;
moveresize_end(TRUE);
} else if (msgtype == prop_atoms.net_moveresize_window) {
gint ograv, x, y, w, h;
- gulong ignore_start;
ograv = client->gravity;
client_find_onscreen(client, &x, &y, w, h, FALSE);
- /* ignore enter events caused by these like ob actions do */
- ignore_start = event_start_ignore_all_enters();
- client_configure(client, x, y, w, h, FALSE, TRUE);
- event_end_ignore_all_enters(ignore_start);
+ client_configure(client, x, y, w, h, FALSE, TRUE, FALSE);
client->gravity = ograv;
} else if (msgtype == prop_atoms.net_restack_window) {
/* send a synthetic ConfigureNotify, cuz this is supposed
to be like a ConfigureRequest. */
- client_reconfigure(client);
+ client_reconfigure(client, TRUE);
} else
ob_debug_type(OB_DEBUG_APP_BUGS,
"_NET_RESTACK_WINDOW sent for window %s "
msgtype = e->xproperty.atom;
if (msgtype == XA_WM_NORMAL_HINTS) {
+ ob_debug("Update NORMAL hints\n");
client_update_normal_hints(client);
/* normal hints can make a window non-resizable */
- client_setup_decor_and_functions(client, TRUE);
+ client_setup_decor_and_functions(client, FALSE);
+
+ /* make sure the client's sizes are within its bounds, but only
+ reconfigure the window if it needs to. emacs will update its
+ normal hints every time it receives a conigurenotify */
+ client_reconfigure(client, FALSE);
} else if (msgtype == XA_WM_HINTS) {
client_update_wmhints(client);
} else if (msgtype == XA_WM_TRANSIENT_FOR) {
#ifdef SHAPE
if (extensions_shape && e->type == extensions_shape_event_basep) {
client->shaped = ((XShapeEvent*)e)->shaped;
- frame_adjust_shape(client->frame);
+ frame_adjust_area(client->frame, FALSE, TRUE, FALSE);
}
#endif
}
in the case where it is animating before disappearing */
if (!client || !frame_iconify_animating(client->frame))
mouse_event(client, e);
- } else if (e->type == KeyPress) {
+ } else
keyboard_event((focus_cycle_target ? focus_cycle_target :
(client ? client : focus_client)), e);
- }
}
}
void event_cancel_all_key_grabs()
{
- if (keyboard_interactively_grabbed())
+ if (keyboard_interactively_grabbed()) {
keyboard_interactive_cancel();
- else if (menu_frame_visible)
+ ob_debug("KILLED interactive event\n");
+ }
+ else if (menu_frame_visible) {
menu_frame_hide_all();
- else if (grab_on_keyboard())
+ ob_debug("KILLED open menus\n");
+ }
+ else if (grab_on_keyboard()) {
ungrab_keyboard();
+ ob_debug("KILLED active grab on keyboard\n");
+ }
else
- /* If we don't have the keyboard grabbed, then ungrab it with
- XUngrabKeyboard, so that there is not a passive grab left
- on from the KeyPress. If the grab is left on, and focus
- moves during that time, it will be NotifyWhileGrabbed, and
- applications like to ignore those! */
- if (!keyboard_interactively_grabbed())
- XUngrabKeyboard(ob_display, CurrentTime);
-
+ ungrab_passive_key();
}
gboolean event_time_after(Time t1, Time t2)