if (x_focus_frame)
{
- x_highlight_frame =
- ((XGCTYPE (FRAME_FOCUS_FRAME (x_focus_frame)) == Lisp_Frame)
- ? XFRAME (FRAME_FOCUS_FRAME (x_focus_frame))
- : x_focus_frame);
+ x_highlight_frame
+ = ((GC_FRAMEP (FRAME_FOCUS_FRAME (x_focus_frame)))
+ ? XFRAME (FRAME_FOCUS_FRAME (x_focus_frame))
+ : x_focus_frame);
if (! FRAME_LIVE_P (x_highlight_frame))
{
FRAME_FOCUS_FRAME (x_focus_frame) = Qnil;
for (row = 3; row < 8; row++)
for (col = 0; col < mods->max_keypermod; col++)
{
- KeyCode code =
- mods->modifiermap[(row * mods->max_keypermod) + col];
+ KeyCode code
+ = mods->modifiermap[(row * mods->max_keypermod) + col];
/* Zeroes are used for filler. Skip them. */
if (code == 0)
frame = XCONS (tail)->car;
/* All elements of Vframe_list should be frames. */
- if (XGCTYPE (frame) != Lisp_Frame)
+ if (! GC_FRAMEP (frame))
abort ();
/* Scan this frame's scroll bar list for a scroll bar with the
dragged. */
if (NILP (bar->dragging))
{
- int top_range =
- VERTICAL_SCROLL_BAR_TOP_RANGE (pixel_height);
+ int top_range = VERTICAL_SCROLL_BAR_TOP_RANGE (pixel_height);
if (whole == 0)
x_scroll_bar_set_handle (bar, 0, top_range, 0);
XEvent *event;
struct input_event *emacs_event;
{
- if (XGCTYPE (bar->window) != Lisp_Window)
+ if (! GC_WINDOWP (bar->window))
abort ();
emacs_event->kind = scroll_bar_click;
emacs_event->code = event->xbutton.button - Button1;
- emacs_event->modifiers =
- (x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (XFRAME (WINDOW_FRAME (XWINDOW (bar->window)))),
- event->xbutton.state)
- | (event->type == ButtonRelease
- ? up_modifier
- : down_modifier));
+ emacs_event->modifiers
+ = (x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO
+ (XFRAME (WINDOW_FRAME (XWINDOW (bar->window)))),
+ event->xbutton.state)
+ | (event->type == ButtonRelease
+ ? up_modifier
+ : down_modifier));
emacs_event->frame_or_window = bar->window;
emacs_event->timestamp = event->xbutton.time;
{
- int internal_height =
- VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (XINT (bar->height));
- int top_range =
- VERTICAL_SCROLL_BAR_TOP_RANGE (XINT (bar->height));
+ int internal_height
+ = VERTICAL_SCROLL_BAR_INSIDE_HEIGHT (XINT (bar->height));
+ int top_range
+ = VERTICAL_SCROLL_BAR_TOP_RANGE (XINT (bar->height));
int y = event->xbutton.y - VERTICAL_SCROLL_BAR_TOP_BORDER;
if (y < 0) y = 0;
/* make_lispy_event turns chars into control chars.
Don't do it here because XLookupString is too eager. */
event.xkey.state &= ~ControlMask;
- nbytes =
- XLookupString (&event.xkey, copy_buffer, 80, &keysym,
- &compose_status);
+ nbytes = XLookupString (&event.xkey, copy_buffer,
+ 80, &keysym, &compose_status);
orig_keysym = keysym;