Mercurial > mplayer.hg
annotate libvo/vo_gl.c @ 2050:18f4dd5d568f
-Wall warnings fixed
author | arpi |
---|---|
date | Tue, 02 Oct 2001 21:45:41 +0000 |
parents | ba8a225d1a18 |
children | 378aed6b232d |
rev | line source |
---|---|
1 | 1 #define DISP |
2 | |
3 // this can be 3 or 4 (regarding 24bpp and 32bpp) | |
4 #define BYTES_PP 3 | |
5 | |
6 #define TEXTUREFORMAT_32BPP | |
7 | |
8 /* | |
9 * video_out_gl.c, X11/OpenGL interface | |
10 * based on video_out_x11 by Aaron Holtzman, | |
11 * and WS opengl window manager by Pontscho/Fresh! | |
12 */ | |
13 | |
14 #include <stdio.h> | |
15 #include <stdlib.h> | |
16 #include <string.h> | |
17 #include <math.h> | |
18 | |
19 #include "config.h" | |
20 #include "video_out.h" | |
21 #include "video_out_internal.h" | |
22 | |
23 | |
24 LIBVO_EXTERN(gl) | |
25 | |
26 #include <X11/Xlib.h> | |
27 #include <X11/Xutil.h> | |
28 //#include <X11/keysym.h> | |
29 #include <GL/glx.h> | |
30 #include <errno.h> | |
31 #include "yuv2rgb.h" | |
32 | |
33 #include <GL/gl.h> | |
34 | |
31 | 35 #include "x11_common.h" |
36 | |
1 | 37 static vo_info_t vo_info = |
38 { | |
39 "X11 (OpenGL)", | |
40 "gl", | |
41 "Arpad Gereoffy <arpi@esp-team.scene.hu>", | |
42 "" | |
43 }; | |
44 | |
45 /* private prototypes */ | |
1109 | 46 // static void Display_Image (unsigned char *ImageData); |
1 | 47 |
48 /* local data */ | |
49 static unsigned char *ImageData=NULL; | |
50 | |
51 /* X11 related variables */ | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
52 //static Display *mydisplay; |
1 | 53 static Window mywindow; |
54 //static GC mygc; | |
55 //static XImage *myximage; | |
56 //static int depth,mode; | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
57 //static XWindowAttributes attribs; |
1 | 58 static int X_already_started = 0; |
59 | |
1109 | 60 //static int texture_id=1; |
1 | 61 |
62 static GLXContext wsGLXContext; | |
63 //XVisualInfo * wsVisualInfo; | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
64 static int wsGLXAttrib[] = { GLX_RGBA, |
1 | 65 GLX_RED_SIZE,1, |
66 GLX_GREEN_SIZE,1, | |
67 GLX_BLUE_SIZE,1, | |
68 // GLX_DEPTH_SIZE,16, | |
69 GLX_DOUBLEBUFFER, | |
70 None }; | |
71 | |
72 | |
73 static uint32_t image_width; | |
74 static uint32_t image_height; | |
75 static uint32_t image_format; | |
76 static uint32_t image_bpp; | |
77 static uint32_t image_bytes; | |
78 | |
79 static uint32_t texture_width; | |
80 static uint32_t texture_height; | |
81 | |
612 | 82 static void resize(int x,int y){ |
1290 | 83 printf("[gl] Resize: %dx%d\n",x,y); |
1 | 84 glViewport( 0, 0, x, y ); |
85 | |
86 glMatrixMode(GL_PROJECTION); | |
87 glLoadIdentity(); | |
88 glOrtho(0, image_width, image_height, 0, -1,1); | |
89 | |
90 glMatrixMode(GL_MODELVIEW); | |
91 glLoadIdentity(); | |
92 } | |
93 | |
94 /* connect to server, create and map window, | |
95 * allocate colors and (shared) memory | |
96 */ | |
97 static uint32_t | |
98 init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) | |
99 { | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
100 // int screen; |
2040 | 101 int dwidth,dheight; |
1 | 102 unsigned int fg, bg; |
103 char *hello = (title == NULL) ? "OpenGL rulez" : title; | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
104 // char *name = ":0.0"; |
1 | 105 XSizeHints hint; |
106 XVisualInfo *vinfo; | |
107 XEvent xev; | |
108 | |
1109 | 109 // XGCValues xgcv; |
1 | 110 XSetWindowAttributes xswa; |
111 unsigned long xswamask; | |
112 | |
113 image_height = height; | |
114 image_width = width; | |
115 image_format = format; | |
116 | |
117 if (X_already_started) return -1; | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
118 if(!vo_init()) return -1; |
1 | 119 |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
120 X_already_started++; |
1 | 121 |
2040 | 122 dwidth=d_width; dheight=d_height; |
123 #ifdef X11_FULLSCREEN | |
124 if(fullscreen){ // handle flags correct | |
125 d_height=(int)((float)vo_screenwidth/(float)dwidth*(float)dheight); | |
126 d_height+=d_height%2; // round | |
127 d_width=vo_screenwidth; | |
128 if(dheight>vo_screenheight){ | |
129 d_width=(int)((float)vo_screenheight/(float)dheight*(float)dwidth); | |
130 d_width+=d_width%2; // round | |
131 d_height=vo_screenheight; | |
132 } | |
133 dwidth=d_width; dheight=d_height; | |
134 } | |
135 #endif | |
1 | 136 hint.x = 0; |
137 hint.y = 0; | |
138 hint.width = d_width; | |
139 hint.height = d_height; | |
140 hint.flags = PPosition | PSize; | |
141 | |
142 /* Get some colors */ | |
143 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
144 bg = WhitePixel(mDisplay, mScreen); |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
145 fg = BlackPixel(mDisplay, mScreen); |
1 | 146 |
147 /* Make the window */ | |
148 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
149 // XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); |
1 | 150 |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
151 // XMatchVisualInfo(mDisplay, screen, depth, TrueColor, &vinfo); |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
152 vinfo=glXChooseVisual( mDisplay,mScreen,wsGLXAttrib ); |
1290 | 153 if (vinfo == NULL) |
154 { | |
155 printf("[gl] no GLX support present\n"); | |
156 return -1; | |
157 } | |
1 | 158 |
159 xswa.background_pixel = 0; | |
160 xswa.border_pixel = 1; | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
161 // xswa.colormap = XCreateColormap(mDisplay, mRootWin, vinfo.visual, AllocNone); |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
162 xswa.colormap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone); |
1 | 163 xswamask = CWBackPixel | CWBorderPixel | CWColormap; |
164 // xswamask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask | CWCursor | CWOverrideRedirect | CWSaveUnder | CWX | CWY | CWWidth | CWHeight; | |
165 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
166 mywindow = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen), |
1 | 167 hint.x, hint.y, hint.width, hint.height, 4, vinfo->depth,CopyFromParent,vinfo->visual,xswamask,&xswa); |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1109
diff
changeset
|
168 |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
169 vo_x11_classhint( mDisplay,mywindow,"gl" ); |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
170 vo_hidecursor(mDisplay,mywindow); |
1 | 171 |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
172 wsGLXContext=glXCreateContext( mDisplay,vinfo,NULL,True ); |
1 | 173 // XStoreName( wsDisplay,wsMyWin,wsSysName ); |
174 | |
175 // printf("GLXcontext ok\n"); | |
176 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
177 if ( fullscreen ) vo_x11_decoration( mDisplay,mywindow,0 ); |
1 | 178 |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
179 XSelectInput(mDisplay, mywindow, StructureNotifyMask); |
1 | 180 |
181 /* Tell other applications about this window */ | |
182 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
183 XSetStandardProperties(mDisplay, mywindow, hello, hello, None, NULL, 0, &hint); |
1 | 184 |
185 /* Map window. */ | |
186 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
187 XMapWindow(mDisplay, mywindow); |
1 | 188 |
189 /* Wait for map. */ | |
190 do | |
191 { | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
192 XNextEvent(mDisplay, &xev); |
1 | 193 } |
194 while (xev.type != MapNotify || xev.xmap.event != mywindow); | |
195 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
196 XSelectInput(mDisplay, mywindow, NoEventMask); |
1 | 197 |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
198 glXMakeCurrent( mDisplay,mywindow,wsGLXContext ); |
1 | 199 |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
200 XFlush(mDisplay); |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
201 XSync(mDisplay, False); |
1 | 202 |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
203 // mygc = XCreateGC(mDisplay, mywindow, 0L, &xgcv); |
1 | 204 |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
205 // myximage = XGetImage(mDisplay, mywindow, 0, 0, |
1 | 206 // width, image_height, AllPlanes, ZPixmap); |
207 // ImageData = myximage->data; | |
208 // bpp = myximage->bits_per_pixel; | |
209 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
210 //XSelectInput(mDisplay, mywindow, StructureNotifyMask); // !!!! |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
211 XSelectInput(mDisplay, mywindow, StructureNotifyMask | KeyPressMask ); |
1 | 212 |
213 // printf("Window setup ok\n"); | |
214 | |
215 #if 0 | |
216 // If we have blue in the lowest bit then obviously RGB | |
217 mode = ((myximage->blue_mask & 0x01) != 0) ? MODE_RGB : MODE_BGR; | |
218 #ifdef WORDS_BIGENDIAN | |
219 if (myximage->byte_order != MSBFirst) | |
220 #else | |
221 if (myximage->byte_order != LSBFirst) | |
222 #endif | |
223 { | |
1302 | 224 printf("[gl] no support for non-native XImage byte order!\n"); |
1 | 225 return -1; |
226 } | |
227 | |
228 printf("DEPTH=%d BPP=%d\n",depth,bpp); | |
229 #endif | |
230 | |
231 /* | |
232 * If depth is 24 then it may either be a 3 or 4 byte per pixel | |
233 * format. We can't use bpp because then we would lose the | |
234 * distinction between 15/16bit depth (2 byte formate assumed). | |
235 * | |
236 * FIXME - change yuv2rgb_init to take both depth and bpp | |
237 * parameters | |
238 */ | |
239 | |
240 texture_width=32; | |
241 while(texture_width<image_width) texture_width*=2; | |
242 while(texture_width<image_height) texture_width*=2; | |
243 texture_height=texture_width; | |
244 | |
245 if(format==IMGFMT_YV12){ | |
246 yuv2rgb_init(8*BYTES_PP, MODE_BGR); | |
1290 | 247 printf("[gl] YUV init OK!\n"); |
1 | 248 image_bpp=8*BYTES_PP; |
249 image_bytes=BYTES_PP; | |
250 } else { | |
251 image_bpp=format&0xFF; | |
252 image_bytes=(image_bpp+7)/8; | |
253 } | |
254 | |
255 ImageData=malloc(texture_width*texture_height*image_bytes); | |
256 memset(ImageData,128,texture_width*texture_height*image_bytes); | |
257 | |
258 glDisable(GL_BLEND); | |
259 glDisable(GL_DEPTH_TEST); | |
260 glDepthMask(GL_FALSE); | |
261 glDisable(GL_CULL_FACE); | |
262 | |
263 glEnable(GL_TEXTURE_2D); | |
264 | |
1290 | 265 printf("[gl] Creating %dx%d texture...\n",texture_width,texture_height); |
1 | 266 |
267 #if 1 | |
268 // glBindTexture(GL_TEXTURE_2D, texture_id); | |
269 glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER, GL_LINEAR); | |
270 glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER, GL_LINEAR); | |
271 #ifdef TEXTUREFORMAT_32BPP | |
272 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, texture_width, texture_height, 0, | |
273 #else | |
274 glTexImage2D(GL_TEXTURE_2D, 0, BYTES_PP, texture_width, texture_height, 0, | |
275 #endif | |
276 (image_bytes==4)?GL_RGBA:GL_BGR, GL_UNSIGNED_BYTE, ImageData); | |
277 #endif | |
278 | |
279 resize(d_width,d_height); | |
280 | |
281 glClearColor( 1.0f,0.0f,1.0f,0.0f ); | |
282 glClear( GL_COLOR_BUFFER_BIT ); | |
283 | |
284 // printf("OpenGL setup OK!\n"); | |
285 | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
286 saver_off(mDisplay); // turning off screen saver |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
287 |
1 | 288 return 0; |
289 } | |
290 | |
291 static const vo_info_t* | |
292 get_info(void) | |
293 { | |
294 return &vo_info; | |
295 } | |
296 | |
297 static void | |
298 Terminate_Display_Process(void) | |
299 { | |
300 getchar(); /* wait for enter to remove window */ | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
301 XDestroyWindow(mDisplay, mywindow); |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
302 XCloseDisplay(mDisplay); |
1 | 303 X_already_started = 0; |
304 } | |
305 | |
31 | 306 |
307 static void check_events(void) | |
1 | 308 { |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
309 int e=vo_x11_check_events(mDisplay); |
31 | 310 if(e&VO_EVENT_RESIZE) resize(vo_dwidth,vo_dheight); |
311 } | |
1 | 312 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1302
diff
changeset
|
313 static void draw_osd(void) |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1302
diff
changeset
|
314 { |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1302
diff
changeset
|
315 } |
31 | 316 |
317 static void | |
318 flip_page(void) | |
319 { | |
320 | |
1 | 321 // glEnable(GL_TEXTURE_2D); |
322 // glBindTexture(GL_TEXTURE_2D, texture_id); | |
323 | |
324 glColor3f(1,1,1); | |
325 glBegin(GL_QUADS); | |
326 glTexCoord2f(0,0);glVertex2i(0,0); | |
327 glTexCoord2f(0,1);glVertex2i(0,texture_height); | |
328 glTexCoord2f(1,1);glVertex2i(texture_width,texture_height); | |
329 glTexCoord2f(1,0);glVertex2i(texture_width,0); | |
330 glEnd(); | |
331 | |
332 // glFlush(); | |
333 glFinish(); | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
334 glXSwapBuffers( mDisplay,mywindow ); |
1 | 335 |
336 } | |
337 | |
338 //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num) | |
339 static uint32_t draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) | |
340 { | |
341 int i; | |
342 int dstride=w*BYTES_PP; | |
343 | |
344 // dstride=(dstride+15)&(~15); | |
345 | |
346 yuv2rgb(ImageData, src[0], src[1], src[2], | |
347 w,h, dstride, stride[0],stride[1]); | |
348 | |
349 // emms (); | |
350 | |
351 for(i=0;i<h;i++){ | |
352 glTexSubImage2D( GL_TEXTURE_2D, // target | |
353 0, // level | |
354 x, // x offset | |
355 y+i, // y offset | |
356 w, // width | |
357 1, // height | |
358 (BYTES_PP==4)?GL_RGBA:GL_RGB, // format | |
359 GL_UNSIGNED_BYTE, // type | |
360 ImageData+i*dstride ); // *pixels | |
361 } | |
362 | |
363 return 0; | |
364 } | |
365 | |
366 static inline uint32_t | |
367 draw_frame_x11_yv12(uint8_t *src[]) | |
368 { | |
369 int i; | |
370 // printf("Converting YUV->RGB...\n"); | |
371 yuv2rgb(ImageData, src[0], src[1], src[2], | |
372 image_width, image_height, | |
373 image_width*BYTES_PP, image_width, image_width/2 ); | |
374 // printf("Ready!\n"); | |
375 | |
376 // emms (); | |
377 | |
378 for(i=0;i<image_height;i++){ | |
379 glTexSubImage2D( GL_TEXTURE_2D, // target | |
380 0, // level | |
381 0, // x offset | |
382 i, // y offset | |
383 image_width, // width | |
384 1, // height | |
385 (BYTES_PP==4)?GL_RGBA:GL_RGB, // format | |
386 GL_UNSIGNED_BYTE, // type | |
387 ImageData+i*BYTES_PP*image_width ); // *pixels | |
388 } | |
389 | |
390 // Display_Image(ImageData); | |
391 return 0; | |
392 } | |
393 | |
394 | |
395 static inline uint32_t | |
396 draw_frame_x11_bgr(uint8_t *src[]) | |
397 { | |
398 int i; | |
399 uint8_t *s=src[0]; | |
400 uint8_t *de=&ImageData[3*image_width]; | |
401 | |
402 for(i=0;i<image_height;i++){ | |
403 uint8_t *d=ImageData; | |
404 while(d<de){ | |
405 d[0]=s[2]; | |
406 d[1]=s[1]; | |
407 d[2]=s[0]; | |
408 s+=3;d+=3; | |
409 } | |
410 glTexSubImage2D( GL_TEXTURE_2D, // target | |
411 0, // level | |
412 0, // x offset | |
413 // image_height-1-i, // y offset | |
414 i, // y offset | |
415 image_width, // width | |
416 1, // height | |
417 (image_bytes==4)?GL_RGBA:GL_RGB, // format | |
418 GL_UNSIGNED_BYTE, // type | |
419 ImageData); // *pixels | |
420 } | |
421 | |
422 // Display_Image(ImageData); | |
423 return 0; | |
424 } | |
425 | |
426 static inline uint32_t | |
427 draw_frame_x11_rgb(uint8_t *src[]) | |
428 { | |
429 int i; | |
430 uint8_t *ImageData=src[0]; | |
431 | |
432 for(i=0;i<image_height;i++){ | |
433 glTexSubImage2D( GL_TEXTURE_2D, // target | |
434 0, // level | |
435 0, // x offset | |
436 // image_height-1-i, // y offset | |
437 i, // y offset | |
438 image_width, // width | |
439 1, // height | |
440 (image_bytes==4)?GL_RGBA:GL_RGB, // format | |
441 GL_UNSIGNED_BYTE, // type | |
442 ImageData+i*image_bytes*image_width ); // *pixels | |
443 } | |
444 | |
445 // Display_Image(ImageData); | |
446 return 0; | |
447 } | |
448 | |
449 | |
450 static uint32_t | |
451 draw_frame(uint8_t *src[]) | |
452 { | |
453 if(image_format==IMGFMT_YV12) | |
454 return draw_frame_x11_yv12(src); | |
455 else | |
456 if((image_format&IMGFMT_RGB_MASK)==IMGFMT_RGB) | |
457 return draw_frame_x11_rgb(src); | |
458 else | |
459 return draw_frame_x11_bgr(src); | |
460 } | |
461 | |
462 static uint32_t | |
463 query_format(uint32_t format) | |
464 { | |
465 switch(format){ | |
466 case IMGFMT_YV12: | |
467 case IMGFMT_RGB|24: | |
468 case IMGFMT_BGR|24: | |
469 return 1; | |
470 } | |
471 return 0; | |
472 } | |
473 | |
474 | |
475 static void | |
476 uninit(void) | |
477 { | |
2041
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
478 saver_on(mDisplay); // screen saver back on |
ba8a225d1a18
now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents:
2040
diff
changeset
|
479 XDestroyWindow( mDisplay,mywindow ); |
1 | 480 } |