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

Mon Oct 4 18:20:15 PDT 1999 Michael Jennings <mej@eterm.org> 

A few touch-ups.


SVN revision: 655
This commit is contained in:
Michael Jennings 1999-10-04 22:24:28 +00:00
parent 9fa7268341
commit 5df9e64ec8
5 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -2517,3 +2517,8 @@ Fri Oct 1 11:03:21 PDT 1999 Michael Jennings <mej@eterm.org>
Set $COLORTERM_BCE for better SLang compatibility.
-------------------------------------------------------------------------------
Mon Oct 4 18:20:15 PDT 1999 Michael Jennings <mej@eterm.org>
A few touch-ups.
-------------------------------------------------------------------------------

0
acl.m4 → acinclude.m4
View File

16
configure.in
View File

@ -198,7 +198,7 @@ AC_ARG_WITH(imlib,
)
AC_MSG_CHECKING(for transparency support)
AC_ARG_ENABLE(trans,
[ --enable-trans[=imlib] compile with transparency support ("=imlib" will use Imlib instead of Xlib for transparency)],
[ --enable-trans[=imlib] compile with transparency support (\"=imlib\" will use Imlib instead of Xlib for transparency)],
if test "$enableval" = "imlib"; then
AC_MSG_RESULT(yes, using Imlib)
AC_DEFINE(PIXMAP_OFFSET)
@ -224,7 +224,7 @@ AC_ARG_ENABLE(utmp,
)
AC_MSG_CHECKING(for backspace key configuration)
AC_ARG_WITH(backspace,
[ --with-backspace=KEY force backspace to send KEY (KEY is either "bs" for ^H or "del" for ^?)],
[ --with-backspace=KEY force backspace to send KEY (KEY is either \"bs\" for ^H or \"del\" for ^?)],
if test "$withval" = "bs"; then
AC_MSG_RESULT(forcing Backspace to send Ctrl-H)
AC_DEFINE(FORCE_BACKSPACE)
@ -237,11 +237,17 @@ AC_ARG_WITH(backspace,
)
AC_MSG_CHECKING(for delete key configuration)
AC_ARG_WITH(delete,
[ --with-delete=SETTING force delete to SETTING ("server" to use the X server value always or
a quoted string to use a specific string)],
if test "$withval" = "server"; then
[ --with-delete=SETTING force delete to SETTING (\"server\" to use the X server value always,
\"execute\" to send the old default execute escape sequence,
or a quoted string to use a specific string)],
if test "$withval" = "server"; then
AC_MSG_RESULT(X server value)
AC_DEFINE(NO_DELETE_KEY)
elif test "$withval" = "no"; then
AC_MSG_RESULT(X server value)
AC_DEFINE(NO_DELETE_KEY)
elif test "$withval" = "execute"; then
AC_MSG_RESULT(send execute sequence)
else
AC_MSG_RESULT(forcing Delete to send "$withval")
AC_DEFINE_UNQUOTED(KS_DELETE, "$withval")

10
src/netdisp.c
View File

@ -23,6 +23,8 @@ static const char cvs_ident[] = "$Id$";
#include "config.h"
#include "feature.h"
#ifdef DISPLAY_IS_IP
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -62,14 +64,6 @@ static const char cvs_ident[] = "$Id$";
#include "main.h"
/* Put in a dummy routine if this is disabled, inline it if possible */
#ifndef DISPLAY_IS_IP
inline const char *
network_display(const char *display)
{
return (display);
}
#else
/* return a pointer to a static buffer */
char *
network_display(const char *display)

26
src/pixmap.c
View File

@ -1314,21 +1314,31 @@ set_icon_pixmap(char *filename, XWMHints * pwm_hints)
Imlib_render(imlib_id, temp_im, w, h);
wm_hints->icon_pixmap = Imlib_copy_image(imlib_id, temp_im);
wm_hints->icon_mask = Imlib_copy_mask(imlib_id, temp_im);
wm_hints->icon_window = XCreateSimpleWindow(Xdisplay, TermWin.parent, 0, 0, w, h, 0, 0L, 0L);
shaped_window_apply_mask(wm_hints->icon_window, wm_hints->icon_mask);
XSetWindowBackgroundPixmap(Xdisplay, wm_hints->icon_window, wm_hints->icon_pixmap);
wm_hints->flags |= IconWindowHint;
if (check_for_enlightenment()) {
wm_hints->flags |= IconPixmapHint | IconMaskHint;
} else {
wm_hints->icon_window = XCreateSimpleWindow(Xdisplay, TermWin.parent, 0, 0, w, h, 0, 0L, 0L);
shaped_window_apply_mask(wm_hints->icon_window, wm_hints->icon_mask);
XSetWindowBackgroundPixmap(Xdisplay, wm_hints->icon_window, wm_hints->icon_pixmap);
wm_hints->flags |= IconWindowHint;
}
Imlib_destroy_image(imlib_id, temp_im);
}
} else {
/* Use the default. It's 48x48, so if the WM doesn't like it, tough cookies. Pixmap -> ImlibImage -> Render -> Pixmap would be
too expensive, IMHO. */
Imlib_data_to_pixmap(imlib_id, Eterm_xpm, &wm_hints->icon_pixmap, &wm_hints->icon_mask);
wm_hints->icon_window = XCreateSimpleWindow(Xdisplay, TermWin.parent, 0, 0, 48, 48, 0, 0L, 0L);
shaped_window_apply_mask(wm_hints->icon_window, wm_hints->icon_mask);
XSetWindowBackgroundPixmap(Xdisplay, wm_hints->icon_window, wm_hints->icon_pixmap);
wm_hints->flags |= IconWindowHint;
if (check_for_enlightenment()) {
wm_hints->flags |= IconPixmapHint | IconMaskHint;
} else {
wm_hints->icon_window = XCreateSimpleWindow(Xdisplay, TermWin.parent, 0, 0, 48, 48, 0, 0L, 0L);
shaped_window_apply_mask(wm_hints->icon_window, wm_hints->icon_mask);
XSetWindowBackgroundPixmap(Xdisplay, wm_hints->icon_window, wm_hints->icon_pixmap);
wm_hints->flags |= IconWindowHint;
}
}
wm_hints->icon_x = wm_hints->icon_y = 0;
wm_hints->flags |= IconPositionHint;
/* Only set the hints ourselves if we were passed a NULL pointer for pwm_hints */
if (!pwm_hints) {