aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorPaul Eggert2016-02-23 09:42:05 -0800
committerPaul Eggert2016-02-23 09:42:28 -0800
commit82848cf689c24a8bc635449846250ea6edb757c4 (patch)
tree4263b19e46cf62711d40ec14ccd3173225d48f2a /src/window.c
parentf4152efd2f7db87134e5e1c50e312a431e81db23 (diff)
downloademacs-82848cf689c24a8bc635449846250ea6edb757c4.tar.gz
emacs-82848cf689c24a8bc635449846250ea6edb757c4.zip
Minor cleanups for async DNS etc.
* src/frame.h (FRAME_WINDOW_CONFIGURATION_CHANGED): Omit unnecessary parens. * src/gnutls.c (gnutls_try_handshake, emacs_gnutls_deinit) (gnutls_verify_boot): Use bool for boolean. (ATTRIBUTE_FORMAT_PRINTF): Add printf attribute. * src/process.c (free_dns_request, Fmake_network_process): Allocate and free async request control block all in one go. (set_network_socket_coding_system, finish_after_tls_connection) (connect_network_socket): Now static. (conv_numerical_to_lisp): 2nd arg is now int, not unsigned. (Fmake_network_process): Use list1 for brevity. (wait_for_socket_fds): 2nd arg is now const ptr. * src/process.h (struct Lisp_Process.dns_request): Now struct gaicb *, not struct gaicb **, since there was always exactly one. All uses changed. * src/window.c, src/window.h (run_window_configuration_change_hook): Now static.
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/window.c b/src/window.c
index 29c35875039..be34c49135e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -57,6 +57,7 @@ static bool foreach_window_1 (struct window *,
57static bool window_resize_check (struct window *, bool); 57static bool window_resize_check (struct window *, bool);
58static void window_resize_apply (struct window *, bool); 58static void window_resize_apply (struct window *, bool);
59static void select_window_1 (Lisp_Object, bool); 59static void select_window_1 (Lisp_Object, bool);
60static void run_window_configuration_change_hook (struct frame *);
60 61
61static struct window *set_window_fringes (struct window *, Lisp_Object, 62static struct window *set_window_fringes (struct window *, Lisp_Object,
62 Lisp_Object, Lisp_Object); 63 Lisp_Object, Lisp_Object);
@@ -720,7 +721,8 @@ the height of the screen areas spanned by its children. */)
720 return make_number (decode_valid_window (window)->pixel_height); 721 return make_number (decode_valid_window (window)->pixel_height);
721} 722}
722 723
723DEFUN ("window-pixel-width-before-size-change", Fwindow_pixel_width_before_size_change, 724DEFUN ("window-pixel-width-before-size-change",
725 Fwindow_pixel_width_before_size_change,
724 Swindow_pixel_width_before_size_change, 0, 1, 0, 726 Swindow_pixel_width_before_size_change, 0, 1, 0,
725 doc: /* Return pixel width of window WINDOW before last size changes. 727 doc: /* Return pixel width of window WINDOW before last size changes.
726WINDOW must be a valid window and defaults to the selected one. 728WINDOW must be a valid window and defaults to the selected one.
@@ -734,7 +736,8 @@ after that. */)
734 (decode_valid_window (window)->pixel_width_before_size_change)); 736 (decode_valid_window (window)->pixel_width_before_size_change));
735} 737}
736 738
737DEFUN ("window-pixel-height-before-size-change", Fwindow_pixel_height_before_size_change, 739DEFUN ("window-pixel-height-before-size-change",
740 Fwindow_pixel_height_before_size_change,
738 Swindow_pixel_height_before_size_change, 0, 1, 0, 741 Swindow_pixel_height_before_size_change, 0, 1, 0,
739 doc: /* Return pixel height of window WINDOW before last size changes. 742 doc: /* Return pixel height of window WINDOW before last size changes.
740WINDOW must be a valid window and defaults to the selected one. 743WINDOW must be a valid window and defaults to the selected one.
@@ -3184,7 +3187,7 @@ select_frame_norecord (Lisp_Object frame)
3184 Fselect_frame (frame, Qt); 3187 Fselect_frame (frame, Qt);
3185} 3188}
3186 3189
3187void 3190static void
3188run_window_configuration_change_hook (struct frame *f) 3191run_window_configuration_change_hook (struct frame *f)
3189{ 3192{
3190 ptrdiff_t count = SPECPDL_INDEX (); 3193 ptrdiff_t count = SPECPDL_INDEX ();
@@ -3310,8 +3313,8 @@ run_window_size_change_functions (Lisp_Object frame)
3310 struct window *r = XWINDOW (FRAME_ROOT_WINDOW (f)); 3313 struct window *r = XWINDOW (FRAME_ROOT_WINDOW (f));
3311 Lisp_Object functions = Vwindow_size_change_functions; 3314 Lisp_Object functions = Vwindow_size_change_functions;
3312 3315
3313 if (FRAME_WINDOW_CONFIGURATION_CHANGED (f) || 3316 if (FRAME_WINDOW_CONFIGURATION_CHANGED (f)
3314 window_size_changed (r)) 3317 || window_size_changed (r))
3315 { 3318 {
3316 while (CONSP (functions)) 3319 while (CONSP (functions))
3317 { 3320 {