-/* gltext, Copyright (c) 2001-2012 Jamie Zawinski <jwz@jwz.org>
+/* gltext, Copyright (c) 2001-2014 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
while (p < buf + sizeof(buf) - 1 &&
lines < max_lines)
{
- char c = textclient_getc (tp->tc);
+ int c = textclient_getc (tp->tc);
if (c == '\n')
lines++;
if (c > 0)
- *p++ = c;
+ *p++ = (char) c;
else
break;
}
{
text_configuration *tp = &tps[MI_SCREEN(mi)];
- if (event->xany.type == ButtonPress &&
- event->xbutton.button == Button1)
- {
- tp->button_down_p = True;
- gltrackball_start (tp->trackball,
- event->xbutton.x, event->xbutton.y,
- MI_WIDTH (mi), MI_HEIGHT (mi));
- return True;
- }
- else if (event->xany.type == ButtonRelease &&
- event->xbutton.button == Button1)
- {
- tp->button_down_p = False;
- return True;
- }
- else if (event->xany.type == ButtonPress &&
- (event->xbutton.button == Button4 ||
- event->xbutton.button == Button5 ||
- event->xbutton.button == Button6 ||
- event->xbutton.button == Button7))
- {
- gltrackball_mousewheel (tp->trackball, event->xbutton.button, 10,
- !!event->xbutton.state);
- return True;
- }
- else if (event->xany.type == MotionNotify &&
- tp->button_down_p)
- {
- gltrackball_track (tp->trackball,
- event->xmotion.x, event->xmotion.y,
- MI_WIDTH (mi), MI_HEIGHT (mi));
- return True;
- }
+ if (gltrackball_event_handler (event, tp->trackball,
+ MI_WIDTH (mi), MI_HEIGHT (mi),
+ &tp->button_down_p))
+ return True;
return False;
}
tp->rot2 = (face_front_p
? make_rotator (0, 0, 0, 0, tilt_speed, True)
: 0);
- tp->trackball = gltrackball_init ();
+ tp->trackball = gltrackball_init (False);
}
tp->ncolors = 255;