started c++ conv

Author: KeithDHedger

LFSTray/LFSTray/app/Makefile.am

@@ -10,34 +10,3 @@ man1_MANS = ../resources/man/lfstray.1
 
 bin_PROGRAMS = lfstray
 
-#doc_DIST=lfstray.sample
-#dist_hook: lfstray.1
-#all-local: $(doc_DIST)
-#clean-local:
-#	rm -f $(doc_DIST)
-#
-#lfstray.sample:
-#	VERSION_STR=`echo @VERSION@|sed 's/\([^\.]*\.[^\.]*\)\..*/\1/'`;cat lfstray.sample.in|sed "s/@VERSION_STR@/$$VERSION_STR/g" > lfstray.sample
-
-
-
-
-#man_MANS=lfstray.1
-#
-#doc_DIST=lfstray.sample
-#dist_hook: lfstray.1
-#all-local: $(doc_DIST)
-#clean-local:
-#	rm -f $(doc_DIST)
-#
-#lfstray.sample:
-#	VERSION_STR=`echo @VERSION@|sed 's/\([^\.]*\.[^\.]*\)\..*/\1/'`;cat lfstray.sample.in|sed "s/@VERSION_STR@/$$VERSION_STR/g" > lfstray.sample
-#
-#
-#bin_PROGRAMS = lfstray
-#lfstray_SOURCES = main.c icons.c icons.h xembed.c xembed.h layout.c layout.h embed.c embed.h \
-#                      settings.c settings.h xutils.c xutils.h tray.c tray.h  list.h \
-#					  wmh.c wmh.h common.h  image.c image.h
-#
-#AM_CFLAGS = @X_CFLAGS@
-#lfstray_LDADD =  @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@

LFSTray/LFSTray/sources

@@ -1 +1 @@
-COMMONSRC = ../src/embed.c ../src/icons.c ../src/image.c ../src/layout.c ../src/main.c ../src/settings.c ../src/tray.c ../src/wmh.c ../src/xembed.c ../src/xutils.c
+COMMONSRC = ../src/embed.cpp ../src/icons.cpp ../src/image.cpp ../src/layout.cpp ../src/main.cpp ../src/settings.cpp ../src/tray.cpp ../src/wmh.cpp ../src/xembed.cpp ../src/xutils.cpp

LFSTray/LFSTray/src/Makefile.am

@@ -48,7 +48,7 @@ struct TrayIcon *icon_list_new(Window wid,int cmode)
 	struct TrayIcon *new_icon;
 	/* Do not allocate second structure for the same window */
 	if(icon_list_find(wid)!=NULL) return NULL;
-	if((new_icon=malloc(sizeof(struct TrayIcon)))==NULL)
+	if((new_icon=(TrayIcon*)malloc(sizeof(struct TrayIcon)))==NULL)
 		{
 			return NULL;
 		}

LFSTray/LFSTray/src/embed.c renamed to LFSTray/LFSTray/src/embed.cpp

@@ -98,7 +98,7 @@ CARD8 *image_create_alpha_mask(int ord,int w,int h)
 
 	bord=(1 << ord)-1;
 
-	m=malloc(w * h);
+	m=(unsigned char*)malloc(w * h);
 	if(m==NULL) return NULL;
 	memset(m,255,w * h);
 

LFSTray/LFSTray/src/icons.c renamed to LFSTray/LFSTray/src/icons.cpp

