[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114328: * frame.h (x_set_bitmap_icon) [!HAVE_NS]: N
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r114328: * frame.h (x_set_bitmap_icon) [!HAVE_NS]: New function. |
Date: |
Tue, 17 Sep 2013 13:09:54 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114328
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 16:59:45 +0400
message:
* frame.h (x_set_bitmap_icon) [!HAVE_NS]: New function.
(x_icon_type): Remove prototype.
(x_bitmap_icon) [!HAVE_NS]: Declare as such.
* frame.c (x_icon_type): Remove.
* w32term.c (x_make_frame_visible, x_iconify_frame):
* xterm.c (x_make_frame_visible, x_iconify_frame):
Use x_set_bitmap_icon to factor out common code.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/frame.c frame.c-20091113204419-o5vbwnq5f7feedwu-243
src/frame.h frame.h-20091113204419-o5vbwnq5f7feedwu-229
src/w32term.c w32term.c-20091113204419-o5vbwnq5f7feedwu-950
src/xterm.c xterm.c-20091113204419-o5vbwnq5f7feedwu-244
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-09-17 12:27:21 +0000
+++ b/src/ChangeLog 2013-09-17 12:59:45 +0000
@@ -1,5 +1,15 @@
2013-09-17 Dmitry Antipov <address@hidden>
+ * frame.h (x_set_bitmap_icon) [!HAVE_NS]: New function.
+ (x_icon_type): Remove prototype.
+ (x_bitmap_icon) [!HAVE_NS]: Declare as such.
+ * frame.c (x_icon_type): Remove.
+ * w32term.c (x_make_frame_visible, x_iconify_frame):
+ * xterm.c (x_make_frame_visible, x_iconify_frame):
+ Use x_set_bitmap_icon to factor out common code.
+
+2013-09-17 Dmitry Antipov <address@hidden>
+
* dispextern.h (check_x_display_info, x_get_string_resource):
Declare here just once and unify the latter.
* frame.c (check_x_display_info, x_get_string_resource):
=== modified file 'src/frame.c'
--- a/src/frame.c 2013-09-17 12:27:21 +0000
+++ b/src/frame.c 2013-09-17 12:59:45 +0000
@@ -3381,22 +3381,6 @@
XWINDOW (FRAME_SELECTED_WINDOW (f))->cursor.x = 0;
}
-
-
-/* Return non-nil if frame F wants a bitmap icon. */
-
-Lisp_Object
-x_icon_type (struct frame *f)
-{
- Lisp_Object tem;
-
- tem = assq_no_quit (Qicon_type, f->param_alist);
- if (CONSP (tem))
- return XCDR (tem);
- else
- return Qnil;
-}
-
void
x_set_alpha (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
=== modified file 'src/frame.h'
--- a/src/frame.h 2013-09-16 07:27:51 +0000
+++ b/src/frame.h 2013-09-17 12:59:45 +0000
@@ -1230,8 +1230,6 @@
extern void x_set_scroll_bar_width (struct frame *, Lisp_Object,
Lisp_Object);
-extern Lisp_Object x_icon_type (struct frame *);
-
extern long x_figure_window_size (struct frame *, Lisp_Object, bool);
extern void x_set_alpha (struct frame *, Lisp_Object, Lisp_Object);
@@ -1260,7 +1258,6 @@
Lisp_Object oldval);
extern void x_activate_menubar (struct frame *);
extern void x_real_positions (struct frame *, int *, int *);
-extern int x_bitmap_icon (struct frame *, Lisp_Object);
extern void x_set_menu_bar_lines (struct frame *,
Lisp_Object,
Lisp_Object);
@@ -1279,8 +1276,24 @@
extern void x_query_color (struct frame *f, XColor *);
extern void x_focus_frame (struct frame *);
+#ifndef HAVE_NS
+
+extern int x_bitmap_icon (struct frame *, Lisp_Object);
+
+/* Set F's bitmap icon, if specified among F's parameters. */
+
+FRAME_INLINE void
+x_set_bitmap_icon (struct frame *f)
+{
+ Lisp_Object obj = assq_no_quit (Qicon_type, f->param_alist);
+
+ if (CONSP (obj))
+ x_bitmap_icon (f, XCDR (obj));
+}
+
+#endif /* !HAVE_NS */
+
#endif /* HAVE_WINDOW_SYSTEM */
-
FRAME_INLINE void
flush_frame (struct frame *f)
=== modified file 'src/w32term.c'
--- a/src/w32term.c 2013-09-17 08:24:20 +0000
+++ b/src/w32term.c 2013-09-17 12:59:45 +0000
@@ -5915,13 +5915,9 @@
void
x_make_frame_visible (struct frame *f)
{
- Lisp_Object type;
-
block_input ();
- type = x_icon_type (f);
- if (!NILP (type))
- x_bitmap_icon (f, type);
+ x_set_bitmap_icon (f);
if (! FRAME_VISIBLE_P (f))
{
@@ -6031,8 +6027,6 @@
void
x_iconify_frame (struct frame *f)
{
- Lisp_Object type;
-
/* Don't keep the highlight on an invisible frame. */
if (FRAME_DISPLAY_INFO (f)->x_highlight_frame == f)
FRAME_DISPLAY_INFO (f)->x_highlight_frame = 0;
@@ -6042,9 +6036,7 @@
block_input ();
- type = x_icon_type (f);
- if (!NILP (type))
- x_bitmap_icon (f, type);
+ x_set_bitmap_icon (f);
/* Simulate the user minimizing the frame. */
SendMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, SC_MINIMIZE, 0);
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2013-09-17 08:24:20 +0000
+++ b/src/xterm.c 2013-09-17 12:59:45 +0000
@@ -9008,7 +9008,6 @@
void
x_make_frame_visible (struct frame *f)
{
- Lisp_Object type;
int original_top, original_left;
int retry_count = 2;
@@ -9016,9 +9015,7 @@
block_input ();
- type = x_icon_type (f);
- if (!NILP (type))
- x_bitmap_icon (f, type);
+ x_set_bitmap_icon (f);
if (! FRAME_VISIBLE_P (f))
{
@@ -9225,7 +9222,6 @@
#ifdef USE_X_TOOLKIT
int result;
#endif
- Lisp_Object type;
/* Don't keep the highlight on an invisible frame. */
if (FRAME_DISPLAY_INFO (f)->x_highlight_frame == f)
@@ -9236,9 +9232,7 @@
block_input ();
- type = x_icon_type (f);
- if (!NILP (type))
- x_bitmap_icon (f, type);
+ x_set_bitmap_icon (f);
#if defined (USE_GTK)
if (FRAME_GTK_OUTER_WIDGET (f))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114328: * frame.h (x_set_bitmap_icon) [!HAVE_NS]: New function.,
Dmitry Antipov <=