X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fglut%2Fmain.c;fp=src%2Fglut%2Fmain.c;h=79833d9c23d8c5687efa4a9d29fe1e94db39845a;hp=fb663e6bc4ceae1f02bbeed5e0d35760971f9990;hb=7705fa326336feba1a66d5a6ca8a7c27771e4c5f;hpb=650644eccabcdceb974c17d5fd19c0546eb753d3 diff --git a/src/glut/main.c b/src/glut/main.c index fb663e6..79833d9 100644 --- a/src/glut/main.c +++ b/src/glut/main.c @@ -73,7 +73,7 @@ static cgm_quat rot = {0, 0, 0, 1}; int main(int argc, char **argv) { glutInit(&argc, argv); - glutInitWindowSize(800, 600); + glutInitWindowSize(1280, 960); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE); glutCreateWindow("Mindlapse"); @@ -428,14 +428,28 @@ static void map_mouse_pos(int *xp, int *yp) static void mouse_button(int bn, int st, int x, int y) { + int bit; + map_mouse_pos(&x, &y); mouse_x = x; mouse_y = y; + switch(bn) { + case GLUT_LEFT_BUTTON: + bit = 0; + break; + case GLUT_RIGHT_BUTTON: + bit = 1; + break; + case GLUT_MIDDLE_BUTTON: + bit = 2; + break; + } + if(st == GLUT_DOWN) { - mouse_bmask |= 1 << bn; + mouse_bmask |= 1 << bit; } else { - mouse_bmask &= ~(1 << bn); + mouse_bmask &= ~(1 << bit); } }