Mercurial > hg > xemacs-beta

comparison src/frame-x.c @ 274:ca9a9ec9c1c1 r21-0b35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b35
author cvs
date Mon, 13 Aug 2007 10:29:42 +0200
parents c5d627a313b1
children 90d73dddcdc4
comparison
equal deleted inserted replaced
273:411aac7253ef 274:ca9a9ec9c1c1
1993 static void 1993 static void
1994 x_init_frame_1 (struct frame *f, Lisp_Object props) 1994 x_init_frame_1 (struct frame *f, Lisp_Object props)
1995 { 1995 {
1996 /* This function can GC */ 1996 /* This function can GC */
1997 Lisp_Object device = FRAME_DEVICE (f); 1997 Lisp_Object device = FRAME_DEVICE (f);
1998 Lisp_Object lisp_window_id; 1998 Lisp_Object lisp_window_id = Fplist_get (props, Qwindow_id, Qnil);
1999 Lisp_Object popup; 1999 Lisp_Object popup = Fplist_get (props, Qpopup, Qnil);
2000 2000
2001 lisp_window_id = Fplist_get (props, Qwindow_id, Qnil);
2002 popup = Fplist_get (props, Qpopup, Qnil);
2003 if (!NILP (popup)) 2001 if (!NILP (popup))
2004 { 2002 {
2005 if (EQ (popup, Qt)) 2003 if (EQ (popup, Qt))
2006 popup = Fselected_frame (device); 2004 popup = Fselected_frame (device);
2007 CHECK_LIVE_FRAME (popup); 2005 CHECK_LIVE_FRAME (popup);
2270 2268
2271 /* Raise frame F. */ 2269 /* Raise frame F. */
2272 static void 2270 static void
2273 x_raise_frame_1 (struct frame *f, int force) 2271 x_raise_frame_1 (struct frame *f, int force)
2274 { 2272 {
2275 Widget bottom_dialog; 2273 if (FRAME_VISIBLE_P (f) || force)
2276 Window emacs_window; 2274 {
2277 XWindowChanges xwc; 2275 Widget bottom_dialog;
2278 unsigned int flags; 2276 XWindowChanges xwc;
2279 Display *display = DEVICE_X_DISPLAY (XDEVICE (f->device)); 2277 unsigned int flags;
2280 2278 Display *display = DEVICE_X_DISPLAY (XDEVICE (f->device));
2281 if (FRAME_VISIBLE_P(f) || force) 2279 Window emacs_window = XtWindow (FRAME_X_SHELL_WIDGET (f));
2282 { 2280
2283 emacs_window = XtWindow (FRAME_X_SHELL_WIDGET (f));
2284 /* first raises all the dialog boxes, then put emacs just below the 2281 /* first raises all the dialog boxes, then put emacs just below the
2285 * bottom most dialog box */ 2282 * bottom most dialog box */
2286 bottom_dialog = lw_raise_all_pop_up_widgets (); 2283 bottom_dialog = lw_raise_all_pop_up_widgets ();
2287 if (bottom_dialog && XtWindow (bottom_dialog)) 2284 if (bottom_dialog && XtWindow (bottom_dialog))
2288 { 2285 {
2311 2308
2312 /* Lower frame F. */ 2309 /* Lower frame F. */
2313 static void 2310 static void
2314 x_lower_frame (struct frame *f) 2311 x_lower_frame (struct frame *f)
2315 { 2312 {
2316 Display *display = DEVICE_X_DISPLAY (XDEVICE (f->device)); 2313 if (FRAME_VISIBLE_P (f))
2317 XWindowChanges xwc; 2314 {
2318 unsigned int flags; 2315 Display *display = DEVICE_X_DISPLAY (XDEVICE (f->device));
2319 2316 XWindowChanges xwc;
2320 if (FRAME_VISIBLE_P(f)) 2317 unsigned int flags = CWStackMode;
2321 { 2318
2322 xwc.stack_mode = Below; 2319 xwc.stack_mode = Below;
2323 flags = CWStackMode;
2324 if (!XReconfigureWMWindow (display, XtWindow (FRAME_X_SHELL_WIDGET (f)), 2320 if (!XReconfigureWMWindow (display, XtWindow (FRAME_X_SHELL_WIDGET (f)),
2325 DefaultScreen (display), flags, &xwc)) 2321 DefaultScreen (display), flags, &xwc))
2326 x_cant_notify_wm_error (); 2322 x_cant_notify_wm_error ();
2327 } 2323 }
2328 } 2324 }