comparison src/frame-x.c @ 414:da8ed4261e83 r21-2-15

Import from CVS: tag r21-2-15
author cvs
date Mon, 13 Aug 2007 11:21:38 +0200
parents 697ef44129c6
children 11054d720c21
comparison
equal deleted inserted replaced
413:901169e5ca31 414:da8ed4261e83
326 classhint.res_name = frame_name; 326 classhint.res_name = frame_name;
327 classhint.res_class = app_class; 327 classhint.res_class = app_class;
328 XSetClassHint (dpy, XtWindow (shell), &classhint); 328 XSetClassHint (dpy, XtWindow (shell), &classhint);
329 } 329 }
330 330
331 #ifndef HAVE_SESSION 331 #ifndef HAVE_WMCOMMAND
332 static void 332 static void
333 x_wm_maybe_store_wm_command (struct frame *f) 333 x_wm_maybe_store_wm_command (struct frame *f)
334 { 334 {
335 Widget w = FRAME_X_SHELL_WIDGET (f); 335 Widget w = FRAME_X_SHELL_WIDGET (f);
336 struct device *d = XDEVICE (FRAME_DEVICE (f)); 336 struct device *d = XDEVICE (FRAME_DEVICE (f));
377 377
378 x_wm_maybe_store_wm_command (f); 378 x_wm_maybe_store_wm_command (f);
379 379
380 } 380 }
381 } 381 }
382 #endif /* !HAVE_SESSION */ 382 #endif /* !HAVE_WMCOMMAND */
383 383
384 static int 384 static int
385 x_frame_iconified_p (struct frame *f) 385 x_frame_iconified_p (struct frame *f)
386 { 386 {
387 Atom actual_type; 387 Atom actual_type;
2057 if (FRAME_X_TOP_LEVEL_FRAME_P (f)) 2057 if (FRAME_X_TOP_LEVEL_FRAME_P (f))
2058 { 2058 {
2059 /* tell the window manager about us. */ 2059 /* tell the window manager about us. */
2060 x_wm_store_class_hints (shell_widget, XtName (frame_widget)); 2060 x_wm_store_class_hints (shell_widget, XtName (frame_widget));
2061 2061
2062 #ifndef HAVE_SESSION 2062 #ifndef HAVE_WMCOMMAND
2063 x_wm_maybe_store_wm_command (f); 2063 x_wm_maybe_store_wm_command (f);
2064 #endif /* HAVE_SESSION */ 2064 #endif /* HAVE_WMCOMMAND */
2065 2065
2066 x_wm_hack_wm_protocols (shell_widget); 2066 x_wm_hack_wm_protocols (shell_widget);
2067 } 2067 }
2068 2068
2069 #ifdef HAVE_XIM 2069 #ifdef HAVE_XIM
2623 static void 2623 static void
2624 x_delete_frame (struct frame *f) 2624 x_delete_frame (struct frame *f)
2625 { 2625 {
2626 Display *dpy; 2626 Display *dpy;
2627 2627
2628 #ifndef HAVE_SESSION 2628 #ifndef HAVE_WMCOMMAND
2629 if (FRAME_X_TOP_LEVEL_FRAME_P (f)) 2629 if (FRAME_X_TOP_LEVEL_FRAME_P (f))
2630 x_wm_maybe_move_wm_command (f); 2630 x_wm_maybe_move_wm_command (f);
2631 #endif /* HAVE_SESSION */ 2631 #endif /* HAVE_WMCOMMAND */
2632 2632
2633 #ifdef HAVE_CDE 2633 #ifdef HAVE_CDE
2634 DtDndDropUnregister (FRAME_X_TEXT_WIDGET (f)); 2634 DtDndDropUnregister (FRAME_X_TEXT_WIDGET (f));
2635 #endif /* HAVE_CDE */ 2635 #endif /* HAVE_CDE */
2636 2636