Disable support for external commands by default
This commit is contained in:
		
							parent
							
								
									9fcf2c8f34
								
							
						
					
					
						commit
						b2f1b997ed
					
				
							
								
								
									
										40
									
								
								config.h
									
									
									
									
									
								
							
							
						
						
									
										40
									
								
								config.h
									
									
									
									
									
								
							| @ -1,30 +1,28 @@ | |||||||
| /* default window dimensions:                            *
 | /* default window dimensions (overwritten via -g option): */ | ||||||
|  * (also controllable via -g option)                     */ | #define WIN_WIDTH    800 | ||||||
| #define WIN_WIDTH   800 | #define WIN_HEIGHT   600 | ||||||
| #define WIN_HEIGHT  600 |  | ||||||
| 
 | 
 | ||||||
| /* default color for window background:                  *
 | /* default color for window background:                   *
 | ||||||
|  *   (see X(7) "COLOR NAMES" section for valid values)   */ |  *   (see X(7) "COLOR NAMES" section for valid values)    */ | ||||||
| #define BG_COLOR    "#999999" | #define BG_COLOR     "#999999" | ||||||
| /* default color for thumbnail selection:                */ | /* default color for thumbnail selection:                 */ | ||||||
| #define SEL_COLOR   "#0040FF" | #define SEL_COLOR    "#0040FF" | ||||||
| 
 | 
 | ||||||
| /* how should images be scaled when they are loaded?:    *
 | /* how should images be scaled when they are loaded?:     *
 | ||||||
|  * (also controllable via -d/-s/-Z/-z options)           * |  * (also controllable via -d/-s/-Z/-z options)            * | ||||||
|  *   SCALE_DOWN: 100%, but fit large images into window, * |  *   SCALE_DOWN: 100%, but fit large images into window,  * | ||||||
|  *   SCALE_FIT:  fit all images into window,             * |  *   SCALE_FIT:  fit all images into window,              * | ||||||
|  *   SCALE_ZOOM: use current zoom level, 100% at startup */ |  *   SCALE_ZOOM: use current zoom level, 100% at startup  */ | ||||||
| #define SCALE_MODE  SCALE_DOWN | #define SCALE_MODE   SCALE_DOWN | ||||||
| 
 | 
 | ||||||
| /* levels (percent) to use when zooming via '-' and '+': */ | /* levels (percent) to use when zooming via '-' and '+':  */ | ||||||
| static const float zoom_levels[] = { | static const float zoom_levels[] = { | ||||||
| 	 12.5,  25.0,  50.0,  75.0, | 	 12.5,  25.0,  50.0,  75.0, | ||||||
| 	100.0, 150.0, 200.0, 400.0, 800.0 | 	100.0, 150.0, 200.0, 400.0, 800.0 | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
| /* default dimension of thumbnails (width == height):    */ | /* default dimension of thumbnails (width == height):     */ | ||||||
| #define THUMB_SIZE  60 | #define THUMB_SIZE   60 | ||||||
| 
 | 
 | ||||||
| /* remove this line to disable external commands:        *
 | /* support for external commands (defined in commands.h): */ | ||||||
|  * (otherwise have a look at commands.h to define them)  */ | #define EXT_COMMANDS 0 | ||||||
| #define EXT_COMMANDS |  | ||||||
|  | |||||||
							
								
								
									
										6
									
								
								main.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								main.c
									
									
									
									
									
								
							| @ -37,7 +37,7 @@ | |||||||
| #include "util.h" | #include "util.h" | ||||||
| #include "window.h" | #include "window.h" | ||||||
| 
 | 
 | ||||||
| #ifdef EXT_COMMANDS | #if EXT_COMMANDS | ||||||
| #include "commands.h" | #include "commands.h" | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| @ -284,7 +284,7 @@ void read_dir_rec(const char *dirname) { | |||||||
| 	free(dirnames); | 	free(dirnames); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #ifdef EXT_COMMANDS | #if EXT_COMMANDS | ||||||
| int run_command(const char *cline, Bool reload) { | int run_command(const char *cline, Bool reload) { | ||||||
| 	int fncnt, fnlen; | 	int fncnt, fnlen; | ||||||
| 	char *cn, *cmdline; | 	char *cn, *cmdline; | ||||||
| @ -382,7 +382,7 @@ void on_keypress(XKeyEvent *kev) { | |||||||
| 	XLookupString(kev, &key, 1, &ksym, NULL); | 	XLookupString(kev, &key, 1, &ksym, NULL); | ||||||
| 	changed = 0; | 	changed = 0; | ||||||
| 
 | 
 | ||||||
| #ifdef EXT_COMMANDS | #if EXT_COMMANDS | ||||||
| 	/* external commands from commands.h */ | 	/* external commands from commands.h */ | ||||||
| 	if (CLEANMASK(kev->state) & ControlMask) { | 	if (CLEANMASK(kev->state) & ControlMask) { | ||||||
| 		for (i = 0; i < LEN(commands); ++i) { | 		for (i = 0; i < LEN(commands); ++i) { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Bert
						Bert