(submit/xnest-config.h) Xnest: simplify disabling unsupported extension
Instead of strange #undef hacks in various places, just go the straight route and set the corresponding no*Extension flags on server startup. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
		
							parent
							
								
									6430a7c742
								
							
						
					
					
						commit
						ee8464e398
					
				|  | @ -25,6 +25,7 @@ is" without express or implied warranty. | ||||||
| #include "misc.h" | #include "misc.h" | ||||||
| #include "scrnintstr.h" | #include "scrnintstr.h" | ||||||
| #include "servermd.h" | #include "servermd.h" | ||||||
|  | #include "extinit.h" | ||||||
| 
 | 
 | ||||||
| #include "xnest-xcb.h" | #include "xnest-xcb.h" | ||||||
| 
 | 
 | ||||||
|  | @ -50,6 +51,19 @@ xcb_window_t xnestParentWindow = 0; | ||||||
| int | int | ||||||
| ddxProcessArgument(int argc, char *argv[], int i) | ddxProcessArgument(int argc, char *argv[], int i) | ||||||
| { | { | ||||||
|  |     /* disable some extensions we currently don't support yet */ | ||||||
|  | #ifdef MITSHM | ||||||
|  |     noMITShmExtension = TRUE; | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
|  | #ifdef COMPOSITE | ||||||
|  |     noCompositeExtension = TRUE; | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
|  | #ifdef DPMSExtension | ||||||
|  |     noDPMSExtension = TRUE; | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
|     if (!strcmp(argv[i], "-display")) { |     if (!strcmp(argv[i], "-display")) { | ||||||
|         if (++i < argc) { |         if (++i < argc) { | ||||||
|             xnestDisplayName = argv[i]; |             xnestDisplayName = argv[i]; | ||||||
|  |  | ||||||
|  | @ -31,6 +31,4 @@ | ||||||
| #include <dix-config.h> | #include <dix-config.h> | ||||||
| #include <xkb-config.h> | #include <xkb-config.h> | ||||||
| 
 | 
 | ||||||
| #undef MITSHM |  | ||||||
| 
 |  | ||||||
| #endif                          /* XNEST_CONFIG_H */ | #endif                          /* XNEST_CONFIG_H */ | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue