aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuuki Harano2020-03-25 00:23:42 +0900
committerJeff Walsh2020-11-24 12:24:39 +1100
commit992ef483006aad6c85138e901768fa9e1ef59784 (patch)
tree6f5e63aaa007cbdd5c604f386b51f7aca7f6ad55
parentd2a29e883e662a3f269628d5cbdf195c783ddf01 (diff)
downloademacs-992ef483006aad6c85138e901768fa9e1ef59784.tar.gz
emacs-992ef483006aad6c85138e901768fa9e1ef59784.zip
update redisplay_interface.
* src/pgtkfns.c (Fx_create_frame, pgtk_default_font_parameter): * src/pgtkterm.c (pgtk_redisplay_interface): * src/pgtkterm.h:
-rw-r--r--src/pgtkfns.c6
-rw-r--r--src/pgtkterm.c3
-rw-r--r--src/pgtkterm.h2
3 files changed, 7 insertions, 4 deletions
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index 2525547c3f7..2c8f73ebcb6 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -991,8 +991,8 @@ x_decode_color (struct frame *f, Lisp_Object color_name, int mono_color)
991 signal_error ("Undefined color", color_name); 991 signal_error ("Undefined color", color_name);
992} 992}
993 993
994static void 994void
995x_default_font_parameter (struct frame *f, Lisp_Object parms) 995pgtk_default_font_parameter (struct frame *f, Lisp_Object parms)
996{ 996{
997 struct pgtk_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); 997 struct pgtk_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
998 Lisp_Object font_param = gui_display_get_arg (dpyinfo, parms, Qfont, NULL, NULL, 998 Lisp_Object font_param = gui_display_get_arg (dpyinfo, parms, Qfont, NULL, NULL,
@@ -1262,7 +1262,7 @@ This function is an internal primitive--use `make-frame' instead. */)
1262 1262
1263 /* Extract the window parameters from the supplied values 1263 /* Extract the window parameters from the supplied values
1264 that are needed to determine window geometry. */ 1264 that are needed to determine window geometry. */
1265 x_default_font_parameter (f, parms); 1265 pgtk_default_font_parameter (f, parms);
1266 if (!FRAME_FONT (f)) 1266 if (!FRAME_FONT (f))
1267 { 1267 {
1268 delete_frame (frame, Qnoelisp); 1268 delete_frame (frame, Qnoelisp);
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 92ad1bc6c8e..fbfc295534b 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -3328,7 +3328,8 @@ static struct redisplay_interface pgtk_redisplay_interface =
3328 pgtk_draw_window_divider, 3328 pgtk_draw_window_divider,
3329 NULL, // pgtk_shift_glyphs_for_insert, 3329 NULL, // pgtk_shift_glyphs_for_insert,
3330 pgtk_show_hourglass, 3330 pgtk_show_hourglass,
3331 pgtk_hide_hourglass 3331 pgtk_hide_hourglass,
3332 pgtk_default_font_parameter,
3332}; 3333};
3333 3334
3334static void 3335static void
diff --git a/src/pgtkterm.h b/src/pgtkterm.h
index d441e16106e..7bc0f0da080 100644
--- a/src/pgtkterm.h
+++ b/src/pgtkterm.h
@@ -615,6 +615,8 @@ extern void x_change_tab_bar_height (struct frame *, int);
615 615
616extern struct pgtk_display_info *check_pgtk_display_info (Lisp_Object object); 616extern struct pgtk_display_info *check_pgtk_display_info (Lisp_Object object);
617 617
618extern void pgtk_default_font_parameter (struct frame *f, Lisp_Object parms);
619
618extern void pgtk_enqueue_string(struct frame *f, gchar *str); 620extern void pgtk_enqueue_string(struct frame *f, gchar *str);
619extern void pgtk_enqueue_preedit(struct frame *f, Lisp_Object image_data); 621extern void pgtk_enqueue_preedit(struct frame *f, Lisp_Object image_data);
620extern void pgtk_im_focus_in(struct frame *f); 622extern void pgtk_im_focus_in(struct frame *f);