[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114495: * window.h (struct window): Prefer enum tex
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r114495: * window.h (struct window): Prefer enum text_cursor_kinds to int |
Date: |
Wed, 02 Oct 2013 12:11:40 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114495
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-02 16:08:27 +0400
message:
* window.h (struct window): Prefer enum text_cursor_kinds to int
for phys_cursor_type member. Move the latter, phys_cursor_width,
phys_cursor_ascent and phys_cursor_height under HAVE_WINDOW_SYSTEM.
* window.c (replace_window, make_window): Adjust users.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/window.c window.c-20091113204419-o5vbwnq5f7feedwu-231
src/window.h window.h-20091113204419-o5vbwnq5f7feedwu-271
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-10-02 11:49:24 +0000
+++ b/src/ChangeLog 2013-10-02 12:08:27 +0000
@@ -1,5 +1,12 @@
2013-10-02 Dmitry Antipov <address@hidden>
+ * window.h (struct window): Prefer enum text_cursor_kinds to int
+ for phys_cursor_type member. Move the latter, phys_cursor_width,
+ phys_cursor_ascent and phys_cursor_height under HAVE_WINDOW_SYSTEM.
+ * window.c (replace_window, make_window): Adjust users.
+
+2013-10-02 Dmitry Antipov <address@hidden>
+
* fringe.c (toplevel): Do not use HAVE_WINDOW_SYSTEM because
this module is never compiled otherwise.
=== modified file 'src/window.c'
--- a/src/window.c 2013-09-29 16:18:55 +0000
+++ b/src/window.c 2013-10-02 12:08:27 +0000
@@ -2008,8 +2008,10 @@
memset (&n->cursor, 0, sizeof (n->cursor));
memset (&n->phys_cursor, 0, sizeof (n->phys_cursor));
n->last_cursor_vpos = 0;
- n->phys_cursor_type = -1;
+#ifdef HAVE_WINDOW_SYSTEM
+ n->phys_cursor_type = NO_CURSOR;
n->phys_cursor_width = -1;
+#endif
n->must_be_updated_p = 0;
n->pseudo_window_p = 0;
n->window_end_vpos = 0;
@@ -3420,8 +3422,10 @@
w->nrows_scale_factor = w->ncols_scale_factor = 1;
w->left_fringe_width = w->right_fringe_width = -1;
w->mode_line_height = w->header_line_height = -1;
- w->phys_cursor_type = -1;
+#ifdef HAVE_WINDOW_SYSTEM
+ w->phys_cursor_type = NO_CURSOR;
w->phys_cursor_width = -1;
+#endif
w->scroll_bar_width = -1;
w->column_number_displayed = -1;
=== modified file 'src/window.h'
--- a/src/window.h 2013-09-20 15:34:36 +0000
+++ b/src/window.h 2013-10-02 12:08:27 +0000
@@ -240,13 +240,19 @@
without pause. This is the position of last_point. */
int last_cursor_vpos;
- /* Cursor type and width of last cursor drawn on the window.
- Used for X and w32 frames; -1 initially. */
- int phys_cursor_type, phys_cursor_width;
+#ifdef HAVE_WINDOW_SYSTEM
+
+ /* Cursor type of last cursor drawn on the window. */
+ enum text_cursor_kinds phys_cursor_type;
+
+ /* Width of the cursor above. */
+ int phys_cursor_width;
/* This is handy for undrawing the cursor. */
int phys_cursor_ascent, phys_cursor_height;
+#endif /* HAVE_WINDOW_SYSTEM */
+
/* Width of left and right fringes, in pixels.
A value of -1 means use frame values. */
int left_fringe_width;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114495: * window.h (struct window): Prefer enum text_cursor_kinds to int,
Dmitry Antipov <=