old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fri Apr 19 15:35:11 2002 Michael Jennings (mej) 

Use safe_print_string() to decode string defines before printing them
in --version output.  This fixes Debian bug #143328, submitted by
Tom Gilbert <tom@linuxbrit.co.uk>.

Also removed '~' from the CUTCHARS compiled-in default.  (It had
already been removed from the themes.)  Makes double-click selection
of URL's easier.  Requested by Laurence J. Lane <ljlane@debian.org>.


SVN revision: 6152
This commit is contained in:
Michael Jennings 2002-04-19 19:38:54 +00:00
parent b3d3c45768
commit 06d77d4d86
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -4557,3 +4557,13 @@ Sun Apr 14 22:34:41 2002 Michael Jennings (mej)
Fixed a bug spotted by Charles Clancy <tclancy@uiuc.edu> that caused Fixed a bug spotted by Charles Clancy <tclancy@uiuc.edu> that caused
color modifiers to mistakenly be applied to the icon pixmap. color modifiers to mistakenly be applied to the icon pixmap.
---------------------------------------------------------------------- ----------------------------------------------------------------------
Fri Apr 19 15:35:11 2002 Michael Jennings (mej)
Use safe_print_string() to decode string defines before printing them
in --version output. This fixes Debian bug #143328, submitted by
Tom Gilbert <tom@linuxbrit.co.uk>.
Also removed '~' from the CUTCHARS compiled-in default. (It had
already been removed from the themes.) Makes double-click selection
of URL's easier. Requested by Laurence J. Lane <ljlane@debian.org>.
----------------------------------------------------------------------

2
src/feature.h
View File

@ -156,7 +156,7 @@
/* #define SAVELINES 256 */ /* #define SAVELINES 256 */
/* Set the default separator characters for double-click word selection */ /* Set the default separator characters for double-click word selection */
#define CUTCHARS "\"&'()*,;<=>?@[\\]^`{|}~ \t" #define CUTCHARS "\"&'()*,;<=>?@[\\]^`{|} \t"
/* Make it an option */ /* Make it an option */
#define CUTCHAR_OPTION #define CUTCHAR_OPTION

10
src/options.c
View File

@ -721,7 +721,7 @@ version(void)
printf("\n\nCompile-time definitions:\n"); printf("\n\nCompile-time definitions:\n");
#ifdef PATH_ENV #ifdef PATH_ENV
printf(" PATH_ENV=\"%s\"\n", PATH_ENV); printf(" PATH_ENV=\"%s\"\n", safe_print_string(PATH_ENV, sizeof(PATH_ENV) - 1));
#else #else
printf(" -PATH_ENV\n"); printf(" -PATH_ENV\n");
#endif #endif
@ -731,12 +731,12 @@ version(void)
printf(" -REFRESH_PERIOD\n"); printf(" -REFRESH_PERIOD\n");
#endif #endif
#ifdef PRINTPIPE #ifdef PRINTPIPE
printf(" PRINTPIPE=\"%s\"\n", PRINTPIPE); printf(" PRINTPIPE=\"%s\"\n", safe_print_string(PRINTPIPE, sizeof(PRINTPIPE) - 1));
#else #else
printf(" -PRINTPIPE\n"); printf(" -PRINTPIPE\n");
#endif #endif
#ifdef KS_DELETE #ifdef KS_DELETE
printf(" KS_DELETE=\"%s\"\n", KS_DELETE); printf(" KS_DELETE=\"%s\"\n", safe_print_string(KS_DELETE, sizeof(KS_DELETE) - 1));
#else #else
printf(" -KS_DELETE\n"); printf(" -KS_DELETE\n");
#endif #endif
@ -746,7 +746,7 @@ version(void)
printf(" -SAVELINES\n"); printf(" -SAVELINES\n");
#endif #endif
#ifdef CUTCHARS #ifdef CUTCHARS
printf(" CUTCHARS=\"%s\"\n", CUTCHARS); printf(" CUTCHARS=\"%s\"\n", safe_print_string(CUTCHARS, sizeof(CUTCHARS) - 1));
#else #else
printf(" -CUTCHARS\n"); printf(" -CUTCHARS\n");
#endif #endif
@ -776,7 +776,7 @@ version(void)
printf(" -SCROLLBAR_CONTINUOUS_DELAY\n"); printf(" -SCROLLBAR_CONTINUOUS_DELAY\n");
#endif #endif
#ifdef ESCZ_ANSWER #ifdef ESCZ_ANSWER
printf(" ESCZ_ANSWER=\"%s\"\n", ESCZ_ANSWER); printf(" ESCZ_ANSWER=\"%s\"\n", safe_print_string(ESCZ_ANSWER, sizeof(ESCZ_ANSWER) - 1));
#else #else
printf(" -ESCZ_ANSWER\n"); printf(" -ESCZ_ANSWER\n");
#endif #endif

4
src/pixmap.c
View File

@ -1775,7 +1775,8 @@ colormod_trans(Pixmap p, imlib_t *iml, GC gc, unsigned short w, unsigned short h
#endif #endif
break; break;
case 24: case 24:
if (ximg->bits_per_pixel != 32) { /* FIXME: Is this test needed? */
if (1 || (ximg->bits_per_pixel != 32)) {
shade_ximage_24(ximg->data, ximg->bytes_per_line, w, h, rm, gm, bm); shade_ximage_24(ximg->data, ximg->bytes_per_line, w, h, rm, gm, bm);
break; break;
} }
@ -2114,7 +2115,6 @@ set_icon_pixmap(char *filename, XWMHints * pwm_hints)
imlib_context_set_anti_alias(1); imlib_context_set_anti_alias(1);
imlib_context_set_dither(1); imlib_context_set_dither(1);
imlib_context_set_blend(0); imlib_context_set_blend(0);
imlib_render_pixmaps_for_whole_image_at_size(&wm_hints->icon_pixmap, &wm_hints->icon_mask, w, h); imlib_render_pixmaps_for_whole_image_at_size(&wm_hints->icon_pixmap, &wm_hints->icon_mask, w, h);
if (check_for_enlightenment()) { if (check_for_enlightenment()) {
wm_hints->flags |= IconPixmapHint | IconMaskHint; wm_hints->flags |= IconPixmapHint | IconMaskHint;