Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/utils
Modified Files:
Tag: ETERM-0_10
Esetroot.c Etcolors
Added Files:
Tag: ETERM-0_10
Etgen-color-cube Etgen-color-cube-c Etpalette
Log Message:
Mon Dec 5 13:33:58 2005 Michael Jennings (mej)
Merge and re-indent code.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/utils/Esetroot.c,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -3 -r1.14.2.3 -r1.14.2.4
--- Esetroot.c 23 Apr 2003 16:19:56 -0000 1.14.2.3
+++ Esetroot.c 5 Dec 2005 18:33:34 -0000 1.14.2.4
@@ -8,7 +8,7 @@
*
*/
-static const char cvs_ident[] = "$Id: Esetroot.c,v 1.14.2.3 2003/04/23
16:19:56 mej Exp $";
+static const char cvs_ident[] = "$Id: Esetroot.c,v 1.14.2.4 2005/12/05
18:33:34 mej Exp $";
#include "../config.h"
@@ -56,15 +56,18 @@
if (prop_root != None && prop_esetroot != None) {
XGetWindowProperty(Xdisplay, Xroot, prop_root, 0L, 1L, False,
AnyPropertyType, &type, &format, &length, &after, &data_root);
if (type == XA_PIXMAP) {
- XGetWindowProperty(Xdisplay, Xroot, prop_esetroot, 0L, 1L, False,
AnyPropertyType, &type, &format, &length, &after, &data_esetroot);
+ XGetWindowProperty(Xdisplay, Xroot, prop_esetroot, 0L, 1L, False,
AnyPropertyType, &type, &format, &length, &after,
+ &data_esetroot);
if (data_root && data_esetroot) {
if (debug) {
- fprintf(stderr, "%s:%d: set_pixmap_property(0x%08x):
data_root == 0x%08x, data_esetroot == 0x%08x\n", __FILE__,
- __LINE__, (unsigned int) p, (unsigned int)
*((Pixmap *) data_root), (unsigned int) *((Pixmap *) data_esetroot));
+ fprintf(stderr, "%s:%d: set_pixmap_property(0x%08x):
data_root == 0x%08x, data_esetroot == 0x%08x\n",
+ __FILE__, __LINE__, (unsigned int) p, (unsigned
int) *((Pixmap *) data_root),
+ (unsigned int) *((Pixmap *) data_esetroot));
}
if (type == XA_PIXMAP && *((Pixmap *) data_root) == *((Pixmap
*) data_esetroot)) {
if (debug) {
- fprintf(stderr, "%s:%d: set_pixmap_property(0x%08x):
XKillClient() is being called.\n", __FILE__, __LINE__, (unsigned int) p);
+ fprintf(stderr, "%s:%d: set_pixmap_property(0x%08x):
XKillClient() is being called.\n", __FILE__,
+ __LINE__, (unsigned int) p);
}
XKillClient(Xdisplay, *((Pixmap *) data_root));
}
@@ -83,7 +86,8 @@
XChangeProperty(Xdisplay, Xroot, prop_root, XA_PIXMAP, 32,
PropModeReplace, (unsigned char *) &p, 1);
XChangeProperty(Xdisplay, Xroot, prop_esetroot, XA_PIXMAP, 32,
PropModeReplace, (unsigned char *) &p, 1);
if (debug) {
- fprintf(stderr, "%s:%d: set_pixmap_property(0x%08x): _XROOTPMAP_ID
and ESETROOT_PMAP_ID set to 0x%08x.\n", __FILE__, __LINE__, (unsigned int) p,
(unsigned int) p);
+ fprintf(stderr, "%s:%d: set_pixmap_property(0x%08x): _XROOTPMAP_ID
and ESETROOT_PMAP_ID set to 0x%08x.\n", __FILE__,
+ __LINE__, (unsigned int) p, (unsigned int) p);
}
XSetCloseDownMode(Xdisplay, RetainPermanent);
XFlush(Xdisplay);
@@ -145,13 +149,15 @@
if (debug) {
fprintf(stderr, "%s:%d: Display name is \"%s\"\n", __FILE__,
__LINE__, displayname ? displayname : "(nil)");
fprintf(stderr, "%s:%d: Background color name is \"%s\"\n", __FILE__,
__LINE__, bgcolor ? bgcolor : "(nil)");
- fprintf(stderr, "%s:%d: Image will be %s\n", __FILE__, __LINE__,
scale ? "scaled" : (center ? "centered" : (fit ? "fit" : "tiled")));
+ fprintf(stderr, "%s:%d: Image will be %s\n", __FILE__, __LINE__,
+ scale ? "scaled" : (center ? "centered" : (fit ? "fit" :
"tiled")));
fprintf(stderr, "%s:%d: Image file is %s\n", __FILE__, __LINE__,
fname ? fname : "(nil)");
}
if (!displayname) {
displayname = getenv("DISPLAY");
if (debug) {
- fprintf(stderr, "%s:%d: Display name set to %s via
getenv(\"DISPLAY\")\n", __FILE__, __LINE__, displayname ? displayname :
"(nil)");
+ fprintf(stderr, "%s:%d: Display name set to %s via
getenv(\"DISPLAY\")\n", __FILE__, __LINE__,
+ displayname ? displayname : "(nil)");
}
}
if (!displayname) {
@@ -224,7 +230,8 @@
}
if (debug) {
fprintf(stderr, "%s:%d: Assigned width and height for rendering as
%dx%d\n", __FILE__, __LINE__, w, h);
- fprintf(stderr, "%s:%d: Created %dx%d+%d+%d pixmap 0x%08x\n",
__FILE__, __LINE__, scr->width, scr->height, x, y, (unsigned int) p);
+ fprintf(stderr, "%s:%d: Created %dx%d+%d+%d pixmap 0x%08x\n",
__FILE__, __LINE__, scr->width, scr->height, x, y,
+ (unsigned int) p);
fprintf(stderr, "%s:%d: Applied Graphics Context %8p to pixmap.\n",
__FILE__, __LINE__, gc);
}
imlib_context_set_anti_alias(1);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/utils/Etcolors,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -3 -r1.2 -r1.2.2.1
--- Etcolors 29 Jun 2001 02:01:05 -0000 1.2
+++ Etcolors 5 Dec 2005 18:33:34 -0000 1.2.2.1
@@ -2,7 +2,7 @@
#
# Eterm Color Grid Utility
#
-# $Id: Etcolors,v 1.2 2001/06/29 02:01:05 mej Exp $
+# $Id: Etcolors,v 1.2.2.1 2005/12/05 18:33:34 mej Exp $
echo "[0m"
echo "Eterm Color Grid Utility"
@@ -14,63 +14,64 @@
echo
echo "FG BG"
echo "-- --"
-echo " 0 1 2 3 4 5 6 7 8 9 10 11 12 13
14 15"
+echo " 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15"
fgstyle=""
-for fg in 0 1 2 3 4 5 6 7 ; do
- line=" $fg "
- case $fg in
- 0) fg_esc=30 ;;
- 1) fg_esc=31 ;;
- 2) fg_esc=32 ;;
- 3) fg_esc=33 ;;
- 4) fg_esc=34 ;;
- 5) fg_esc=35 ;;
- 6) fg_esc=36 ;;
- 7) fg_esc=37 ;;
- esac
- for bgstyle in "" ";5"; do
- for bg in 0 1 2 3 4 5 6 7 ; do
- case $bg in
- 0) bg_esc=40 ;;
- 1) bg_esc=41 ;;
- 2) bg_esc=42 ;;
- 3) bg_esc=43 ;;
- 4) bg_esc=44 ;;
- 5) bg_esc=45 ;;
- 6) bg_esc=46 ;;
- 7) bg_esc=47 ;;
- esac
- line="${line}[${fg_esc};${bg_esc}${fgstyle}${bgstyle}m txt [0m"
+for fg in 00 01 02 03 04 05 06 07 ; do
+ line="$fg "
+ case $fg in
+ 00) fg_esc=30 ;;
+ 01) fg_esc=31 ;;
+ 02) fg_esc=32 ;;
+ 03) fg_esc=33 ;;
+ 04) fg_esc=34 ;;
+ 05) fg_esc=35 ;;
+ 06) fg_esc=36 ;;
+ 07) fg_esc=37 ;;
+ esac
+ for bgstyle in "" ";5"; do
+ for bg in 00 01 02 03 04 05 06 07 ; do
+ case $bg in
+ 00) bg_esc=40 ;;
+ 01) bg_esc=41 ;;
+ 02) bg_esc=42 ;;
+ 03) bg_esc=43 ;;
+ 04) bg_esc=44 ;;
+ 05) bg_esc=45 ;;
+ 06) bg_esc=46 ;;
+ 07) bg_esc=47 ;;
+ esac
+ line="${line}[${fg_esc};${bg_esc}${fgstyle}${bgstyle}m @@ [0m"
+ done
done
- done
- echo "$line"
+ echo "$line"
done
fgstyle=";1"
-for fg in 8 9 10 11 12 13 14 15 ; do
- case $fg in
- 8) fg_esc=30; line=" $fg " ;;
- 9) fg_esc=31; line=" $fg " ;;
- 10) fg_esc=32; line="$fg " ;;
- 11) fg_esc=33; line="$fg " ;;
- 12) fg_esc=34; line="$fg " ;;
- 13) fg_esc=35; line="$fg " ;;
- 14) fg_esc=36; line="$fg " ;;
- 15) fg_esc=37; line="$fg " ;;
- esac
- for bgstyle in "" ";5"; do
- for bg in 0 1 2 3 4 5 6 7 ; do
- case $bg in
- 0) bg_esc=40 ;;
- 1) bg_esc=41 ;;
- 2) bg_esc=42 ;;
- 3) bg_esc=43 ;;
- 4) bg_esc=44 ;;
- 5) bg_esc=45 ;;
- 6) bg_esc=46 ;;
- 7) bg_esc=47 ;;
- esac
- line="${line}[${fg_esc};${bg_esc}${fgstyle}${bgstyle}m txt [0m"
+for fg in 08 09 10 11 12 13 14 15 ; do
+ line="$fg "
+ case $fg in
+ 08) fg_esc=30 ;;
+ 09) fg_esc=31 ;;
+ 10) fg_esc=32 ;;
+ 11) fg_esc=33 ;;
+ 12) fg_esc=34 ;;
+ 13) fg_esc=35 ;;
+ 14) fg_esc=36 ;;
+ 15) fg_esc=37 ;;
+ esac
+ for bgstyle in "" ";5"; do
+ for bg in 0 1 2 3 4 5 6 7 ; do
+ case $bg in
+ 0) bg_esc=40 ;;
+ 1) bg_esc=41 ;;
+ 2) bg_esc=42 ;;
+ 3) bg_esc=43 ;;
+ 4) bg_esc=44 ;;
+ 5) bg_esc=45 ;;
+ 6) bg_esc=46 ;;
+ 7) bg_esc=47 ;;
+ esac
+ line="${line}[${fg_esc};${bg_esc}${fgstyle}${bgstyle}m @@ [0m"
+ done
done
- done
- echo "$line"
+ echo "$line"
done
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
