Commit: 4b5f28413def46d3ed831b5e2586defd84f75079 - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Revisión: 4b5f28413def46d3ed831b5e2586defd84f75079 (tree)
• Tiempo: 1999-12-13 07:08:19
• Autor: john <john>
• Commiter: john

Log Message

*** empty log message ***

Cambiar Resumen

• modified: src/ChangeLog
• modified: src/events.c

Diferencia incremental

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,9 @@
 	* events.c (motion_notify): don't compare the event window with
 	the button-press window; just use the saved context map from
 	the actual button-press event
+	(button_press): only use the context map if the part is
+	currently clicked; forcible ungrab the pointer after all button
+	release events
 
 	* frames.c (frame_part_destroyer): if we unclick a frame part,
 	ungrab the pointer as well

--- a/src/events.c
+++ b/src/events.c
@@ -259,13 +259,16 @@ button_press (XEvent *ev)
 	w = fp->win;
 
 	if (ev->type == ButtonPress)
+	{
 	    handle_fp_click (fp, ev);
-
-	if (fp->clicked)
 	    current_context_map = get_keymap_for_frame_part (fp);
+	}
     }
 
-    eval_input_event (current_context_map);
+    /* Only use the context map if the frame part is currently clicked */
+    eval_input_event ((clicked_frame_part
+		       && clicked_frame_part->clicked)
+		      ? current_context_map : Qnil);
 
     if (fp != 0 && w->id != 0 && ev->type == ButtonRelease)
     {
@@ -285,6 +288,8 @@ button_press (XEvent *ev)
 	button_press_mouse_x = button_press_mouse_y = -1;
 	button_press_window = 0;
 	current_context_map = Qnil;
+	/* The pointer is _always_ ungrabbed after a button-release */
+	XUngrabPointer (dpy, last_event_time);
     }
 
     XAllowEvents (dpy, ev->type == ButtonPress ? SyncPointer : AsyncPointer,