mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-29 11:02:01 +00:00
Merge from trunk.
This commit is contained in:
Eli Zaretskii
commit
3f8879751b
@ -253,9 +253,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||||
/* Define to 1 if you have the `clock_settime' function. */
|
||||
#undef HAVE_CLOCK_SETTIME
|
||||
|
||||
/* Define to 1 if you have the `closedir' function. */
|
||||
#undef HAVE_CLOSEDIR
|
||||
|
||||
/* Define to 1 if you have the <coff.h> header file. */
|
||||
#undef HAVE_COFF_H
|
||||
|
||||
@ -339,9 +336,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||||
/* Define to 1 if you have the `difftime' function. */
|
||||
#undef HAVE_DIFFTIME
|
||||
|
||||
/* Define to 1 if you have the <dirent.h> header file. */
|
||||
#undef HAVE_DIRENT_H
|
||||
|
||||
/* Define to 1 if you have the 'dup2' function. */
|
||||
#undef HAVE_DUP2
|
||||
|
||||
|
||||
5
autogen/configure
vendored
5
autogen/configure
vendored
@ -3214,7 +3214,6 @@ as_fn_append ac_header_list " sys/resource.h"
|
||||
as_fn_append ac_header_list " sys/utsname.h"
|
||||
as_fn_append ac_header_list " pwd.h"
|
||||
as_fn_append ac_header_list " utmp.h"
|
||||
as_fn_append ac_header_list " dirent.h"
|
||||
as_fn_append ac_header_list " util.h"
|
||||
as_fn_append ac_header_list " sys/socket.h"
|
||||
as_fn_append ac_header_list " stdlib.h"
|
||||
@ -8806,8 +8805,6 @@ done
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -13474,7 +13471,7 @@ esac
|
||||
|
||||
|
||||
for ac_func in gethostname \
|
||||
closedir getrusage get_current_dir_name \
|
||||
getrusage get_current_dir_name \
|
||||
lrand48 \
|
||||
select getpagesize setlocale \
|
||||
utimes getrlimit setrlimit shutdown getaddrinfo \
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
2012-11-23 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* erc-backend.el: Fix last change that missed calls to `second'
|
||||
(bug#12970).
|
||||
|
||||
2012-11-19 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
Use cl-lib instead of cl, and interactive-p => called-interactively-p.
|
||||
|
||||
@ -1556,17 +1556,17 @@ A server may send more than one 005 message."
|
||||
(define-erc-response-handler (252)
|
||||
"Display the number of IRC operators online." nil
|
||||
(erc-display-message parsed 'notice 'active 's252
|
||||
?i (second (erc-response.command-args parsed))))
|
||||
?i (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (253)
|
||||
"Display the number of unknown connections." nil
|
||||
(erc-display-message parsed 'notice 'active 's253
|
||||
?i (second (erc-response.command-args parsed))))
|
||||
?i (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (254)
|
||||
"Display the number of channels formed." nil
|
||||
(erc-display-message parsed 'notice 'active 's254
|
||||
?i (second (erc-response.command-args parsed))))
|
||||
?i (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (250 251 255 256 257 258 259 265 266 377 378)
|
||||
"Generic display of server messages as notices.
|
||||
@ -1590,13 +1590,13 @@ See `erc-display-server-message'." nil
|
||||
(define-erc-response-handler (301)
|
||||
"AWAY notice." nil
|
||||
(erc-display-message parsed 'notice 'active 's301
|
||||
?n (second (erc-response.command-args parsed))
|
||||
?n (cadr (erc-response.command-args parsed))
|
||||
?r (erc-response.contents parsed)))
|
||||
|
||||
(define-erc-response-handler (303)
|
||||
"ISON reply" nil
|
||||
(erc-display-message parsed 'notice 'active 's303
|
||||
?n (second (erc-response.command-args parsed))))
|
||||
?n (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (305)
|
||||
"Return from AWAYness." nil
|
||||
@ -1643,7 +1643,7 @@ See `erc-display-server-message'." nil
|
||||
"IRC Operator response in WHOIS." nil
|
||||
(erc-display-message
|
||||
parsed 'notice 'active 's313
|
||||
?n (second (erc-response.command-args parsed))))
|
||||
?n (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (315 318 323 369)
|
||||
;; 315 - End of WHO
|
||||
@ -1674,14 +1674,14 @@ See `erc-display-server-message'." nil
|
||||
"Channel names in WHOIS response." nil
|
||||
(erc-display-message
|
||||
parsed 'notice 'active 's319
|
||||
?n (second (erc-response.command-args parsed))
|
||||
?n (cadr (erc-response.command-args parsed))
|
||||
?c (erc-response.contents parsed)))
|
||||
|
||||
(define-erc-response-handler (320)
|
||||
"Identified user in WHOIS." nil
|
||||
(erc-display-message
|
||||
parsed 'notice 'active 's320
|
||||
?n (second (erc-response.command-args parsed))))
|
||||
?n (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (321)
|
||||
"LIST header." nil
|
||||
@ -1713,7 +1713,7 @@ See `erc-display-server-message'." nil
|
||||
|
||||
(define-erc-response-handler (324)
|
||||
"Channel or nick modes." nil
|
||||
(let ((channel (second (erc-response.command-args parsed)))
|
||||
(let ((channel (cadr (erc-response.command-args parsed)))
|
||||
(modes (mapconcat 'identity (cddr (erc-response.command-args parsed))
|
||||
" ")))
|
||||
(erc-set-modes channel modes)
|
||||
@ -1723,14 +1723,14 @@ See `erc-display-server-message'." nil
|
||||
|
||||
(define-erc-response-handler (328)
|
||||
"Channel URL (on freenode network)." nil
|
||||
(let ((channel (second (erc-response.command-args parsed)))
|
||||
(let ((channel (cadr (erc-response.command-args parsed)))
|
||||
(url (erc-response.contents parsed)))
|
||||
(erc-display-message parsed 'notice (erc-get-buffer channel proc)
|
||||
's328 ?c channel ?u url)))
|
||||
|
||||
(define-erc-response-handler (329)
|
||||
"Channel creation date." nil
|
||||
(let ((channel (second (erc-response.command-args parsed)))
|
||||
(let ((channel (cadr (erc-response.command-args parsed)))
|
||||
(time (erc-string-to-emacs-time
|
||||
(nth 2 (erc-response.command-args parsed)))))
|
||||
(erc-display-message
|
||||
@ -1748,7 +1748,7 @@ See `erc-display-server-message'." nil
|
||||
;; authaccount == (aref parsed 4)
|
||||
;; authmsg == (aref parsed 5)
|
||||
;; The guesses below are, well, just that. -- Lawrence 2004/05/10
|
||||
(let ((nick (second (erc-response.command-args parsed)))
|
||||
(let ((nick (cadr (erc-response.command-args parsed)))
|
||||
(authaccount (nth 2 (erc-response.command-args parsed)))
|
||||
(authmsg (erc-response.contents parsed)))
|
||||
(erc-display-message parsed 'notice 'active 's330
|
||||
@ -1756,14 +1756,14 @@ See `erc-display-server-message'." nil
|
||||
|
||||
(define-erc-response-handler (331)
|
||||
"No topic set for channel." nil
|
||||
(let ((channel (second (erc-response.command-args parsed)))
|
||||
(let ((channel (cadr (erc-response.command-args parsed)))
|
||||
(topic (erc-response.contents parsed)))
|
||||
(erc-display-message parsed 'notice (erc-get-buffer channel proc)
|
||||
's331 ?c channel)))
|
||||
|
||||
(define-erc-response-handler (332)
|
||||
"TOPIC notice." nil
|
||||
(let ((channel (second (erc-response.command-args parsed)))
|
||||
(let ((channel (cadr (erc-response.command-args parsed)))
|
||||
(topic (erc-response.contents parsed)))
|
||||
(erc-update-channel-topic channel topic)
|
||||
(erc-display-message parsed 'notice (erc-get-buffer channel proc)
|
||||
@ -1816,7 +1816,7 @@ See `erc-display-server-message'." nil
|
||||
|
||||
(define-erc-response-handler (366)
|
||||
"End of NAMES." nil
|
||||
(erc-with-buffer ((second (erc-response.command-args parsed)) proc)
|
||||
(erc-with-buffer ((cadr (erc-response.command-args parsed)) proc)
|
||||
(erc-channel-end-receiving-names)))
|
||||
|
||||
(define-erc-response-handler (367)
|
||||
@ -1836,7 +1836,7 @@ See `erc-display-server-message'." nil
|
||||
|
||||
(define-erc-response-handler (368)
|
||||
"End of channel ban list." nil
|
||||
(let ((channel (second (erc-response.command-args parsed))))
|
||||
(let ((channel (cadr (erc-response.command-args parsed))))
|
||||
(erc-display-message parsed 'notice 'active 's368
|
||||
?c channel)))
|
||||
|
||||
@ -1854,12 +1854,12 @@ See `erc-display-server-message'." nil
|
||||
"Server's time string." nil
|
||||
(erc-display-message
|
||||
parsed 'notice 'active
|
||||
's391 ?s (second (erc-response.command-args parsed))
|
||||
's391 ?s (cadr (erc-response.command-args parsed))
|
||||
?t (nth 2 (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (401)
|
||||
"No such nick/channel." nil
|
||||
(let ((nick/channel (second (erc-response.command-args parsed))))
|
||||
(let ((nick/channel (cadr (erc-response.command-args parsed))))
|
||||
(when erc-whowas-on-nosuchnick
|
||||
(erc-log (format "cmd: WHOWAS: %s" nick/channel))
|
||||
(erc-server-send (format "WHOWAS %s 1" nick/channel)))
|
||||
@ -1869,23 +1869,23 @@ See `erc-display-server-message'." nil
|
||||
(define-erc-response-handler (403)
|
||||
"No such channel." nil
|
||||
(erc-display-message parsed '(notice error) 'active
|
||||
's403 ?c (second (erc-response.command-args parsed))))
|
||||
's403 ?c (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (404)
|
||||
"Cannot send to channel." nil
|
||||
(erc-display-message parsed '(notice error) 'active
|
||||
's404 ?c (second (erc-response.command-args parsed))))
|
||||
's404 ?c (cadr (erc-response.command-args parsed))))
|
||||
|
||||
|
||||
(define-erc-response-handler (405)
|
||||
"Can't join that many channels." nil
|
||||
(erc-display-message parsed '(notice error) 'active
|
||||
's405 ?c (second (erc-response.command-args parsed))))
|
||||
's405 ?c (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (406)
|
||||
"No such nick." nil
|
||||
(erc-display-message parsed '(notice error) 'active
|
||||
's406 ?n (second (erc-response.command-args parsed))))
|
||||
's406 ?n (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (412)
|
||||
"No text to send." nil
|
||||
@ -1894,33 +1894,33 @@ See `erc-display-server-message'." nil
|
||||
(define-erc-response-handler (421)
|
||||
"Unknown command." nil
|
||||
(erc-display-message parsed '(notice error) 'active 's421
|
||||
?c (second (erc-response.command-args parsed))))
|
||||
?c (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (432)
|
||||
"Bad nick." nil
|
||||
(erc-display-message parsed '(notice error) 'active 's432
|
||||
?n (second (erc-response.command-args parsed))))
|
||||
?n (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (433)
|
||||
"Login-time \"nick in use\"." nil
|
||||
(erc-nickname-in-use (second (erc-response.command-args parsed))
|
||||
(erc-nickname-in-use (cadr (erc-response.command-args parsed))
|
||||
"already in use"))
|
||||
|
||||
(define-erc-response-handler (437)
|
||||
"Nick temporarily unavailable (on IRCnet)." nil
|
||||
(let ((nick/channel (second (erc-response.command-args parsed))))
|
||||
(let ((nick/channel (cadr (erc-response.command-args parsed))))
|
||||
(unless (erc-channel-p nick/channel)
|
||||
(erc-nickname-in-use nick/channel "temporarily unavailable"))))
|
||||
|
||||
(define-erc-response-handler (442)
|
||||
"Not on channel." nil
|
||||
(erc-display-message parsed '(notice error) 'active 's442
|
||||
?c (second (erc-response.command-args parsed))))
|
||||
?c (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (461)
|
||||
"Not enough parameters for command." nil
|
||||
(erc-display-message parsed '(notice error) 'active 's461
|
||||
?c (second (erc-response.command-args parsed))
|
||||
?c (cadr (erc-response.command-args parsed))
|
||||
?m (erc-response.contents parsed)))
|
||||
|
||||
(define-erc-response-handler (465)
|
||||
@ -1936,37 +1936,37 @@ See `erc-display-server-message'." nil
|
||||
(erc-display-message parsed '(notice error) nil
|
||||
(intern (format "s%s"
|
||||
(erc-response.command parsed)))
|
||||
?c (second (erc-response.command-args parsed))))
|
||||
?c (cadr (erc-response.command-args parsed))))
|
||||
|
||||
(define-erc-response-handler (475)
|
||||
"Channel key needed." nil
|
||||
(erc-display-message parsed '(notice error) nil 's475
|
||||
?c (second (erc-response.command-args parsed)))
|
||||
?c (cadr (erc-response.command-args parsed)))
|
||||
(when erc-prompt-for-channel-key
|
||||
(let ((channel (second (erc-response.command-args parsed)))
|
||||
(let ((channel (cadr (erc-response.command-args parsed)))
|
||||
(key (read-from-minibuffer
|
||||
(format "Channel %s is mode +k. Enter key (RET to cancel): "
|
||||
(second (erc-response.command-args parsed))))))
|
||||
(cadr (erc-response.command-args parsed))))))
|
||||
(when (and key (> (length key) 0))
|
||||
(erc-cmd-JOIN channel key)))))
|
||||
|
||||
(define-erc-response-handler (477)
|
||||
"Channel doesn't support modes." nil
|
||||
(let ((channel (second (erc-response.command-args parsed)))
|
||||
(let ((channel (cadr (erc-response.command-args parsed)))
|
||||
(message (erc-response.contents parsed)))
|
||||
(erc-display-message parsed 'notice (erc-get-buffer channel proc)
|
||||
(format "%s: %s" channel message))))
|
||||
|
||||
(define-erc-response-handler (482)
|
||||
"You need to be a channel operator to do that." nil
|
||||
(let ((channel (second (erc-response.command-args parsed)))
|
||||
(let ((channel (cadr (erc-response.command-args parsed)))
|
||||
(message (erc-response.contents parsed)))
|
||||
(erc-display-message parsed '(error notice) 'active 's482
|
||||
?c channel ?m message)))
|
||||
|
||||
(define-erc-response-handler (671)
|
||||
"Secure connection response in WHOIS." nil
|
||||
(let ((nick (second (erc-response.command-args parsed)))
|
||||
(let ((nick (cadr (erc-response.command-args parsed)))
|
||||
(securemsg (erc-response.contents parsed)))
|
||||
(erc-display-message parsed 'notice 'active 's671
|
||||
?n nick ?a securemsg)))
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
2012-11-23 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
* config.nt: Sync with autogen/config.in.
|
||||
(BROKEN_GETWD, HAVE_CLOSEDIR, HAVE_DIRENT_H, HAVE_FCNTL_H, HAVE_GETWD):
|
||||
Remove.
|
||||
|
||||
2012-11-23 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* gmake.defs (SWITCHCHAR): Define to // under MSYS, / otherwise.
|
||||
|
||||
15
nt/config.nt
15
nt/config.nt
@ -54,9 +54,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||||
/* Define to the number of bits in type 'wint_t'. */
|
||||
#undef BITSIZEOF_WINT_T
|
||||
|
||||
/* Define if getwd should not be used. */
|
||||
#undef BROKEN_GETWD
|
||||
|
||||
/* Define if get_current_dir_name should not be used. */
|
||||
#undef BROKEN_GET_CURRENT_DIR_NAME
|
||||
|
||||
@ -262,9 +259,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||||
/* Define to 1 if you have the `clock_settime' function. */
|
||||
#undef HAVE_CLOCK_SETTIME
|
||||
|
||||
/* Define to 1 if you have the `closedir' function. */
|
||||
#define HAVE_CLOSEDIR 1
|
||||
|
||||
/* Define to 1 if you have the <coff.h> header file. */
|
||||
#undef HAVE_COFF_H
|
||||
|
||||
@ -348,9 +342,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||||
/* Define to 1 if you have the `difftime' function. */
|
||||
#undef HAVE_DIFFTIME
|
||||
|
||||
/* Define to 1 if you have the <dirent.h> header file. */
|
||||
#undef HAVE_DIRENT_H
|
||||
|
||||
/* Define to 1 if you have the 'dup2' function. */
|
||||
#define HAVE_DUP2 1
|
||||
|
||||
@ -375,9 +366,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||||
/* Define to 1 if you have the `faccessat' function. */
|
||||
#undef HAVE_FACCESSAT
|
||||
|
||||
/* Define to 1 if you have the <fcntl.h> header file. */
|
||||
#undef HAVE_FCNTL_H
|
||||
|
||||
/* Define to 1 if you have the `fork' function. */
|
||||
#undef HAVE_FORK
|
||||
|
||||
@ -459,9 +447,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||||
/* Define to 1 if you have the `gettimeofday' function. */
|
||||
#define HAVE_GETTIMEOFDAY 1
|
||||
|
||||
/* Define to 1 if you have the `getwd' function. */
|
||||
#undef HAVE_GETWD
|
||||
|
||||
/* Define to 1 if you have the `get_current_dir_name' function. */
|
||||
#undef HAVE_GET_CURRENT_DIR_NAME
|
||||
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
2012-11-23 Dmitry Antipov <dmantipov@yandex.ru>
|
||||
|
||||
* frame.h (struct frame): Remove display_preempted member
|
||||
since all users are dead long ago.
|
||||
* nsterm.h (struct x_output): Use the only dummy member.
|
||||
* w32menu.c (pending_menu_activation): Remove since not
|
||||
really used.
|
||||
(set_frame_menubar): Adjust user.
|
||||
* w32term.h (struct x_output): Drop outdated #if 0 code.
|
||||
(struct w32_output): Use bitfields for explicit_parent,
|
||||
asked_for_visible and menubar_active members. Drop
|
||||
unused pending_menu_activation member.
|
||||
* xterm.h (struct x_output): Drop outdated #if 0 code.
|
||||
Use bitfields for explicit_parent, asked_for_visible,
|
||||
has_been_visible and net_wm_state_hidden_seen members.
|
||||
|
||||
2012-11-23 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* makefile.w32-in (globals.h, gl-stamp): Use $(SWITCHCHAR) instead
|
||||
|
||||
@ -357,9 +357,6 @@ struct frame
|
||||
unsigned int external_menu_bar : 1;
|
||||
#endif
|
||||
|
||||
/* Nonzero if last attempt at redisplay on this frame was preempted. */
|
||||
unsigned display_preempted : 1;
|
||||
|
||||
/* visible is nonzero if the frame is currently displayed; we check
|
||||
it to see if we should bother updating the frame's contents.
|
||||
DON'T SET IT DIRECTLY; instead, use FRAME_SET_VISIBLE.
|
||||
|
||||
@ -630,8 +630,7 @@ struct ns_output
|
||||
/* this dummy decl needed to support TTYs */
|
||||
struct x_output
|
||||
{
|
||||
unsigned long background_pixel;
|
||||
unsigned long foreground_pixel;
|
||||
int unused;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -114,17 +114,6 @@ static int fill_in_menu (HMENU, widget_value *);
|
||||
|
||||
void w32_free_menu_strings (HWND);
|
||||
|
||||
|
||||
|
||||
/* This is set nonzero after the user activates the menu bar, and set
|
||||
to zero again after the menu bars are redisplayed by prepare_menu_bar.
|
||||
While it is nonzero, all calls to set_frame_menubar go deep.
|
||||
|
||||
I don't understand why this is needed, but it does seem to be
|
||||
needed on Motif, according to Marcus Daniels <marcus@sysc.pdx.edu>. */
|
||||
|
||||
int pending_menu_activation;
|
||||
|
||||
#ifdef HAVE_MENUS
|
||||
|
||||
DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
|
||||
@ -389,8 +378,6 @@ set_frame_menubar (FRAME_PTR f, bool first_time, bool deep_p)
|
||||
|
||||
if (! menubar_widget)
|
||||
deep_p = 1;
|
||||
else if (pending_menu_activation && !deep_p)
|
||||
deep_p = 1;
|
||||
|
||||
if (deep_p)
|
||||
{
|
||||
|
||||
@ -251,16 +251,10 @@ extern Lisp_Object x_get_focus_frame (struct frame *);
|
||||
diffs between X and w32 code. */
|
||||
struct x_output
|
||||
{
|
||||
#if 0 /* These are also defined in struct frame. Use that instead. */
|
||||
PIX_TYPE background_pixel;
|
||||
PIX_TYPE foreground_pixel;
|
||||
#endif
|
||||
|
||||
/* Keep track of focus. May be EXPLICIT if we received a FocusIn for this
|
||||
frame, or IMPLICIT if we received an EnterNotify.
|
||||
FocusOut and LeaveNotify clears EXPLICIT/IMPLICIT. */
|
||||
int focus_state;
|
||||
|
||||
};
|
||||
|
||||
enum
|
||||
@ -347,17 +341,13 @@ struct w32_output
|
||||
|
||||
/* Nonzero means our parent is another application's window
|
||||
and was explicitly specified. */
|
||||
char explicit_parent;
|
||||
unsigned explicit_parent : 1;
|
||||
|
||||
/* Nonzero means tried already to make this frame visible. */
|
||||
char asked_for_visible;
|
||||
unsigned asked_for_visible : 1;
|
||||
|
||||
/* Nonzero means menubar is currently active. */
|
||||
char menubar_active;
|
||||
|
||||
/* Nonzero means menubar is about to become active, but should be
|
||||
brought up to date first. */
|
||||
volatile char pending_menu_activation;
|
||||
unsigned menubar_active : 1;
|
||||
|
||||
/* Relief GCs, colors etc. */
|
||||
struct relief
|
||||
|
||||
14
src/xterm.h
14
src/xterm.h
@ -506,12 +506,6 @@ struct x_output
|
||||
value contains an ID of the fontset, else -1. */
|
||||
int fontset;
|
||||
|
||||
/* Pixel values used for various purposes.
|
||||
border_pixel may be -1 meaning use a gray tile. */
|
||||
#if 0 /* These are also defined in struct frame. Use that instead. */
|
||||
unsigned long background_pixel;
|
||||
unsigned long foreground_pixel;
|
||||
#endif
|
||||
unsigned long cursor_pixel;
|
||||
unsigned long border_pixel;
|
||||
unsigned long mouse_pixel;
|
||||
@ -574,13 +568,13 @@ struct x_output
|
||||
|
||||
/* Nonzero means our parent is another application's window
|
||||
and was explicitly specified. */
|
||||
char explicit_parent;
|
||||
unsigned explicit_parent : 1;
|
||||
|
||||
/* Nonzero means tried already to make this frame visible. */
|
||||
char asked_for_visible;
|
||||
unsigned asked_for_visible : 1;
|
||||
|
||||
/* Nonzero if this frame was ever previously visible. */
|
||||
char has_been_visible;
|
||||
unsigned has_been_visible : 1;
|
||||
|
||||
#ifdef HAVE_X_I18N
|
||||
/* Input context (currently, this means Compose key handler setup). */
|
||||
@ -634,7 +628,7 @@ struct x_output
|
||||
int top_before_move;
|
||||
|
||||
/* Non-zero if _NET_WM_STATE_HIDDEN is set for this frame. */
|
||||
int net_wm_state_hidden_seen;
|
||||
unsigned net_wm_state_hidden_seen : 1;
|
||||
};
|
||||
|
||||
#define No_Cursor (None)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user