Fri Aug 27 19:39:26 PDT 1999 Michael Jennings <mej@eterm.org>
Fix fix fix. SVN revision: 107
This commit is contained in:
parent
6735efa7c7
commit
8d68cdab81
|
@ -2351,3 +2351,8 @@ Wed Aug 25 12:28:50 PDT 1999 Michael Jennings <mej@eterm.org>
|
||||||
Applied XIM fix from Sung-Hyun Nam <namsh@lgic.co.kr>.
|
Applied XIM fix from Sung-Hyun Nam <namsh@lgic.co.kr>.
|
||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
Fri Aug 27 19:39:26 PDT 1999 Michael Jennings <mej@eterm.org>
|
||||||
|
|
||||||
|
Fix fix fix.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
|
|
@ -4,16 +4,16 @@ lib_LTLIBRARIES = libEterm.la
|
||||||
|
|
||||||
libEterm_la_SOURCES = actions.c command.c e.c events.c graphics.c grkelot.c menus.c misc.c netdisp.c \
|
libEterm_la_SOURCES = actions.c command.c e.c events.c graphics.c grkelot.c menus.c misc.c netdisp.c \
|
||||||
options.c pixmap.c screen.c scrollbar.c system.c term.c threads.c timer.c utmp.c windows.c
|
options.c pixmap.c screen.c scrollbar.c system.c term.c threads.c timer.c utmp.c windows.c
|
||||||
libEterm_la_DEPENDENCIES = $(DIST_ROOT)/libmej/libmej.la feature.h
|
libEterm_la_DEPENDENCIES = $(top_srcdir)/libmej/libmej.la feature.h
|
||||||
libEterm_la_LDFLAGS = -version-info 9:0:9
|
libEterm_la_LDFLAGS = -version-info 9:0:9
|
||||||
|
|
||||||
bin_PROGRAMS = Eterm
|
bin_PROGRAMS = Eterm
|
||||||
Eterm_SOURCES = main.c
|
Eterm_SOURCES = main.c
|
||||||
Eterm_DEPENDENCIES = libEterm.la
|
Eterm_DEPENDENCIES = libEterm.la
|
||||||
Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir) libEterm.la
|
Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir)
|
||||||
|
|
||||||
INCLUDES = -I. -I$(top_srcdir)/libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
|
INCLUDES = -I. -I$(top_srcdir)/libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
|
||||||
LDADD = $(DIST_ROOT)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS)
|
LDADD = libEterm.la $(top_srcdir)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS)
|
||||||
|
|
||||||
EXTRA_DIST = actions.h command.h debug.h e.h eterm_utmp.h events.h feature.h graphics.h grkelot.h grx.h main.h menus.h misc.h \
|
EXTRA_DIST = actions.h command.h debug.h e.h eterm_utmp.h events.h feature.h graphics.h grkelot.h grx.h main.h menus.h misc.h \
|
||||||
options.h pixmap.h profile.h screen.h scrollbar.h system.h term.h threads.h timer.h windows.h graphics/Makefile.am \
|
options.h pixmap.h profile.h screen.h scrollbar.h system.h term.h threads.h timer.h windows.h graphics/Makefile.am \
|
||||||
|
|
14
src/screen.c
14
src/screen.c
|
@ -1632,6 +1632,10 @@ scr_expose(int x, int y, int width, int height)
|
||||||
if (part_end.col != full_end.col)
|
if (part_end.col != full_end.col)
|
||||||
for (i = full_beg.row; i <= full_end.row; i++)
|
for (i = full_beg.row; i <= full_end.row; i++)
|
||||||
drawn_rend[i][part_end.col] = RS_Dirty;
|
drawn_rend[i][part_end.col] = RS_Dirty;
|
||||||
|
|
||||||
|
#ifdef USE_XIM
|
||||||
|
scr_refresh(SLOW_REFRESH);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------------- */
|
||||||
|
@ -1800,7 +1804,6 @@ scr_refresh(int type)
|
||||||
#ifdef OPTIMIZE_HACKS
|
#ifdef OPTIMIZE_HACKS
|
||||||
register int nrows = TermWin.nrow;
|
register int nrows = TermWin.nrow;
|
||||||
register int ncols = TermWin.ncol;
|
register int ncols = TermWin.ncol;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PROFILE_SCREEN
|
#ifdef PROFILE_SCREEN
|
||||||
|
@ -2051,18 +2054,12 @@ scr_refresh(int type)
|
||||||
&& PixColors[back] != PixColors[colorBD]) {
|
&& PixColors[back] != PixColors[colorBD]) {
|
||||||
gcvalue.foreground = PixColors[colorBD];
|
gcvalue.foreground = PixColors[colorBD];
|
||||||
gcmask |= GCForeground;
|
gcmask |= GCForeground;
|
||||||
#if 0
|
|
||||||
rend &= ~RS_Bold; /* we've taken care of it */
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
} else if (rend & RS_Uline) {
|
} else if (rend & RS_Uline) {
|
||||||
if (PixColors[fore] != PixColors[colorUL]
|
if (PixColors[fore] != PixColors[colorUL]
|
||||||
&& PixColors[back] != PixColors[colorUL]) {
|
&& PixColors[back] != PixColors[colorUL]) {
|
||||||
gcvalue.foreground = PixColors[colorUL];
|
gcvalue.foreground = PixColors[colorUL];
|
||||||
gcmask |= GCForeground;
|
gcmask |= GCForeground;
|
||||||
#if 0
|
|
||||||
rend &= ~RS_Uline; /* we've taken care of it */
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -2085,9 +2082,6 @@ scr_refresh(int type)
|
||||||
#ifndef NO_BOLDFONT
|
#ifndef NO_BOLDFONT
|
||||||
if (!wbyte && MONO_BOLD(rend) && TermWin.boldFont != NULL) {
|
if (!wbyte && MONO_BOLD(rend) && TermWin.boldFont != NULL) {
|
||||||
XSetFont(Xdisplay, TermWin.gc, TermWin.boldFont->fid);
|
XSetFont(Xdisplay, TermWin.gc, TermWin.boldFont->fid);
|
||||||
#if 0
|
|
||||||
rend &= ~RS_Bold; /* we've taken care of it */
|
|
||||||
#endif
|
|
||||||
bfont = 1;
|
bfont = 1;
|
||||||
} else if (bfont) {
|
} else if (bfont) {
|
||||||
bfont = 0;
|
bfont = 0;
|
||||||
|
|
Loading…
Reference in New Issue