[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog frame.h xterm.c xterm.h
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] emacs/src ChangeLog frame.h xterm.c xterm.h |
Date: |
Wed, 01 Jul 2009 16:58:08 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Jan Djärv <jhd> 09/07/01 16:58:08
Modified files:
src : ChangeLog frame.h xterm.c xterm.h
Log message:
* xterm.h (struct x_display_info): Add Xatom_net_wm_state_sticky
* xterm.c (x_handle_net_wm_state): Also look for sticky.
(x_term_init): Initialize Xatom_net_wm_state_sticky.
* frame.h: Declare Qsticky.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7621&r2=1.7622
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.h?cvsroot=emacs&r1=1.148&r2=1.149
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.1033&r2=1.1034
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.h?cvsroot=emacs&r1=1.211&r2=1.212
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7621
retrieving revision 1.7622
diff -u -b -r1.7621 -r1.7622
--- ChangeLog 1 Jul 2009 16:48:35 -0000 1.7621
+++ ChangeLog 1 Jul 2009 16:58:05 -0000 1.7622
@@ -1,5 +1,12 @@
2009-07-01 Jan Djärv <address@hidden>
+ * xterm.h (struct x_display_info): Add Xatom_net_wm_state_sticky
+
+ * xterm.c (x_handle_net_wm_state): Also look for sticky.
+ (x_term_init): Initialize Xatom_net_wm_state_sticky.
+
+ * frame.h: Declare Qsticky.
+
* w32fns.c (w32_frame_parm_handlers): Set 0 for sticky.
* nsfns.m (ns_frame_parm_handlers): Ditto.
Index: frame.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/frame.h,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- frame.h 1 Jul 2009 14:02:35 -0000 1.148
+++ frame.h 1 Jul 2009 16:58:07 -0000 1.149
@@ -1039,6 +1039,7 @@
extern Lisp_Object Qwait_for_wm;
extern Lisp_Object Qfullscreen;
extern Lisp_Object Qfullwidth, Qfullheight, Qfullboth, Qmaximized;
+extern Lisp_Object Qsticky;
extern Lisp_Object Qfont_backend;
extern Lisp_Object Qalpha;
Index: xterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.c,v
retrieving revision 1.1033
retrieving revision 1.1034
diff -u -b -r1.1033 -r1.1034
--- xterm.c 1 Jul 2009 16:48:38 -0000 1.1033
+++ xterm.c 1 Jul 2009 16:58:07 -0000 1.1034
@@ -8547,6 +8547,7 @@
unsigned char *tmp_data = NULL;
Atom target_type = XA_ATOM;
Lisp_Object lval;
+ int sticky = 0;
BLOCK_INPUT;
x_catch_errors (dpy);
@@ -8584,6 +8585,8 @@
}
else if (a == dpyinfo->Xatom_net_wm_state_fullscreen_atom)
value = FULLSCREEN_BOTH;
+ else if (a == dpyinfo->Xatom_net_wm_state_sticky)
+ sticky = 1;
}
lval = Qnil;
@@ -8604,6 +8607,7 @@
}
store_frame_param (f, Qfullscreen, lval);
+ store_frame_param (f, Qsticky, sticky ? Qt : Qnil);
if (tmp_data) XFree (tmp_data);
UNBLOCK_INPUT;
@@ -10295,6 +10299,8 @@
= XInternAtom (dpyinfo->display, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
dpyinfo->Xatom_net_wm_state_maximized_vert
= XInternAtom (dpyinfo->display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
+ dpyinfo->Xatom_net_wm_state_sticky
+ = XInternAtom (dpyinfo->display, "_NET_WM_STATE_STICKY", False);
dpyinfo->cut_buffers_initialized = 0;
Index: xterm.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.h,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -b -r1.211 -r1.212
--- xterm.h 1 Jul 2009 16:48:38 -0000 1.211
+++ xterm.h 1 Jul 2009 16:58:07 -0000 1.212
@@ -359,7 +359,8 @@
/* Atoms dealing with maximization and fullscreen */
Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen_atom,
- Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert;
+ Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert,
+ Xatom_net_wm_state_sticky;
};
#ifdef HAVE_X_I18N
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src ChangeLog frame.h xterm.c xterm.h,
Jan Djärv <=