Attachment #21077 for bug #34012

View | Details | Raw Unified | Return to bug 34012
Collapse All | Expand All

Lines 161-167 Link Here

(-)ctwm-3.7-alpha4.ORIG/Imakefile (-2 / +2 lines)
161		161
162	AllTarget(ctwm)	162	AllTarget(ctwm)
163		163
164	SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="'$(DESTDIR)$(TWMDIR)'/system.ctwmrc"')	164	SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="'$(DESTDIR)/etc/X11/twm'/system.ctwmrc"')
165	SpecialObjectRule(ctwm.o,ctwm.c,'-DPIXMAP_DIRECTORY="'$(DESTDIR)$(TWMDIR)'/images"')	165	SpecialObjectRule(ctwm.o,ctwm.c,'-DPIXMAP_DIRECTORY="'$(DESTDIR)$(TWMDIR)'/images"')
166	#if !HasPutenv	166	#if !HasPutenv
167	SpecialObjectRule(util.o,util.c,-DNOPUTENV)	167	SpecialObjectRule(util.o,util.c,-DNOPUTENV)
Lines 171-177 Link Here
171		171
172	NormalLibraryTarget(ctwm, libctwm.o)	172	NormalLibraryTarget(ctwm, libctwm.o)
173	ComplexProgramTarget(ctwm)	173	ComplexProgramTarget(ctwm)
174	InstallNonExecFile(system.ctwmrc,$(TWMDIR))	174	InstallNonExecFile(system.ctwmrc,/etc/X11/twm)
175	#ifdef XPM	175	#ifdef XPM
176	install::	176	install::
177	MakeDir($(DESTDIR)$(TWMDIR)/images)	177	MakeDir($(DESTDIR)$(TWMDIR)/images)





		| VIRTUAL_SCREENS      	{ }
		  geom_list
		  ;

noarg		: KEYWORD		{ if (!do_single_keyword ($1)) {
					    twmrc_error_prefix();

geom_entries	: /* Empty */
		| geom_entries geom_entry
		;
geom_entry	: string { AddToList (&Scr->VirtualScreens, $1, ""); }
		;

squeeze		: SQUEEZE_TITLE { 
				    if (HasShape) Scr->SqueezeTitle = TRUE;

occupy_workspc_entry	: string {
				AddToClientsList ($1, client);
			  }
		;

occupy_window_list	: LB occupy_window_entries RB {}
			;


occupy_window_entry	: string {
				AddToClientsList (workspace, $1);
			  }
		;
icon_list	: LB icon_entries RB {}
		;


Return to bug 34012

Lines 433-438 Link Here

(-)ctwm-3.7-alpha4.ORIG/gram.y (-4 / +5 lines)
433		433
434	\| VIRTUAL_SCREENS { }	434	\| VIRTUAL_SCREENS { }
435	geom_list	435	geom_list
		436	;
436		437
437	noarg : KEYWORD { if (!do_single_keyword ($1)) {	438	noarg : KEYWORD { if (!do_single_keyword ($1)) {
438	twmrc_error_prefix();	439	twmrc_error_prefix();
Lines 700-706 Link Here
700	geom_entries : /* Empty */	701	geom_entries : /* Empty */
701	\| geom_entries geom_entry	702	\| geom_entries geom_entry
702	;	703	;
703	geom_entry : string { AddToList (&Scr->VirtualScreens, $1, "") }	704	geom_entry : string { AddToList (&Scr->VirtualScreens, $1, ""); }
		705	;
704		706
705	squeeze : SQUEEZE_TITLE {	707	squeeze : SQUEEZE_TITLE {
706	if (HasShape) Scr->SqueezeTitle = TRUE;	708	if (HasShape) Scr->SqueezeTitle = TRUE;
Lines 849-856 Link Here
849	occupy_workspc_entry : string {	851	occupy_workspc_entry : string {
850	AddToClientsList ($1, client);	852	AddToClientsList ($1, client);
851	}	853	}
852	;	854	;
853
854	occupy_window_list : LB occupy_window_entries RB {}	855	occupy_window_list : LB occupy_window_entries RB {}
855	;	856	;
856		857
Lines 861-867 Link Here
861	occupy_window_entry : string {	862	occupy_window_entry : string {
862	AddToClientsList (workspace, $1);	863	AddToClientsList (workspace, $1);
863	}	864	}
864		865	;
865	icon_list : LB icon_entries RB {}	866	icon_list : LB icon_entries RB {}
866	;	867	;
867		868