diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-03-23 11:19:40 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-04-26 16:10:49 -0600 |
| commit | ff4e31fa328a2cee5197beb20f068eb021712b5c (patch) | |
| tree | d49388dd87c3cf11f6231baae8a85089b3344c0f /src/xfns.c | |
| parent | 86b6e91091ba14edb4811427fec8fe194f6520d4 (diff) | |
| download | emacs-ff4e31fa328a2cee5197beb20f068eb021712b5c.tar.gz emacs-ff4e31fa328a2cee5197beb20f068eb021712b5c.tar.bz2 emacs-ff4e31fa328a2cee5197beb20f068eb021712b5c.zip | |
Rename generic x_* procedures in xdisp.c
* src/xdisp.c (x_consider_frame_title, x_get_glyph_overhangs)
(x_produce_glyphs, x_write_glyphs, x_insert_glyphs)
(x_clear_end_of_line), x_fix_overlapping_area)
(x_update_cursor, x_clear_cursor, x_clear_window_mouse_face)
(x_draw_vertical_border, x_draw_right_divider, x_draw_bottom_divider)
(x_intersect_rectangles): Rename with a gui prefix to indicate
non-X-specific functionality.
* src/composite.c:
* src/dispextern.h:
* src/nsfns.m:
* src/nsterm.m:
* src/w32fns.c:
* src/w32term.c:
* src/window.c:
* src/xfns.c:
* src/xterm.c: Use the renamed procedures.
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xfns.c b/src/xfns.c index 9075491e978..ee3266e223d 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1388,8 +1388,8 @@ x_set_cursor_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval) if (FRAME_VISIBLE_P (f)) { - x_update_cursor (f, false); - x_update_cursor (f, true); + gui_update_cursor (f, false); + gui_update_cursor (f, true); } } @@ -4583,7 +4583,7 @@ x_get_monitor_for_frame (struct frame *f, if (mi->geom.width == 0) continue; - if (x_intersect_rectangles (&mi->geom, &frect, &res)) + if (gui_intersect_rectangles (&mi->geom, &frect, &res)) { a = res.width * res.height; if (a > area) @@ -4712,7 +4712,7 @@ x_get_monitor_attributes_xinerama (struct x_display_info *dpyinfo) if (i == 0 && x_get_net_workarea (dpyinfo, &workarea_r)) { mi->work = workarea_r; - if (! x_intersect_rectangles (&mi->geom, &mi->work, &mi->work)) + if (! gui_intersect_rectangles (&mi->geom, &mi->work, &mi->work)) mi->work = mi->geom; } else @@ -4816,7 +4816,7 @@ x_get_monitor_attributes_xrandr (struct x_display_info *dpyinfo) if (i == primary && x_get_net_workarea (dpyinfo, &workarea_r)) { mi->work= workarea_r; - if (! x_intersect_rectangles (&mi->geom, &mi->work, &mi->work)) + if (! gui_intersect_rectangles (&mi->geom, &mi->work, &mi->work)) mi->work = mi->geom; } else |