aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYuuki Harano2020-05-26 20:38:38 +0900
committerJeff Walsh2020-11-24 12:24:40 +1100
commit20dbd4e283229c98e8bbf1a60da66dde00036d77 (patch)
treef4de2d563bf02cd6e769e5fdff9e741ec219dddf /src
parent1fe7caf3a6779f36d8dc6e0a32ccc7d5df8f3121 (diff)
downloademacs-20dbd4e283229c98e8bbf1a60da66dde00036d77.tar.gz
emacs-20dbd4e283229c98e8bbf1a60da66dde00036d77.zip
Change coding style
* src/gtkutil.c (xg_display_open): (xg_get_image_for_pixmap): (xg_frame_resized): (xg_create_frame_widgets): (x_wm_set_size_hint): (xg_frame_restack): (xg_finish_scroll_bar_creation): (xg_update_scrollbar_pos): (xg_update_horizontal_scrollbar_pos): (xg_set_toolkit_scroll_bar_thumb): (xg_event_is_for_scrollbar):
Diffstat (limited to 'src')
-rw-r--r--src/gtkutil.c70
1 files changed, 37 insertions, 33 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c
index ce08ffec375..97a8e4a5c1f 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -186,7 +186,7 @@ xg_display_open (char *display_name, GdkDisplay **dpy)
186#ifndef HAVE_PGTK 186#ifndef HAVE_PGTK
187 gdpy = gdk_display_open (display_name); 187 gdpy = gdk_display_open (display_name);
188#else 188#else
189 gdpy = gdk_display_open (strlen(display_name) == 0 ? NULL : display_name); 189 gdpy = gdk_display_open (strlen (display_name) == 0 ? NULL : display_name);
190#endif 190#endif
191 request_sigio (); 191 request_sigio ();
192 if (!gdpy_def && gdpy) 192 if (!gdpy_def && gdpy)
@@ -1020,15 +1020,15 @@ xg_frame_resized (struct frame *f, int pixelwidth, int pixelheight)
1020 1020
1021 width = FRAME_PIXEL_TO_TEXT_WIDTH (f, pixelwidth); 1021 width = FRAME_PIXEL_TO_TEXT_WIDTH (f, pixelwidth);
1022 height = FRAME_PIXEL_TO_TEXT_HEIGHT (f, pixelheight); 1022 height = FRAME_PIXEL_TO_TEXT_HEIGHT (f, pixelheight);
1023 PGTK_TRACE("xg_frame_resized: pixel: %dx%d, text: %dx%d", pixelwidth, pixelheight, width, height); 1023 PGTK_TRACE ("xg_frame_resized: pixel: %dx%d, text: %dx%d", pixelwidth, pixelheight, width, height);
1024 1024
1025 frame_size_history_add 1025 frame_size_history_add
1026 (f, Qxg_frame_resized, width, height, Qnil); 1026 (f, Qxg_frame_resized, width, height, Qnil);
1027 1027
1028 PGTK_TRACE("width: %d -> %d.", FRAME_TEXT_WIDTH(f), width); 1028 PGTK_TRACE ("width: %d -> %d.", FRAME_TEXT_WIDTH (f), width);
1029 PGTK_TRACE("height: %d -> %d.", FRAME_TEXT_HEIGHT(f), height); 1029 PGTK_TRACE ("height: %d -> %d.", FRAME_TEXT_HEIGHT (f), height);
1030 PGTK_TRACE("pixelwidth: %d -> %d.", FRAME_PIXEL_WIDTH(f), pixelwidth); 1030 PGTK_TRACE ("pixelwidth: %d -> %d.", FRAME_PIXEL_WIDTH (f), pixelwidth);
1031 PGTK_TRACE("pixelheight: %d -> %d.", FRAME_PIXEL_HEIGHT(f), pixelheight); 1031 PGTK_TRACE ("pixelheight: %d -> %d.", FRAME_PIXEL_HEIGHT (f), pixelheight);
1032 1032
1033 if (width != FRAME_TEXT_WIDTH (f) 1033 if (width != FRAME_TEXT_WIDTH (f)
1034 || height != FRAME_TEXT_HEIGHT (f) 1034 || height != FRAME_TEXT_HEIGHT (f)
@@ -1343,7 +1343,7 @@ xg_create_frame_widgets (struct frame *f)
1343 GtkWindowType type = GTK_WINDOW_TOPLEVEL; 1343 GtkWindowType type = GTK_WINDOW_TOPLEVEL;
1344 char *title = 0; 1344 char *title = 0;
1345 1345
1346 PGTK_TRACE("xg_create_frame_widgets."); 1346 PGTK_TRACE ("xg_create_frame_widgets.");
1347 block_input (); 1347 block_input ();
1348 1348
1349#ifndef HAVE_PGTK // gtk_plug not found. 1349#ifndef HAVE_PGTK // gtk_plug not found.
@@ -1504,7 +1504,7 @@ xg_create_frame_widgets (struct frame *f)
1504#else 1504#else
1505 gtk_widget_set_can_focus (wfixed, TRUE); 1505 gtk_widget_set_can_focus (wfixed, TRUE);
1506#ifdef HAVE_PGTK 1506#ifdef HAVE_PGTK
1507 gtk_widget_grab_focus(wfixed); 1507 gtk_widget_grab_focus (wfixed);
1508#endif 1508#endif
1509 gtk_window_set_resizable (GTK_WINDOW (wtop), TRUE); 1509 gtk_window_set_resizable (GTK_WINDOW (wtop), TRUE);
1510#endif 1510#endif
@@ -1643,7 +1643,7 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position)
1643 base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 1) + FRAME_TOOLBAR_WIDTH (f); 1643 base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 1) + FRAME_TOOLBAR_WIDTH (f);
1644 base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1) 1644 base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1)
1645 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); 1645 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
1646 PGTK_TRACE("base: %dx%d\n", base_width, base_height); 1646 PGTK_TRACE ("base: %dx%d\n", base_width, base_height);
1647 1647
1648 size_hints.base_width = base_width; 1648 size_hints.base_width = base_width;
1649 size_hints.base_height = base_height; 1649 size_hints.base_height = base_height;
@@ -1771,7 +1771,7 @@ xg_frame_restack (struct frame *f1, struct frame *f2, bool above_flag)
1771#ifndef HAVE_PGTK 1771#ifndef HAVE_PGTK
1772 x_sync (f1); 1772 x_sync (f1);
1773#else 1773#else
1774 gdk_flush(); 1774 gdk_flush ();
1775#endif 1775#endif
1776 } 1776 }
1777 unblock_input (); 1777 unblock_input ();
@@ -4039,7 +4039,7 @@ xg_finish_scroll_bar_creation (struct frame *f,
4039 Emacs main window, which we draw over using Xlib. */ 4039 Emacs main window, which we draw over using Xlib. */
4040 gtk_widget_realize (webox); 4040 gtk_widget_realize (webox);
4041#ifdef HAVE_PGTK 4041#ifdef HAVE_PGTK
4042 gtk_widget_show_all(webox); 4042 gtk_widget_show_all (webox);
4043#endif 4043#endif
4044#ifndef HAVE_PGTK 4044#ifndef HAVE_PGTK
4045 GTK_WIDGET_TO_X_WIN (webox); 4045 GTK_WIDGET_TO_X_WIN (webox);
@@ -4049,11 +4049,15 @@ xg_finish_scroll_bar_creation (struct frame *f,
4049 xg_set_cursor (webox, FRAME_DISPLAY_INFO (f)->xg_cursor); 4049 xg_set_cursor (webox, FRAME_DISPLAY_INFO (f)->xg_cursor);
4050 4050
4051#ifdef HAVE_PGTK 4051#ifdef HAVE_PGTK
4052 GtkStyleContext *ctxt = gtk_widget_get_style_context(wscroll); 4052 GtkStyleContext *ctxt = gtk_widget_get_style_context (wscroll);
4053 gtk_style_context_add_provider(ctxt, GTK_STYLE_PROVIDER(FRAME_OUTPUT_DATA (f)->scrollbar_foreground_css_provider), 4053 gtk_style_context_add_provider (ctxt,
4054 GTK_STYLE_PROVIDER_PRIORITY_USER); 4054 GTK_STYLE_PROVIDER (FRAME_OUTPUT_DATA (f)->
4055 gtk_style_context_add_provider(ctxt, GTK_STYLE_PROVIDER(FRAME_OUTPUT_DATA (f)->scrollbar_background_css_provider), 4055 scrollbar_foreground_css_provider),
4056 GTK_STYLE_PROVIDER_PRIORITY_USER); 4056 GTK_STYLE_PROVIDER_PRIORITY_USER);
4057 gtk_style_context_add_provider (ctxt,
4058 GTK_STYLE_PROVIDER (FRAME_OUTPUT_DATA (f)->
4059 scrollbar_background_css_provider),
4060 GTK_STYLE_PROVIDER_PRIORITY_USER);
4057#endif 4061#endif
4058 4062
4059 bar->x_window = scroll_id; 4063 bar->x_window = scroll_id;
@@ -4212,7 +4216,7 @@ xg_update_scrollbar_pos (struct frame *f,
4212 /* Don't obscure any child frames. */ 4216 /* Don't obscure any child frames. */
4213 XLowerWindow (FRAME_X_DISPLAY (f), GTK_WIDGET_TO_X_WIN (webox)); 4217 XLowerWindow (FRAME_X_DISPLAY (f), GTK_WIDGET_TO_X_WIN (webox));
4214#else 4218#else
4215 gdk_window_lower(gtk_widget_get_window(webox)); 4219 gdk_window_lower (gtk_widget_get_window(webox));
4216#endif 4220#endif
4217 } 4221 }
4218 4222
@@ -4223,7 +4227,7 @@ xg_update_scrollbar_pos (struct frame *f,
4223#ifndef HAVE_PGTK 4227#ifndef HAVE_PGTK
4224 x_sync (f); 4228 x_sync (f);
4225#else 4229#else
4226 gdk_flush(); 4230 gdk_flush ();
4227#endif 4231#endif
4228 SET_FRAME_GARBAGED (f); 4232 SET_FRAME_GARBAGED (f);
4229 cancel_mouse_face (f); 4233 cancel_mouse_face (f);
@@ -4304,14 +4308,14 @@ xg_update_horizontal_scrollbar_pos (struct frame *f,
4304 /* Don't obscure any child frames. */ 4308 /* Don't obscure any child frames. */
4305 XLowerWindow (FRAME_X_DISPLAY (f), GTK_WIDGET_TO_X_WIN (webox)); 4309 XLowerWindow (FRAME_X_DISPLAY (f), GTK_WIDGET_TO_X_WIN (webox));
4306#else 4310#else
4307 gdk_window_lower(gtk_widget_get_window(webox)); 4311 gdk_window_lower (gtk_widget_get_window (webox));
4308#endif 4312#endif
4309 } 4313 }
4310 4314
4311#ifndef HAVE_PGTK 4315#ifndef HAVE_PGTK
4312 x_sync (f); 4316 x_sync (f);
4313#else 4317#else
4314 gdk_flush(); 4318 gdk_flush ();
4315#endif 4319#endif
4316 SET_FRAME_GARBAGED (f); 4320 SET_FRAME_GARBAGED (f);
4317 cancel_mouse_face (f); 4321 cancel_mouse_face (f);
@@ -4341,8 +4345,8 @@ xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar,
4341 4345
4342 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); 4346 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
4343 4347
4344 PGTK_TRACE("xg_set_toolkit_scroll_bar_thumb: ----------------------------------"); 4348 PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: ----------------------------------");
4345 PGTK_TRACE("xg_set_toolkit_scroll_bar_thumb: %p, %d, %d, %d.", bar, portion, position, whole); 4349 PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: %p, %d, %d, %d.", bar, portion, position, whole);
4346 if (wscroll && bar->dragging == -1) 4350 if (wscroll && bar->dragging == -1)
4347 { 4351 {
4348 GtkAdjustment *adj; 4352 GtkAdjustment *adj;
@@ -4374,16 +4378,16 @@ xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar,
4374 top = (gdouble) position / whole; 4378 top = (gdouble) position / whole;
4375 shown = (gdouble) portion / whole; 4379 shown = (gdouble) portion / whole;
4376 } 4380 }
4377 PGTK_TRACE("xg_set_toolkit_scroll_bar_thumb: position=%d, portion=%d, whole=%d", position, portion, whole); 4381 PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: position=%d, portion=%d, whole=%d", position, portion, whole);
4378 PGTK_TRACE("xg_set_toolkit_scroll_bar_thumb: top=%f, shown=%f", top, shown); 4382 PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: top=%f, shown=%f", top, shown);
4379 4383
4380 PGTK_TRACE("xg_set_toolkit_scroll_bar_thumb: shown*range=%f", shown * XG_SB_RANGE); 4384 PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: shown*range=%f", shown * XG_SB_RANGE);
4381 size = clip_to_bounds (1, shown * XG_SB_RANGE, XG_SB_RANGE); 4385 size = clip_to_bounds (1, shown * XG_SB_RANGE, XG_SB_RANGE);
4382 PGTK_TRACE("xg_set_toolkit_scroll_bar_thumb: size=%d.", size); 4386 PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: size=%d.", size);
4383 PGTK_TRACE("xg_set_toolkit_scroll_bar_thumb: top*range=%f.", top * XG_SB_RANGE); 4387 PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: top*range=%f.", top * XG_SB_RANGE);
4384 PGTK_TRACE("xg_set_toolkit_scroll_bar_thumb: max-size=%d.", XG_SB_MAX - size); 4388 PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: max-size=%d.", XG_SB_MAX - size);
4385 value = clip_to_bounds (XG_SB_MIN, top * XG_SB_RANGE, XG_SB_MAX - size); 4389 value = clip_to_bounds (XG_SB_MIN, top * XG_SB_RANGE, XG_SB_MAX - size);
4386 PGTK_TRACE("xg_set_toolkit_scroll_bar_thumb: value=%d.", value); 4390 PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: value=%d.", value);
4387 4391
4388 /* Assume all lines are of equal size. */ 4392 /* Assume all lines are of equal size. */
4389 new_step = size / max (1, FRAME_LINES (f)); 4393 new_step = size / max (1, FRAME_LINES (f));
@@ -4393,7 +4397,7 @@ xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar,
4393 if (old_size != size) 4397 if (old_size != size)
4394 { 4398 {
4395 int old_step = gtk_adjustment_get_step_increment (adj); 4399 int old_step = gtk_adjustment_get_step_increment (adj);
4396 PGTK_TRACE("xg_set_toolkit_scroll_bar_thumb: old_step=%d, new_step=%d", old_step, new_step); 4400 PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: old_step=%d, new_step=%d", old_step, new_step);
4397 if (old_step != new_step) 4401 if (old_step != new_step)
4398 { 4402 {
4399 gtk_adjustment_set_page_size (adj, size); 4403 gtk_adjustment_set_page_size (adj, size);
@@ -4404,8 +4408,8 @@ xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar,
4404 } 4408 }
4405 } 4409 }
4406 4410
4407 PGTK_TRACE("xg_set_toolkit_scroll_bar_thumb: changed=%d, old=%d, value=%d.", 4411 PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: changed=%d, old=%d, value=%d.",
4408 changed, int_gtk_range_get_value (GTK_RANGE (wscroll)), value); 4412 changed, int_gtk_range_get_value (GTK_RANGE (wscroll)), value);
4409 if (changed || int_gtk_range_get_value (GTK_RANGE (wscroll)) != value) 4413 if (changed || int_gtk_range_get_value (GTK_RANGE (wscroll)) != value)
4410 { 4414 {
4411 block_input (); 4415 block_input ();
@@ -4485,7 +4489,7 @@ xg_event_is_for_scrollbar (struct frame *f, const EVENT *event)
4485#ifndef HAVE_PGTK 4489#ifndef HAVE_PGTK
4486 GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); 4490 GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f));
4487#else 4491#else
4488 GdkDisplay *gdpy = FRAME_X_DISPLAY(f); 4492 GdkDisplay *gdpy = FRAME_X_DISPLAY (f);
4489#endif 4493#endif
4490 GdkWindow *gwin; 4494 GdkWindow *gwin;
4491#ifdef HAVE_GTK3 4495#ifdef HAVE_GTK3