XEvent ce;
Atom msgtype;
int i=0;
+ ObFrameContext con;
switch (e->type) {
case ButtonPress:
client_iconify(client, TRUE, TRUE);
frame_adjust_focus(client->frame, FALSE);
break;
+ case LeaveNotify:
+ con = frame_context(client, e->xcrossing.window);
+ switch (con) {
+ case OB_FRAME_CONTEXT_MAXIMIZE:
+ client->frame->max_hover = FALSE;
+ frame_adjust_state(client->frame);
+ break;
+ case OB_FRAME_CONTEXT_ALLDESKTOPS:
+ client->frame->desk_hover = FALSE;
+ frame_adjust_state(client->frame);
+ break;
+ case OB_FRAME_CONTEXT_SHADE:
+ client->frame->shade_hover = FALSE;
+ frame_adjust_state(client->frame);
+ break;
+ case OB_FRAME_CONTEXT_ICONIFY:
+ client->frame->iconify_hover = FALSE;
+ frame_adjust_state(client->frame);
+ break;
+ case OB_FRAME_CONTEXT_CLOSE:
+ client->frame->close_hover = FALSE;
+ frame_adjust_state(client->frame);
+ break;
+ default:
+ break;
+ }
+ break;
case EnterNotify:
- if (client_normal(client)) {
- if (ob_state() == OB_STATE_STARTING) {
- /* move it to the top of the focus order */
- guint desktop = client->desktop;
- if (desktop == DESKTOP_ALL) desktop = screen_desktop;
- focus_order[desktop] = g_list_remove(focus_order[desktop],
- client);
- focus_order[desktop] = g_list_prepend(focus_order[desktop],
- client);
- } else if (config_focus_follow) {
+ con = frame_context(client, e->xcrossing.window);
+ switch (con) {
+ case OB_FRAME_CONTEXT_MAXIMIZE:
+ client->frame->max_hover = TRUE;
+ frame_adjust_state(client->frame);
+ break;
+ case OB_FRAME_CONTEXT_ALLDESKTOPS:
+ client->frame->desk_hover = TRUE;
+ frame_adjust_state(client->frame);
+ break;
+ case OB_FRAME_CONTEXT_SHADE:
+ client->frame->shade_hover = TRUE;
+ frame_adjust_state(client->frame);
+ break;
+ case OB_FRAME_CONTEXT_ICONIFY:
+ client->frame->iconify_hover = TRUE;
+ frame_adjust_state(client->frame);
+ break;
+ case OB_FRAME_CONTEXT_CLOSE:
+ client->frame->close_hover = TRUE;
+ frame_adjust_state(client->frame);
+ break;
+ case OB_FRAME_CONTEXT_FRAME:
+ if (client_normal(client)) {
+ if (ob_state() == OB_STATE_STARTING) {
+ /* move it to the top of the focus order */
+ guint desktop = client->desktop;
+ if (desktop == DESKTOP_ALL) desktop = screen_desktop;
+ focus_order[desktop] = g_list_remove(focus_order[desktop],
+ client);
+ focus_order[desktop] = g_list_prepend(focus_order[desktop],
+ client);
+ } else if (config_focus_follow) {
#ifdef DEBUG_FOCUS
- ob_debug("EnterNotify on %lx, focusing window\n",
- client->window);
+ ob_debug("EnterNotify on %lx, focusing window\n",
+ client->window);
#endif
- client_focus(client);
+ client_focus(client);
+ }
}
+ break;
+ default:
+ break;
}
break;
case ConfigureRequest:
CWX | CWY)) {
int x, y, w, h;
ObCorner corner;
-
+
x = (e->xconfigurerequest.value_mask & CWX) ?
e->xconfigurerequest.x : client->area.x;
y = (e->xconfigurerequest.value_mask & CWY) ?
e->xconfigurerequest.width : client->area.width;
h = (e->xconfigurerequest.value_mask & CWHeight) ?
e->xconfigurerequest.height : client->area.height;
+
+ {
+ int newx = x;
+ int newy = y;
+ client_find_onscreen(client, &newx, &newy, w, h, TRUE);
+ if (e->xconfigurerequest.value_mask & CWX)
+ x = newx;
+ if (e->xconfigurerequest.value_mask & CWY)
+ y = newy;
+ }
switch (client->gravity) {
case NorthEastGravity:
else
h = client->area.y;
client->gravity = tmpg;
+
+ {
+ int newx = x;
+ int newy = y;
+ client_find_onscreen(client, &newx, &newy, w, h, TRUE);
+ if (e->xclient.data.l[0] & 1 << 8)
+ x = newx;
+ if (e->xclient.data.l[0] & 1 << 9)
+ y = newy;
+ }
+
client_configure(client, OB_CORNER_TOPLEFT,
x, y, w, h, FALSE, TRUE);
+
client->gravity = oldg;
}
break;
static void event_handle_menu(ObClient *client, XEvent *e)
{
- static ObMenuEntry *over = NULL;
ObMenuEntry *entry;
ObMenu *top;
GList *it = NULL;
ob_debug("EVENT %d\n", e->type);
switch (e->type) {
case KeyPress:
- if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN))
- over = menu_control_keyboard_nav(over, OB_KEY_DOWN);
- else if (e->xkey.keycode == ob_keycode(OB_KEY_UP))
- over = menu_control_keyboard_nav(over, OB_KEY_UP);
- else if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) /* fuck */
- over = menu_control_keyboard_nav(over, OB_KEY_RIGHT);
- else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT)) /* users */
- over = menu_control_keyboard_nav(over, OB_KEY_LEFT);
- else {
- if (over) {
- over->parent->mouseover(over, FALSE);
- over = NULL;
- }
-
- menu_hide(top);
- }
+ menu_control_keyboard_nav(e->xkey.keycode);
break;
case ButtonPress:
- if (e->xbutton.button > 3) break;
-
ob_debug("BUTTON PRESS\n");
+
break;
case ButtonRelease:
ob_debug("BUTTON RELEASED\n");
m->location.x,
e->xbutton.y_root -
m->location.y))) {
- if (over) {
- over->parent->mouseover(over, FALSE);
- /* this hides the menu */
-
- over->parent->selected(entry, e->xbutton.button,
- e->xbutton.x_root,
- e->xbutton.y_root);
- over = NULL;
- }
+ m->selected(entry, e->xbutton.button,
+ e->xbutton.x_root,
+ e->xbutton.y_root);
+ break;
}
break;
}
}
- if (!it) {
- if (over) {
- over->parent->mouseover(over, FALSE);
- over = NULL;
- }
-/*
- if (top->hide)
- top->hide(top);
- else
-*/
- menu_hide(top);
- }
+
+ /* will call the menu_hide() for each submenu as well */
+ if (!it)
+ menu_hide(menu_visible->data);
break;
case MotionNotify:
m->location.x,
e->xmotion.y_root -
m->location.y))) {
- if (over && entry != over) {
- over->parent->mouseover(over, FALSE);
- }
+ if (m->over && m->over->data != entry)
+ m->mouseover(m->over->data, FALSE);
- over = entry;
- over->parent->mouseover(over, TRUE);
+ m->mouseover(entry, TRUE);
break;
}
}
- if (!it && over) {
- over->parent->mouseover(over, FALSE);
- over = NULL;
- }
+
break;
}
}
projects / chaz / openbox / blobdiff