aboutsummaryrefslogtreecommitdiffstats
path: root/src/pgtkterm.c
diff options
context:
space:
mode:
authorYuuki Harano2021-11-14 20:27:31 +0900
committerYuuki Harano2021-11-14 20:27:31 +0900
commit30a00f14c824e5e4005a1cb6ccf2f26def19d80b (patch)
treec1c4232181c4d091fc389d6934929795f94ac488 /src/pgtkterm.c
parent3e20d50fc5a8fc94b571e140a696ccd65040e6c1 (diff)
downloademacs-30a00f14c824e5e4005a1cb6ccf2f26def19d80b.tar.gz
emacs-30a00f14c824e5e4005a1cb6ccf2f26def19d80b.zip
Fix coding style
Especially, insert a space between function name and paren. * src/alloc.c (garbage_collect): * src/font.h: * src/frame.h: * src/fringe.c: * src/gtkutil.c (xg_set_screen): (xg_create_frame_widgets): (xg_create_frame_outer_widgets): (xg_get_file_name): (xg_get_font): (xg_update_scrollbar_pos): * src/image.c (image_create_bitmap_from_file): (xpm_load_image): * src/pgtkfns.c (pgtk_get_monitor_scale_factor): (is_wayland_display): (pgtk_display_info_for_name): (INSTALL_CURSOR): (Fx_create_frame): (Fx_display_mm_height): (Fx_display_mm_width): (Fx_display_pixel_width): (Fx_display_pixel_height): * src/pgtkselect.c (pgtk_selection_usable): (Fpgtk_own_selection_internal): (Fpgtk_get_selection_internal): * src/pgtkterm.c: (x_set_parent_frame): (pgtk_draw_fringe_bitmap): (pgtk_handle_draw): (scroll_event): (pgtk_text_scaling_factor): (pgtk_term_init): * src/pgtkterm.h: * src/window.h: * src/xdisp.c (redisplay_internal): (draw_glyphs_debug): (draw_glyphs): (note_mouse_highlight):
Diffstat (limited to 'src/pgtkterm.c')
-rw-r--r--src/pgtkterm.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 40489c0c6b1..d81517a5d8e 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -67,7 +67,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
67 67
68#define FRAME_CR_CONTEXT(f) ((f)->output_data.pgtk->cr_context) 68#define FRAME_CR_CONTEXT(f) ((f)->output_data.pgtk->cr_context)
69#define FRAME_CR_ACTIVE_CONTEXT(f) ((f)->output_data.pgtk->cr_active) 69#define FRAME_CR_ACTIVE_CONTEXT(f) ((f)->output_data.pgtk->cr_active)
70#define FRAME_CR_SURFACE(f) (cairo_get_target(FRAME_CR_CONTEXT(f))) 70#define FRAME_CR_SURFACE(f) (cairo_get_target (FRAME_CR_CONTEXT (f)))
71#define FRAME_CR_SURFACE_DESIRED_WIDTH(f) \ 71#define FRAME_CR_SURFACE_DESIRED_WIDTH(f) \
72 ((f)->output_data.pgtk->cr_surface_desired_width) 72 ((f)->output_data.pgtk->cr_surface_desired_width)
73#define FRAME_CR_SURFACE_DESIRED_HEIGHT(f) \ 73#define FRAME_CR_SURFACE_DESIRED_HEIGHT(f) \
@@ -829,7 +829,7 @@ x_set_parent_frame (struct frame *f, Lisp_Object new_value,
829 GtkWidget *fixed = FRAME_GTK_WIDGET (f); 829 GtkWidget *fixed = FRAME_GTK_WIDGET (f);
830 830
831 GtkAllocation alloc; 831 GtkAllocation alloc;
832 gtk_widget_get_allocation(fixed, &alloc); 832 gtk_widget_get_allocation (fixed, &alloc);
833 g_object_ref (fixed); 833 g_object_ref (fixed);
834 834
835 GtkCssProvider *provider = FRAME_X_OUTPUT (f)->border_color_css_provider; 835 GtkCssProvider *provider = FRAME_X_OUTPUT (f)->border_color_css_provider;
@@ -3545,7 +3545,7 @@ pgtk_draw_fringe_bitmap (struct window *w, struct glyph_row *row,
3545 p->wd, p->h, p->x, p->y, p->overlay_p); 3545 p->wd, p->h, p->x, p->y, p->overlay_p);
3546 } 3546 }
3547 3547
3548 pgtk_end_cr_clip(f); 3548 pgtk_end_cr_clip (f);
3549} 3549}
3550 3550
3551static struct atimer *hourglass_atimer = NULL; 3551static struct atimer *hourglass_atimer = NULL;
@@ -5368,7 +5368,7 @@ pgtk_handle_draw (GtkWidget * widget, cairo_t * cr, gpointer * data)
5368 PGTK_TRACE (" garbaged=%d", f->garbaged); 5368 PGTK_TRACE (" garbaged=%d", f->garbaged);
5369 PGTK_TRACE (" scroll_bar_width=%f", 5369 PGTK_TRACE (" scroll_bar_width=%f",
5370 (double) PGTK_SCROLL_BAR_WIDTH (f)); 5370 (double) PGTK_SCROLL_BAR_WIDTH (f));
5371 // PGTK_TRACE(" scroll_bar_adjust=%d", PGTK_SCROLL_BAR_ADJUST(f)); 5371 // PGTK_TRACE(" scroll_bar_adjust=%d", PGTK_SCROLL_BAR_ADJUST (f));
5372 PGTK_TRACE (" scroll_bar_cols=%d", FRAME_SCROLL_BAR_COLS (f)); 5372 PGTK_TRACE (" scroll_bar_cols=%d", FRAME_SCROLL_BAR_COLS (f));
5373 PGTK_TRACE (" column_width=%d", FRAME_COLUMN_WIDTH (f)); 5373 PGTK_TRACE (" column_width=%d", FRAME_COLUMN_WIDTH (f));
5374 cairo_set_source_surface (cr, src, 0, 0); 5374 cairo_set_source_surface (cr, src, 0, 0);
@@ -6611,7 +6611,7 @@ scroll_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
6611 int nlines = dpyinfo->scroll.acc_y / dpyinfo->scroll.y_per_line; 6611 int nlines = dpyinfo->scroll.acc_y / dpyinfo->scroll.y_per_line;
6612 inev.ie.kind = WHEEL_EVENT; 6612 inev.ie.kind = WHEEL_EVENT;
6613 inev.ie.modifiers |= down_modifier; 6613 inev.ie.modifiers |= down_modifier;
6614 inev.ie.arg = make_fixnum(nlines); 6614 inev.ie.arg = make_fixnum (nlines);
6615 dpyinfo->scroll.acc_y -= dpyinfo->scroll.y_per_line * nlines; 6615 dpyinfo->scroll.acc_y -= dpyinfo->scroll.y_per_line * nlines;
6616 } 6616 }
6617 else if (dpyinfo->scroll.acc_y <= -dpyinfo->scroll.y_per_line) 6617 else if (dpyinfo->scroll.acc_y <= -dpyinfo->scroll.y_per_line)
@@ -6619,7 +6619,7 @@ scroll_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
6619 int nlines = -dpyinfo->scroll.acc_y / dpyinfo->scroll.y_per_line; 6619 int nlines = -dpyinfo->scroll.acc_y / dpyinfo->scroll.y_per_line;
6620 inev.ie.kind = WHEEL_EVENT; 6620 inev.ie.kind = WHEEL_EVENT;
6621 inev.ie.modifiers |= up_modifier; 6621 inev.ie.modifiers |= up_modifier;
6622 inev.ie.arg = make_fixnum(nlines); 6622 inev.ie.arg = make_fixnum (nlines);
6623 dpyinfo->scroll.acc_y -= -dpyinfo->scroll.y_per_line * nlines; 6623 dpyinfo->scroll.acc_y -= -dpyinfo->scroll.y_per_line * nlines;
6624 } 6624 }
6625 else if (dpyinfo->scroll.acc_x >= dpyinfo->scroll.x_per_char) 6625 else if (dpyinfo->scroll.acc_x >= dpyinfo->scroll.x_per_char)
@@ -6627,7 +6627,7 @@ scroll_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
6627 int nchars = dpyinfo->scroll.acc_x / dpyinfo->scroll.x_per_char; 6627 int nchars = dpyinfo->scroll.acc_x / dpyinfo->scroll.x_per_char;
6628 inev.ie.kind = HORIZ_WHEEL_EVENT; 6628 inev.ie.kind = HORIZ_WHEEL_EVENT;
6629 inev.ie.modifiers |= up_modifier; 6629 inev.ie.modifiers |= up_modifier;
6630 inev.ie.arg = make_fixnum(nchars); 6630 inev.ie.arg = make_fixnum (nchars);
6631 dpyinfo->scroll.acc_x -= dpyinfo->scroll.x_per_char * nchars; 6631 dpyinfo->scroll.acc_x -= dpyinfo->scroll.x_per_char * nchars;
6632 } 6632 }
6633 else if (dpyinfo->scroll.acc_x <= -dpyinfo->scroll.x_per_char) 6633 else if (dpyinfo->scroll.acc_x <= -dpyinfo->scroll.x_per_char)
@@ -6635,7 +6635,7 @@ scroll_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
6635 int nchars = -dpyinfo->scroll.acc_x / dpyinfo->scroll.x_per_char; 6635 int nchars = -dpyinfo->scroll.acc_x / dpyinfo->scroll.x_per_char;
6636 inev.ie.kind = HORIZ_WHEEL_EVENT; 6636 inev.ie.kind = HORIZ_WHEEL_EVENT;
6637 inev.ie.modifiers |= down_modifier; 6637 inev.ie.modifiers |= down_modifier;
6638 inev.ie.arg = make_fixnum(nchars); 6638 inev.ie.arg = make_fixnum (nchars);
6639 dpyinfo->scroll.acc_x -= -dpyinfo->scroll.x_per_char * nchars; 6639 dpyinfo->scroll.acc_x -= -dpyinfo->scroll.x_per_char * nchars;
6640 } 6640 }
6641 } 6641 }
@@ -6806,7 +6806,7 @@ same_x_server (const char *name1, const char *name2)
6806 6806
6807#define GNOME_INTERFACE_SCHEMA "org.gnome.desktop.interface" 6807#define GNOME_INTERFACE_SCHEMA "org.gnome.desktop.interface"
6808 6808
6809static gdouble pgtk_text_scaling_factor(void) 6809static gdouble pgtk_text_scaling_factor (void)
6810{ 6810{
6811 GSettingsSchemaSource *schema_source = g_settings_schema_source_get_default (); 6811 GSettingsSchemaSource *schema_source = g_settings_schema_source_get_default ();
6812 if (schema_source != NULL) 6812 if (schema_source != NULL)
@@ -6999,7 +6999,7 @@ pgtk_term_init (Lisp_Object display_name, char *resource_name)
6999 if (dpi < 0) 6999 if (dpi < 0)
7000 dpi = 96.0; 7000 dpi = 96.0;
7001 7001
7002 dpi *= pgtk_text_scaling_factor(); 7002 dpi *= pgtk_text_scaling_factor ();
7003 dpyinfo->resx = dpi; 7003 dpyinfo->resx = dpi;
7004 dpyinfo->resy = dpi; 7004 dpyinfo->resy = dpi;
7005 } 7005 }