Japanese translation of message catalog for Sawfish Window-Manager
| 修订版 | 4b5f28413def46d3ed831b5e2586defd84f75079 (tree) |
|---|---|
| 时间 | 1999-12-13 07:08:19 |
| 作者 | john <john> |
| Commiter | john |
*** empty log message ***
src/ChangeLog (diff)
src/events.c (diff)| @@ -5,6 +5,9 @@ | ||
| 5 | 5 | * events.c (motion_notify): don't compare the event window with |
| 6 | 6 | the button-press window; just use the saved context map from |
| 7 | 7 | the actual button-press event |
| 8 | + (button_press): only use the context map if the part is | |
| 9 | + currently clicked; forcible ungrab the pointer after all button | |
| 10 | + release events | |
| 8 | 11 | |
| 9 | 12 | * frames.c (frame_part_destroyer): if we unclick a frame part, |
| 10 | 13 | ungrab the pointer as well |
| @@ -259,13 +259,16 @@ button_press (XEvent *ev) | ||
| 259 | 259 | w = fp->win; |
| 260 | 260 | |
| 261 | 261 | if (ev->type == ButtonPress) |
| 262 | + { | |
| 262 | 263 | handle_fp_click (fp, ev); |
| 263 | - | |
| 264 | - if (fp->clicked) | |
| 265 | 264 | current_context_map = get_keymap_for_frame_part (fp); |
| 265 | + } | |
| 266 | 266 | } |
| 267 | 267 | |
| 268 | - eval_input_event (current_context_map); | |
| 268 | + /* Only use the context map if the frame part is currently clicked */ | |
| 269 | + eval_input_event ((clicked_frame_part | |
| 270 | + && clicked_frame_part->clicked) | |
| 271 | + ? current_context_map : Qnil); | |
| 269 | 272 | |
| 270 | 273 | if (fp != 0 && w->id != 0 && ev->type == ButtonRelease) |
| 271 | 274 | { |
| @@ -285,6 +288,8 @@ button_press (XEvent *ev) | ||
| 285 | 288 | button_press_mouse_x = button_press_mouse_y = -1; |
| 286 | 289 | button_press_window = 0; |
| 287 | 290 | current_context_map = Qnil; |
| 291 | + /* The pointer is _always_ ungrabbed after a button-release */ | |
| 292 | + XUngrabPointer (dpy, last_event_time); | |
| 288 | 293 | } |
| 289 | 294 | |
| 290 | 295 | XAllowEvents (dpy, ev->type == ButtonPress ? SyncPointer : AsyncPointer, |
Fork
SawfishWM/sawfish