emacs: src/xterm.c comparison

comparison src/xterm.c @ 109160:f8660b83cdbf

Fix whitespace to follow coding guidelines.

author	Juanma Barranquero <lekktu@gmail.com>
date	Wed, 07 Jul 2010 11:45:28 +0200
parents	004119b4b62e
children	750db9f3e6d8

comparison

equal deleted inserted replaced

-:3e9fdeb960d1
+:f8660b83cdbf
 unsigned long opac;
 if (FRAME_X_DISPLAY_INFO (f)->root_window != FRAME_X_OUTPUT (f)->parent_desc)
 /* Since the WM decoration lies under the FRAME_OUTER_WINDOW,
 we must treat the former instead of the latter. */
-win = FRAME_X_OUTPUT(f)->parent_desc;
+win = FRAME_X_OUTPUT (f)->parent_desc;
 if (dpyinfo->x_highlight_frame == f)
 alpha = f->alpha[0];
 else
 alpha = f->alpha[1];
 Atom actual;
 int rc, format;
 unsigned long n, left;
 x_catch_errors (dpy);
-rc = XGetWindowProperty(dpy, win, XInternAtom(dpy, OPACITY, False),
+rc = XGetWindowProperty (dpy, win, XInternAtom(dpy, OPACITY, False),
-			    0L, 1L, False, XA_CARDINAL,
+			     0L, 1L, False, XA_CARDINAL,
-			    &actual, &format, &n, &left,
+			     &actual, &format, &n, &left,
-			    &data);
+			     &data);
 if (rc == Success && actual != None)
 if (*(unsigned long *)data == opac)
 	{
 	  XFree ((void *) data);
 raised_p = s->img->relief > 0;
 }
 extra = s->face->id == TOOL_BAR_FACE_ID
 ? XINT (Vtool_bar_button_margin) : 0;
 x0 = x - thick - extra;
 y0 = y - thick - extra;
 x1 = x + s->slice.width + thick - 1 + extra;
 y1 = y + s->slice.height + thick - 1 + extra;
 #if defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)
 /* Make sure scroll bars are redrawn.  As they aren't redrawn by
 redisplay, do it here.  */
 gtk_widget_queue_draw (FRAME_GTK_WIDGET (f));
 #endif
 XFlush (FRAME_X_DISPLAY (f));
 UNBLOCK_INPUT;
 }
 static void
 XTtoggle_invisible_pointer (FRAME_PTR f, int invisible)
 {
 BLOCK_INPUT;
 if (invisible)
 {
 if (FRAME_X_DISPLAY_INFO (f)->invisible_cursor != 0)
 XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
 FRAME_X_DISPLAY_INFO (f)->invisible_cursor);
 }
 /* Allocate them, if necessary.  */
 if (f->output_data.x->scroll_bar_top_shadow_pixel == -1)
 {
 pixel = f->output_data.x->scroll_bar_background_pixel;
 if (pixel != -1)
 {
 if (!x_alloc_lighter_color (f, FRAME_X_DISPLAY (f),
 FRAME_X_COLORMAP (f),
 &pixel, 1.2, 0x8000))
 pixel = -1;
 }
 }
 if (f->output_data.x->scroll_bar_bottom_shadow_pixel == -1)
 {
 pixel = f->output_data.x->scroll_bar_background_pixel;
 if (pixel != -1)
 {
 if (!x_alloc_lighter_color (f, FRAME_X_DISPLAY (f),
 FRAME_X_COLORMAP (f),
 &pixel, 0.6, 0x4000))
 pixel = -1;
 *finish = X_EVENT_NORMAL;
 EVENT_INIT (inev.ie);
 inev.ie.kind = NO_EVENT;
 inev.ie.arg = Qnil;
 if (pending_event_wait.eventtype == event.type)
 pending_event_wait.eventtype = 0; /* Indicates we got it.  */
 switch (event.type)
 {
 case ClientMessage:
 {
 if (event.xclient.message_type
 {
 xg_frame_resized (f, event.xconfigure.width,
 event.xconfigure.height);
 f = 0;
 }
 #endif
 if (f)
 {
 #ifndef USE_X_TOOLKIT
 #ifndef USE_GTK
 int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, event.xconfigure.height);
 XSETFRAME (frame, f);
 set_wm_state (frame, 0, fs, NULL);
 set_wm_state (frame, 0, fh, NULL);
 set_wm_state (frame, 0, fw, NULL);
 /* If there are _NET_ atoms we assume we have extended window manager
 hints.  */
 switch (f->want_fullscreen)
 {
 case FULLSCREEN_BOTH:
 x_uncatch_errors ();
 for (i = 0; i < actual_size; ++i)
 {
 Atom a = ((Atom*)tmp_data)[i];
 if (a == dpyinfo->Xatom_net_wm_state_maximized_horz)
 {
 if (value == FULLSCREEN_HEIGHT)
 value = FULLSCREEN_MAXIMIZED;
 else
 value = FULLSCREEN_WIDTH;
 else if (a == dpyinfo->Xatom_net_wm_state_sticky)
 sticky = 1;
 }
 lval = Qnil;
 switch (value)
 {
 case FULLSCREEN_WIDTH:
 lval = Qfullwidth;
 break;
 case FULLSCREEN_HEIGHT:
 break;
 case FULLSCREEN_MAXIMIZED:
 lval = Qmaximized;
 break;
 }
 store_frame_param (f, Qfullscreen, lval);
 store_frame_param (f, Qsticky, sticky ? Qt : Qnil);
 if (tmp_data) XFree (tmp_data);
 UNBLOCK_INPUT;
 width = x_display_pixel_width (dpyinfo);
 break;
 case FULLSCREEN_HEIGHT:
 height = x_display_pixel_height (dpyinfo);
 }
 if (FRAME_COLS (f) != width || FRAME_LINES (f) != height)
 {
 change_frame_size (f, height, width, 0, 1, 0);
 SET_FRAME_GARBAGED (f);
 cancel_mouse_face (f);
 BLOCK_INPUT;
 interrupt_input_blocked = level;
 FD_ZERO (&fds);
 FD_SET (fd, &fds);
 EMACS_GET_TIME (time_now);
 EMACS_SUB_TIME (tmo, tmo_at, time_now);
 if (EMACS_TIME_NEG_P (tmo) || select (fd+1, &fds, NULL, NULL, &tmo) == 0)
 break; /* Timeout */
 BLOCK_INPUT;
 if (NILP (tip_frame) || XFRAME (tip_frame) != f)
 {
 int r, c;
 /* When the frame is maximized/fullscreen or running under for
 example Xmonad, x_set_window_size_1 will be a no-op.
 In that case, the right thing to do is extend rows/cols to
 the current frame size.  We do that first if x_set_window_size_1
 turns out to not be a no-op (there is no way to know).
 {
 if (!strstr (message, "g_set_prgname"))
 fprintf (stderr, "%s-WARNING **: %s\n", log_domain, message);
 }
 #endif
 /* Open a connection to X display DISPLAY_NAME, and return
 the structure that describes the open display.
 If we cannot contact the display, return null.  */
 struct x_display_info *
 = XInternAtom (dpyinfo->display, "_NET_WM_WINDOW_TYPE_TOOLTIP", False);
 dpyinfo->Xatom_net_wm_icon_name
 = XInternAtom (dpyinfo->display, "_NET_WM_ICON_NAME", False);
 dpyinfo->Xatom_net_wm_name
 = XInternAtom (dpyinfo->display, "_NET_WM_NAME", False);
 dpyinfo->cut_buffers_initialized = 0;
 dpyinfo->x_dnd_atoms_size = 8;
 dpyinfo->x_dnd_atoms_length = 0;
 dpyinfo->x_dnd_atoms = xmalloc (sizeof (*dpyinfo->x_dnd_atoms)
 if (t->type == output_x_window && t->display_info.x == dpyinfo)
 {
 #ifdef HAVE_X_SM
 /* Close X session management when we close its display.  */
 if (t->id == 1 && x_session_have_connection ())
-x_session_close();
+x_session_close ();
 #endif
 delete_terminal (t);
 break;
 }

Mercurial > emacs

comparison src/xterm.c @ 109160:f8660b83cdbf