[Emacs-diffs] emacs/src ChangeLog frame.c nsfns.m w32fns.c xf...

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd> 09/07/01 16:48:39

Modified files:
        src            : ChangeLog frame.c nsfns.m w32fns.c xfns.c 
                         xterm.c xterm.h 

Log message:
        * w32fns.c (w32_frame_parm_handlers): Set 0 for sticky.
        
        * nsfns.m (ns_frame_parm_handlers): Ditto.
        
        * frame.c: Declare Qsticky.
        (frame_parms): Add sticky.
        
        * xfns.c (x_frame_parm_handlers): Let x_set_sticky handle sticky.
        
        * xterm.h: Declare x_set_sticky.
        
        * xterm.c (x_set_sticky): New function.
        
        * frame.c: Qmaximized is new.
        (x_set_frame_parameters): Do not handle fullscreen specially.
        Only set width and height if explicitly set.
        (x_set_fullscreen): Handle Qmaximized.
        (x_set_font, x_figure_window_size): Do not handle fullscreen specially.
        (syms_of_frame): Initialize Qmaximized.
        
        * xterm.c (handle_one_xevent): Remove call to x_check_fullscreen
        for Expose event. Add call to x_check_fullscreen for MapNotify event.
        Remove all code w.r.t. fullscreen from ConfigureNotify event. Do not
        set gravity to NorthWestGravity when USE_GTK.
        (set_wm_state): New function.
        (do_ewmh_fullscreen): Use set_wm_state. Also handle 
FULLSCREEN_MAXIMIZED.
        (x_handle_net_wm_state): Handle FULLSCREEN_MAXIMIZED.
        (x_check_fullscreen): Simplify so we only handle EMWH type of fullscreen
        or the case when no window manager is running. That means remove calls
        to x_real_positions and x_fullscreen_adjust.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7620&r2=1.7621
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.421&r2=1.422
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfns.m?cvsroot=emacs&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32fns.c?cvsroot=emacs&r1=1.358&r2=1.359
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfns.c?cvsroot=emacs&r1=1.737&r2=1.738
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.1032&r2=1.1033
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.h?cvsroot=emacs&r1=1.210&r2=1.211

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7620
retrieving revision 1.7621
diff -u -b -r1.7620 -r1.7621
--- ChangeLog   1 Jul 2009 15:52:58 -0000       1.7620
+++ ChangeLog   1 Jul 2009 16:48:35 -0000       1.7621
@@ -1,5 +1,18 @@
 2009-07-01  Jan Djärv  <address@hidden>
 
+       * w32fns.c (w32_frame_parm_handlers): Set 0 for sticky.
+
+       * nsfns.m (ns_frame_parm_handlers): Ditto.
+
+       * frame.c: Declare Qsticky.
+       (frame_parms): Add sticky.
+
+       * xfns.c (x_frame_parm_handlers): Let x_set_sticky handle sticky.
+
+       * xterm.h: Declare x_set_sticky.
+
+       * xterm.c (x_set_sticky): New function.
+
        * gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
        (xg_tool_bar_menu_proxy): Attach enter/leave events to
        xg_tool_bar_proxy_help_callback.

Index: frame.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/frame.c,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -b -r1.421 -r1.422
--- frame.c     1 Jul 2009 14:02:35 -0000       1.421
+++ frame.c     1 Jul 2009 16:48:37 -0000       1.422
@@ -121,6 +121,7 @@
 Lisp_Object Qtty, Qtty_type;
 
 Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth, Qmaximized;
+Lisp_Object Qsticky;
 Lisp_Object Qfont_backend;
 Lisp_Object Qalpha;
 
@@ -2844,7 +2845,8 @@
   {"wait-for-wm",              &Qwait_for_wm},
   {"fullscreen",                &Qfullscreen},
   {"font-backend",             &Qfont_backend},
-  {"alpha",                    &Qalpha}
+  {"alpha",                    &Qalpha},
+  {"sticky",                   &Qsticky},
 };
 
 #ifdef HAVE_WINDOW_SYSTEM

Index: nsfns.m
===================================================================
RCS file: /cvsroot/emacs/emacs/src/nsfns.m,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- nsfns.m     8 Jun 2009 04:33:25 -0000       1.45
+++ nsfns.m     1 Jul 2009 16:48:37 -0000       1.46
@@ -1031,7 +1031,8 @@
   0, /* x_set_wait_for_wm, will ignore */
   0,  /* x_set_fullscreen will ignore */
   x_set_font_backend, /* generic OK */
-  x_set_alpha
+  x_set_alpha,
+  0, /* x_set_sticky */  
 };
 
 

Index: w32fns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32fns.c,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -b -r1.358 -r1.359
--- w32fns.c    3 Jun 2009 23:04:54 -0000       1.358
+++ w32fns.c    1 Jul 2009 16:48:37 -0000       1.359
@@ -6892,7 +6892,8 @@
   0, /* x_set_wait_for_wm, */
   x_set_fullscreen,
   x_set_font_backend,
-  x_set_alpha
+  x_set_alpha,
+  0, /* x_set_sticky */
 };
 
 void

Index: xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.737
retrieving revision 1.738
diff -u -b -r1.737 -r1.738
--- xfns.c      22 Apr 2009 04:32:23 -0000      1.737
+++ xfns.c      1 Jul 2009 16:48:38 -0000       1.738
@@ -5779,7 +5779,8 @@
   x_set_wait_for_wm,
   x_set_fullscreen,
   x_set_font_backend,
-  x_set_alpha
+  x_set_alpha,
+  x_set_sticky,
 };
 
 void

Index: xterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.c,v
retrieving revision 1.1032
retrieving revision 1.1033
diff -u -b -r1.1032 -r1.1033
--- xterm.c     1 Jul 2009 14:02:35 -0000       1.1032
+++ xterm.c     1 Jul 2009 16:48:38 -0000       1.1033
@@ -8456,6 +8456,18 @@
                           : Qnil)));
 }
 
+void
+x_set_sticky (f, new_value, old_value)
+     struct frame *f;
+     Lisp_Object new_value, old_value;
+{
+  Lisp_Object frame;
+
+  XSETFRAME (frame, f);
+  set_wm_state (frame, NILP (new_value) ? 0 : 1,
+                "_NET_WM_STATE_STICKY", NULL);
+}
+
 /* Do fullscreen as specified in extended window manager hints */
 
 static int

Index: xterm.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.h,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- xterm.h     27 Mar 2009 18:37:41 -0000      1.210
+++ xterm.h     1 Jul 2009 16:48:38 -0000       1.211
@@ -964,6 +964,8 @@
 extern int x_display_pixel_height P_ ((struct x_display_info *));
 extern int x_display_pixel_width P_ ((struct x_display_info *));
 
+extern void x_set_sticky P_ ((struct frame *, Lisp_Object, Lisp_Object));
+
 /* Defined in xselect.c */
 
 extern void x_handle_property_notify P_ ((XPropertyEvent *));