From b6305595a7d434478ec66905708b87f018fea8fe Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Tue, 16 Nov 1999 00:55:07 +0000 Subject: [PATCH] Typo fix. SVN revision: 1317 --- doc/Makefile.am | 2 +- src/events.c | 14 ++++++++++++-- src/options.c | 20 ++++++++++---------- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 5e163ae..b6833dc 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -8,7 +8,7 @@ Eterm.1: $(top_srcdir)/doc/Eterm.1.in $(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/$@.in > $@ Eterm.1.html: Eterm.1 - -nroff -man $< | man2html > $@ + -nroff -man $< | man2html -title Eterm > $@ EXTRA_DIST = Eterm.1.in Eterm_reference.html Eterm.tcap Eterm.ti Makefile.am Makefile.in diff --git a/src/events.c b/src/events.c index 192e9c6..f3fd8f5 100644 --- a/src/events.c +++ b/src/events.c @@ -235,7 +235,8 @@ handle_property_notify(event_t * ev) if (background_is_trans()) { if ((ev->xany.window == TermWin.parent) || (ev->xany.window == Xroot)) { prop = XInternAtom(Xdisplay, "_WIN_WORKSPACE", True); - D_EVENTS(("handle_property_notify(): On %s. prop == 0x%08x, ev->xproperty.atom == 0x%08x\n", ((ev->xany.window == Xroot) ? "the root window" : "TermWin.parent"), (int) prop, (int) ev->xproperty.atom)); + D_EVENTS(("handle_property_notify(): On %s. prop (_WIN_WORKSPACE) == 0x%08x, ev->xproperty.atom == 0x%08x\n", ((ev->xany.window == Xroot) ? "the root window" : "TermWin.parent"), + (int) prop, (int) ev->xproperty.atom)); if (ev->xproperty.atom == prop) { win = get_desktop_window(); if (win == (Window) 1) { @@ -259,7 +260,7 @@ handle_property_notify(event_t * ev) } if (ev->xany.window == desktop_window) { prop = XInternAtom(Xdisplay, "_XROOTPMAP_ID", True); - D_EVENTS(("handle_property_notify(): On desktop_window [0x%08x]. prop == 0x%08x, ev->xproperty.atom == 0x%08x\n", (int) desktop_window, (int) prop, (int) ev->xproperty.atom)); + D_EVENTS(("handle_property_notify(): On desktop_window [0x%08x]. prop (_XROOTPMAP_ID) == 0x%08x, ev->xproperty.atom == 0x%08x\n", (int) desktop_window, (int) prop, (int) ev->xproperty.atom)); if (ev->xproperty.atom == prop) { pmap = get_desktop_pixmap(); if (pmap == (Pixmap) 1) { @@ -271,6 +272,15 @@ handle_property_notify(event_t * ev) } } } + if ((ev->xany.window == Xroot) && (image_mode_any(MODE_AUTO))) { + prop = XInternAtom(Xdisplay, "ENLIGHTENMENT_COMMS", True); + D_EVENTS(("handle_property_notify(): On the root window. prop (ENLIGHTENMENT_COMMS) == 0x%08x, ev->xproperty.atom == 0x%08x\n", (int) prop, (int) ev->xproperty.atom)); + if ((prop != None) && (ev->xproperty.atom == prop)) { + if ((enl_ipc_get_win()) != None) { + redraw_all_images(); + } + } + } return 1; } diff --git a/src/options.c b/src/options.c index d8d24bc..f343ecb 100644 --- a/src/options.c +++ b/src/options.c @@ -219,7 +219,7 @@ static char *rs_bigfont_key = NULL; static char *rs_smallfont_key = NULL; #endif #ifdef MULTI_CHARSET -static char *rs_multchar_encoding = NULL; +static char *rs_multichar_encoding = NULL; #endif #ifdef GREEK_SUPPORT static char *rs_greek_keyboard = NULL; @@ -368,7 +368,7 @@ static const struct { OPT_LONG("mfont3", "multichar font 3", &rs_mfont[3]), OPT_LONG("mfont4", "multichar font 4", &rs_mfont[4]), OPT_LONG("mencoding", "multichar encoding mode (eucj or sjis or euckr)", - &rs_multchar_encoding), + &rs_multichar_encoding), #endif /* MULTI_CHARSET */ #ifdef USE_XIM OPT_LONG("input-method", "XIM input method", &rs_input_method), @@ -2742,16 +2742,16 @@ parse_multichar(char *buff) #ifdef MULTI_CHARSET if (!BEG_STRCASECMP(buff, "encoding ")) { - RESET_AND_ASSIGN(rs_multchar_encoding, Word(2, buff)); - if (rs_multchar_encoding != NULL) { - if (BEG_STRCASECMP(rs_multchar_encoding, "eucj") - && BEG_STRCASECMP(rs_multchar_encoding, "sjis") - && BEG_STRCASECMP(rs_multchar_encoding, "euckr")) { + RESET_AND_ASSIGN(rs_multichar_encoding, Word(2, buff)); + if (rs_multichar_encoding != NULL) { + if (BEG_STRCASECMP(rs_multichar_encoding, "eucj") + && BEG_STRCASECMP(rs_multichar_encoding, "sjis") + && BEG_STRCASECMP(rs_multichar_encoding, "euckr")) { print_error("Parse error in file %s, line %lu: Invalid multichar encoding mode \"%s\"", - file_peek_path(), file_peek_line(), rs_multchar_encoding); + file_peek_path(), file_peek_line(), rs_multichar_encoding); return; } - set_multichar_encoding(rs_multchar_encoding); + set_multichar_encoding(rs_multichar_encoding); } else { print_error("Parse error in file %s, line %lu: Invalid parameter list \"\" for attribute encoding", file_peek_path(), file_peek_line()); @@ -3763,7 +3763,7 @@ save_config(char *path) #ifdef MULTI_CHARSET fprintf(fp, " begin multichar\n"); if (rs_multichar_encoding) { - fprintf(fp, " encoding %s\n", rs_multchar_encoding); + fprintf(fp, " encoding %s\n", rs_multichar_encoding); } for (i = 0; i < 5; i++) { fprintf(fp, " font %d %s\n", i, rs_mfont[i]);