diff options
| author | Jan Djärv | 2008-03-01 14:59:17 +0000 |
|---|---|---|
| committer | Jan Djärv | 2008-03-01 14:59:17 +0000 |
| commit | 7ee480ce4f5df93c16313a50e11f0afe04477d01 (patch) | |
| tree | d44cefe360140fa387cb6e9cea0074db31771f0c /src/xterm.c | |
| parent | fc467bc4d2d98f503bdc42dcb5ac9a74e5a692a7 (diff) | |
| download | emacs-7ee480ce4f5df93c16313a50e11f0afe04477d01.tar.gz emacs-7ee480ce4f5df93c16313a50e11f0afe04477d01.zip | |
(handle_one_xevent): For Gtk+ and ConfigureNotify, call
xg_frame_resized when the event is for the edit widget.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/xterm.c b/src/xterm.c index 6c16bd89ce6..55582b5c10d 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -6988,13 +6988,20 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) | |||
| 6988 | 6988 | ||
| 6989 | case ConfigureNotify: | 6989 | case ConfigureNotify: |
| 6990 | f = x_top_window_to_frame (dpyinfo, event.xconfigure.window); | 6990 | f = x_top_window_to_frame (dpyinfo, event.xconfigure.window); |
| 6991 | #ifdef USE_GTK | ||
| 6992 | if (!f | ||
| 6993 | && (f = x_any_window_to_frame (dpyinfo, event.xconfigure.window)) | ||
| 6994 | && event.xconfigure.window == FRAME_X_WINDOW (f)) | ||
| 6995 | { | ||
| 6996 | xg_frame_resized (f, event.xconfigure.width, | ||
| 6997 | event.xconfigure.height); | ||
| 6998 | f = 0; | ||
| 6999 | } | ||
| 7000 | #endif | ||
| 6991 | if (f) | 7001 | if (f) |
| 6992 | { | 7002 | { |
| 6993 | #ifndef USE_X_TOOLKIT | 7003 | #ifndef USE_X_TOOLKIT |
| 6994 | #ifdef USE_GTK | 7004 | #ifndef USE_GTK |
| 6995 | xg_resize_widgets (f, event.xconfigure.width, | ||
| 6996 | event.xconfigure.height); | ||
| 6997 | #else /* not USE_GTK */ | ||
| 6998 | /* If there is a pending resize for fullscreen, don't | 7005 | /* If there is a pending resize for fullscreen, don't |
| 6999 | do this one, the right one will come later. | 7006 | do this one, the right one will come later. |
| 7000 | The toolkit version doesn't seem to need this, but we | 7007 | The toolkit version doesn't seem to need this, but we |
| @@ -7024,11 +7031,11 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) | |||
| 7024 | SET_FRAME_GARBAGED (f); | 7031 | SET_FRAME_GARBAGED (f); |
| 7025 | cancel_mouse_face (f); | 7032 | cancel_mouse_face (f); |
| 7026 | } | 7033 | } |
| 7027 | #endif /* not USE_GTK */ | ||
| 7028 | #endif | ||
| 7029 | 7034 | ||
| 7030 | FRAME_PIXEL_WIDTH (f) = event.xconfigure.width; | 7035 | FRAME_PIXEL_WIDTH (f) = event.xconfigure.width; |
| 7031 | FRAME_PIXEL_HEIGHT (f) = event.xconfigure.height; | 7036 | FRAME_PIXEL_HEIGHT (f) = event.xconfigure.height; |
| 7037 | #endif /* not USE_GTK */ | ||
| 7038 | #endif | ||
| 7032 | 7039 | ||
| 7033 | #ifdef USE_GTK | 7040 | #ifdef USE_GTK |
| 7034 | /* GTK creates windows but doesn't map them. | 7041 | /* GTK creates windows but doesn't map them. |