[Emacs-diffs] emacs/src ChangeLog xfns.c xterm.c xterm.h

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/12/13 15:39:33

Modified files:
        src            : ChangeLog xfns.c xterm.c xterm.h 

Log message:
        Set the extended window manager hint for tooltip windows.
        
        * xfns.c (x_create_tip_frame): Set the extended window manager hint for
        tooltip windows.
        
        * xterm.h (struct x_display_info): Add Xatom_net_window_type_tooltip and
        Xatom_net_window_type.
        
        * xterm.c (x_term_init): Initialize Xatom_net_window_type_tooltip and
        Xatom_net_window_type.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7924&r2=1.7925
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfns.c?cvsroot=emacs&r1=1.754&r2=1.755
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.1060&r2=1.1061
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.h?cvsroot=emacs&r1=1.218&r2=1.219

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7924
retrieving revision 1.7925
diff -u -b -r1.7924 -r1.7925
--- ChangeLog   13 Dec 2009 14:24:22 -0000      1.7924
+++ ChangeLog   13 Dec 2009 15:39:28 -0000      1.7925
@@ -1,5 +1,16 @@
+2009-12-13  Pat Thoyts <address@hidden> (tiny change)
+
+       * xfns.c (x_create_tip_frame): Set the extended window manager hint for
+       tooltip windows.
+
 2009-12-13  Jan Djärv  <address@hidden>
 
+       * xterm.h (struct x_display_info): Add Xatom_net_window_type_tooltip and
+       Xatom_net_window_type.
+
+       * xterm.c (x_term_init): Initialize Xatom_net_window_type_tooltip and
+       Xatom_net_window_type.
+
        * xterm.c (my_log_handler): New function.
        (x_term_init): Set my_log_handler as log handler during gtk_init
        so we can filter out buggy messages. (bug #5120).

Index: xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.754
retrieving revision 1.755
diff -u -b -r1.754 -r1.755
--- xfns.c      23 Nov 2009 08:55:10 -0000      1.754
+++ xfns.c      13 Dec 2009 15:39:32 -0000      1.755
@@ -4825,6 +4825,7 @@
   {
     XSetWindowAttributes attrs;
     unsigned long mask;
+    Atom type = FRAME_X_DISPLAY_INFO (f)->Xatom_net_window_type_tooltip;
 
     BLOCK_INPUT;
     mask = CWBackPixel | CWOverrideRedirect | CWEventMask;
@@ -4849,6 +4850,10 @@
                       f->border_width,
                       CopyFromParent, InputOutput, CopyFromParent,
                       mask, &attrs);
+    XChangeProperty (FRAME_X_DISPLAY (f), tip_window,
+                     FRAME_X_DISPLAY_INFO (f)->Xatom_net_window_type,
+                     XA_ATOM, 32, PropModeReplace,
+                     (unsigned char *)&type, 1);
     UNBLOCK_INPUT;
   }
 

Index: xterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.c,v
retrieving revision 1.1060
retrieving revision 1.1061
diff -u -b -r1.1060 -r1.1061
--- xterm.c     13 Dec 2009 14:24:23 -0000      1.1060
+++ xterm.c     13 Dec 2009 15:39:32 -0000      1.1061
@@ -10445,6 +10445,10 @@
     = XInternAtom (dpyinfo->display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
   dpyinfo->Xatom_net_wm_state_sticky
     = XInternAtom (dpyinfo->display, "_NET_WM_STATE_STICKY", False);
+  dpyinfo->Xatom_net_window_type
+    = XInternAtom (dpyinfo->display, "_NET_WM_WINDOW_TYPE", False);
+  dpyinfo->Xatom_net_window_type_tooltip
+    = XInternAtom (dpyinfo->display, "_NET_WM_WINDOW_TYPE_TOOLTIP", False);
 
   dpyinfo->cut_buffers_initialized = 0;
 

Index: xterm.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.h,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -b -r1.218 -r1.219
--- xterm.h     17 Nov 2009 08:21:36 -0000      1.218
+++ xterm.h     13 Dec 2009 15:39:33 -0000      1.219
@@ -355,10 +355,12 @@
   size_t x_dnd_atoms_size;
   size_t x_dnd_atoms_length;
 
-  /* Extended window manager hints, Atoms supported by the window manager  */
+  /* Extended window manager hints, Atoms supported by the window manager and
+     atoms for settig the window type.  */
   Atom *net_supported_atoms;
   int nr_net_supported_atoms;
   Window net_supported_window;
+  Atom Xatom_net_window_type, Xatom_net_window_type_tooltip;
 
   /* Atoms dealing with maximization and fullscreen */
   Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen_atom,