X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fpinion.c;h=45aedfbd26cd9f12eae35a7675f43d2cde6f01c1;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=644ff615db3a631e09c5772a9d9bbfcd177bcede;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver diff --git a/hacks/glx/pinion.c b/hacks/glx/pinion.c index 644ff615..45aedfbd 100644 --- a/hacks/glx/pinion.c +++ b/hacks/glx/pinion.c @@ -1,4 +1,4 @@ -/* pinion, Copyright (c) 2004-2008 Jamie Zawinski +/* pinion, Copyright (c) 2004-2014 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -53,8 +53,8 @@ typedef struct { Bool button_down_p; unsigned long mouse_gear_id; - XFontStruct *xfont1, *xfont2, *xfont3; - GLuint font1_dlist, font2_dlist, font3_dlist; + texture_font_data *font1, *font2, *font3; + GLuint title_list; int draw_tick; @@ -109,9 +109,9 @@ static void load_fonts (ModeInfo *mi) { pinion_configuration *pp = &pps[MI_SCREEN(mi)]; - load_font (mi->dpy, "titleFont", &pp->xfont1, &pp->font1_dlist); - load_font (mi->dpy, "titleFont2", &pp->xfont2, &pp->font2_dlist); - load_font (mi->dpy, "titleFont3", &pp->xfont3, &pp->font3_dlist); + pp->font1 = load_texture_font (mi->dpy, "titleFont"); + pp->font2 = load_texture_font (mi->dpy, "titleFont2"); + pp->font3 = load_texture_font (mi->dpy, "titleFont3"); } @@ -152,17 +152,16 @@ new_label (ModeInfo *mi) glNewList (pp->title_list, GL_COMPILE); if (*label) { - XFontStruct *f; - GLuint fl; + texture_font_data *fd; if (MI_WIDTH(mi) >= 500 && MI_HEIGHT(mi) >= 375) - f = pp->xfont1, fl = pp->font1_dlist; /* big font */ + fd = pp->font1; else if (MI_WIDTH(mi) >= 350 && MI_HEIGHT(mi) >= 260) - f = pp->xfont2, fl = pp->font2_dlist; /* small font */ + fd = pp->font2; else - f = pp->xfont3, fl = pp->font3_dlist; /* tiny font */ + fd = pp->font3; glColor3f (0.8, 0.8, 0); - print_gl_string (mi->dpy, f, fl, + print_gl_string (mi->dpy, fd, mi->xgwa.width, mi->xgwa.height, 10, mi->xgwa.height - 10, label, False); @@ -883,6 +882,7 @@ push_gear (ModeInfo *mi) if (g->coax_p) { + if (!parent) abort(); if (g->x != parent->x) abort(); if (g->y != parent->y) abort(); if (g->z == parent->z) abort(); @@ -1159,6 +1159,9 @@ static void find_mouse_gear (ModeInfo *mi) { pinion_configuration *pp = &pps[MI_SCREEN(mi)]; + +# ifndef HAVE_JWZGLES + int screen_width = MI_WIDTH (mi); int screen_height = MI_HEIGHT (mi); GLfloat h = (GLfloat) screen_height / (GLfloat) screen_width; @@ -1226,6 +1229,14 @@ find_mouse_gear (ModeInfo *mi) pp->mouse_gear_id = pnames[0]; } } + +#else /* HAVE_JWZGLES */ + /* #### not yet implemented */ + pp->mouse_gear_id = pp->gears[1]->id; + return; +#endif /* HAVE_JWZGLES */ + + } @@ -1278,39 +1289,10 @@ pinion_handle_event (ModeInfo *mi, XEvent *event) { pinion_configuration *pp = &pps[MI_SCREEN(mi)]; - if (event->xany.type == ButtonPress && - event->xbutton.button == Button1) - { - pp->button_down_p = True; - gltrackball_start (pp->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) - { - pp->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 (pp->trackball, event->xbutton.button, 5, - !!event->xbutton.state); - return True; - } - else if (event->xany.type == MotionNotify && - pp->button_down_p) - { - gltrackball_track (pp->trackball, - event->xmotion.x, event->xmotion.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } + if (gltrackball_event_handler (event, pp->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &pp->button_down_p)) + return True; else if (event->xany.type == KeyPress) { KeySym keysym; @@ -1331,7 +1313,6 @@ ENTRYPOINT void init_pinion (ModeInfo *mi) { pinion_configuration *pp; - int wire = MI_IS_WIREFRAME(mi); if (!pps) { pps = (pinion_configuration *) @@ -1340,8 +1321,6 @@ init_pinion (ModeInfo *mi) fprintf(stderr, "%s: out of memory\n", progname); exit(1); } - - pp = &pps[MI_SCREEN(mi)]; } pp = &pps[MI_SCREEN(mi)]; @@ -1350,6 +1329,7 @@ init_pinion (ModeInfo *mi) load_fonts (mi); reshape_pinion (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); + clear_gl_error(); /* WTF? sometimes "invalid op" from glViewport! */ pp->title_list = glGenLists (1); @@ -1359,25 +1339,7 @@ init_pinion (ModeInfo *mi) pp->plane_displacement = gear_size * 0.1; - if (!wire) - { - GLfloat pos[4] = {-3.0, 1.0, 1.0, 0.0}; - GLfloat amb[4] = { 0.0, 0.0, 0.0, 1.0}; - GLfloat dif[4] = { 1.0, 1.0, 1.0, 1.0}; - GLfloat spc[4] = { 1.0, 1.0, 1.0, 1.0}; - - glEnable(GL_LIGHTING); - glEnable(GL_LIGHT0); - glEnable(GL_DEPTH_TEST); - glEnable(GL_CULL_FACE); - - glLightfv(GL_LIGHT0, GL_POSITION, pos); - glLightfv(GL_LIGHT0, GL_AMBIENT, amb); - glLightfv(GL_LIGHT0, GL_DIFFUSE, dif); - glLightfv(GL_LIGHT0, GL_SPECULAR, spc); - } - - pp->trackball = gltrackball_init (); + pp->trackball = gltrackball_init (False); ffwd (mi); } @@ -1396,6 +1358,27 @@ draw_pinion (ModeInfo *mi) glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(pp->glx_context)); + glPushMatrix(); + glRotatef(current_device_rotation(), 0, 0, 1); + + if (!wire_p) + { + GLfloat pos[4] = {-3.0, 1.0, 1.0, 0.0}; + GLfloat amb[4] = { 0.0, 0.0, 0.0, 1.0}; + GLfloat dif[4] = { 1.0, 1.0, 1.0, 1.0}; + GLfloat spc[4] = { 1.0, 1.0, 1.0, 1.0}; + + glEnable(GL_LIGHTING); + glEnable(GL_LIGHT0); + glEnable(GL_DEPTH_TEST); + glEnable(GL_CULL_FACE); + + glLightfv(GL_LIGHT0, GL_POSITION, pos); + glLightfv(GL_LIGHT0, GL_AMBIENT, amb); + glLightfv(GL_LIGHT0, GL_DIFFUSE, dif); + glLightfv(GL_LIGHT0, GL_SPECULAR, spc); + } + if (!pp->button_down_p) { if (!debug_one_gear_p || pp->ngears == 0) @@ -1476,6 +1459,7 @@ draw_pinion (ModeInfo *mi) glPopMatrix (); glCallList (pp->title_list); + glPopMatrix (); if (mi->fps_p) do_fps (mi); glFinish();