@@ -362,8 +362,7 @@ int icon_placement_create(struct IconPlacement *ip,int x,int y,struct Rect *rect
  * 	- position for A is less (in lexographical order)
  * 	  than position for B.
  * 	  */
-void icon_placement_choose_best(
-    struct IconPlacement *old,struct IconPlacement *new)
+void icon_placement_choose_best(struct IconPlacement *old,struct IconPlacement *newst)
 {
 	int old_lout_delta_norm,new_lout_delta_norm;
 	int lout_norm_cmp;
@@ -384,7 +383,7 @@ void icon_placement_choose_best(
 			swap(settings.orig_tray_dims.x,settings.orig_tray_dims.y);
 		}
 	calc_wnd_sz_delta(old_wnd_sz_delta,old);
-	calc_wnd_sz_delta(new_wnd_sz_delta,new);
+	calc_wnd_sz_delta(new_wnd_sz_delta,newst);
 	/* Some black magic. This is probably buggy and you are not supposed to
 	 * understand this (I definetly don't). The basic idea is that sometimes
 	 * layout resize means window resize. Sometimes it does not. */
@@ -393,12 +392,12 @@ void icon_placement_choose_best(
 			if(grid_sz.x >= settings.orig_tray_dims.x/settings.slot_size.x)
 				{
 					old_wnd_sz_delta.x=old->sz_delta.x*settings.slot_size.x;
-					new_wnd_sz_delta.x=new->sz_delta.x *settings.slot_size.x;
+					new_wnd_sz_delta.x=newst->sz_delta.x *settings.slot_size.x;
 				}
 			if(grid_sz.y >= settings.orig_tray_dims.y/settings.slot_size.y)
 				{
 					old_wnd_sz_delta.y=old->sz_delta.y*settings.slot_size.y;
-					new_wnd_sz_delta.y=new->sz_delta.y *settings.slot_size.y;
+					new_wnd_sz_delta.y=newst->sz_delta.y *settings.slot_size.y;
 				}
 		}
 	/* Restore values */
@@ -413,7 +412,7 @@ void icon_placement_choose_best(
 	wnd_norm_cmp=new_wnd_delta_norm<old_wnd_delta_norm;
 	/* Compute norms for layout deltas */
 	old_lout_delta_norm=old->sz_delta.x+old->sz_delta.y;
-	new_lout_delta_norm=new->sz_delta.x+new->sz_delta.y;
+	new_lout_delta_norm=newst->sz_delta.x+newst->sz_delta.y;
 	lout_norm_cmp=new_lout_delta_norm<old_lout_delta_norm;
 
 	/* CORE of placement logic. In short,
@@ -424,16 +423,16 @@ void icon_placement_choose_best(
 	 * than one that does
 	 *-otherwise,placement that is "closer" to initial point (that depends
 	 * on gravity) is better */
-	if(!old->valid && new->valid) goto replace;
+	if(!old->valid && newst->valid) goto replace;
 	if(settings.min_space_policy && (lout_norm_cmp || wnd_norm_cmp))
 		goto replace;
 	if(old_lout_delta_norm && !new_lout_delta_norm) goto replace;
 	if(old_wnd_delta_norm && !new_wnd_delta_norm) goto replace;
-	if((!old_lout_delta_norm==!new_lout_delta_norm) && compare_points(new->pos,old->pos))
+	if((!old_lout_delta_norm==!new_lout_delta_norm) && compare_points(newst->pos,old->pos))
 		goto replace;
 	return;
 replace:
-	*old=*new;
+	*old=*newst;
 }
 
 /* WARNING: returns ptr to STATIC buffer */

LFSTray/LFSTray/src/image.c renamed to LFSTray/LFSTray/src/image.cpp

@@ -58,11 +58,11 @@ struct Settings settings;
 /* Initialize data */
 void init_default_settings()
 {
-	settings.bg_color_str="gray";
-	settings.tint_color_str="white";
+	settings.bg_color_str=(char*)"gray";
+	settings.tint_color_str=(char*)"white";
 	settings.display_str=NULL;
 	settings.geometry_str=NULL;
-	settings.max_geometry_str="0x0";
+	settings.max_geometry_str=(char*)"0x0";
 	settings.icon_size=FALLBACK_ICON_SIZE;
 	settings.slot_size.x=-1;
 	settings.slot_size.y=-1;
@@ -77,7 +77,7 @@ void init_default_settings()
 	settings.grow_gravity=GRAV_N | GRAV_W;
 	settings.icon_gravity=GRAV_N | GRAV_W;
 	settings.wnd_layer=NULL;
-	settings.wnd_name=PROGNAME;
+	settings.wnd_name=(char*)PROGNAME;
 	settings.xsync=0;
 	settings.need_help=0;
 	settings.config_fname=NULL;
@@ -104,7 +104,7 @@ int parse_ignored_classes(int argc,const char **argv,void **references,int silen
 
 	for(i=0; i<argc; i++)
 		{
-			newclass=malloc(sizeof(struct WindowClass));
+			newclass=(WindowClass*)malloc(sizeof(struct WindowClass));
 			newclass->name=strdup(argv[i]);
 			LIST_ADD_ITEM(*classes,newclass);
 		}
@@ -270,9 +270,9 @@ int parse_wnd_layer(int argc,const char **argv,void **references,int silent)
 	char **window_layer=(char **) references[0];
 
 	if(!strcasecmp(argv[0],"top"))
-		*window_layer=_NET_WM_STATE_ABOVE;
+		*window_layer=(char*)_NET_WM_STATE_ABOVE;
 	else if(!strcasecmp(argv[0],"bottom"))
-		*window_layer=_NET_WM_STATE_BELOW;
+		*window_layer=(char*)_NET_WM_STATE_BELOW;
 	else if(!strcasecmp(argv[0],"normal"))
 		*window_layer=NULL;
 	else
@@ -1006,7 +1006,7 @@ int get_args(char *line,int *argc,char ***argv)
 		{
 			(*argc)++;
 			/* Add space to store one more argument */
-			if(NULL==(*argv=realloc(*argv,*argc * sizeof(char *))))
+			if(NULL==(*argv=(char**)realloc(*argv,*argc * sizeof(char *))))
 				DIE_OOM(("Could not allocate memory to parse parameters\n"));
 			if(*arg_start=='"')   /* 4.1. argument is quoted: find matching quote */
 				{

LFSTray/LFSTray/src/layout.c renamed to LFSTray/LFSTray/src/layout.cpp

@@ -445,7 +445,7 @@ void tray_create_window(int argc,char **argv)
 			{
 				if(XmbTextListToTextProperty(tray_data.dpy,&settings.wnd_name,1,XTextStyle,&wm_name)!=Success)
 					/* Retry with default value */
-					settings.wnd_name=PROGNAME;
+					settings.wnd_name=(char*)PROGNAME;
 				else
 					break;
 				if(numtries++ > 1)
@@ -458,8 +458,8 @@ void tray_create_window(int argc,char **argv)
 	XSetWMName(tray_data.dpy,tray_data.tray,&wm_name);
 	XFree(wm_name.value);
 	/* Setup class hints */
-	xch.res_class=PROGNAME;
-	xch.res_name=PROGNAME;
+	xch.res_class=(char*)PROGNAME;
+	xch.res_name=(char*)PROGNAME;
 	/* Setup window manager hints */
 	xwmh.flags=StateHint | InputHint;
 	xwmh.input=False;
@@ -510,17 +510,17 @@ int tray_set_wm_hints()
 	mwm_set_hints(tray_data.dpy,tray_data.tray,mwm_decor,MWM_FUNC_ALL);
 	if(settings.sticky)
 		{
-			ewmh_add_window_state(tray_data.dpy,tray_data.tray,_NET_WM_STATE_STICKY);
-			ewmh_set_window_atom32(tray_data.dpy,tray_data.tray,_NET_WM_DESKTOP,0xFFFFFFFF);
+			ewmh_add_window_state(tray_data.dpy,tray_data.tray,(char*)_NET_WM_STATE_STICKY);
+			ewmh_set_window_atom32(tray_data.dpy,tray_data.tray,(char*)_NET_WM_DESKTOP,0xFFFFFFFF);
 		}
 	if(settings.skip_taskbar)
-		ewmh_add_window_state(tray_data.dpy,tray_data.tray,_NET_WM_STATE_SKIP_TASKBAR);
+		ewmh_add_window_state(tray_data.dpy,tray_data.tray,(char*)_NET_WM_STATE_SKIP_TASKBAR);
 	if(settings.wnd_layer!=NULL)
 		ewmh_add_window_state(tray_data.dpy,tray_data.tray,settings.wnd_layer);
-	ewmh_add_window_type(tray_data.dpy,tray_data.tray,_NET_WM_WINDOW_TYPE_DOCK);
+	ewmh_add_window_type(tray_data.dpy,tray_data.tray,(char*)_NET_WM_WINDOW_TYPE_DOCK);
 	/* Alwas add NORMAL window type for WM that do not support (some) special
 	 * types */
-	ewmh_add_window_type(tray_data.dpy,tray_data.tray,_NET_WM_WINDOW_TYPE_NORMAL);
+	ewmh_add_window_type(tray_data.dpy,tray_data.tray,(char*)_NET_WM_WINDOW_TYPE_NORMAL);
 	return SUCCESS;
 }
 

LFSTray/LFSTray/src/main.c renamed to LFSTray/LFSTray/src/main.cpp

@@ -1,7 +1,5 @@
 SUBDIRS=LFSTray/app
-#
-#man_MANS=lfstray.1
-#
+
 doc_DIST=lfstray.sample
 dist_hook: lfstray.1
 all-local: $(doc_DIST)

LFSTray/LFSTray/src/settings.c renamed to LFSTray/LFSTray/src/settings.cpp

@@ -1,12 +1,14 @@
 #
-# This is sample ~/.simpletrayrc, resembling default configuration.
+# This is a sample configuration.
+# copy to ~/.config/LFS/lfstrayrc
+#
 # Remember: command line parameters take precedence.
 #
 # Directives introduced in @VERSION_STR@ are marked with "NEW in @VERSION_STR@"
 #
 ####################################################################
 #
-# simpletray understands following directives
+# lfstrayrc understands the following directives
 #
 ####################################################################