waimea-0.3.5 update (faith-ok couderc@)

Changes:

A lot of optimizations have been done to text and transparency.  Double
buffered text rendering is now supported, eliminates all text flickering,
reduces text redrawing and will also give an extra boost in transparency
updating, especially for menus. An option to turn off real-time
transparency has also been added.

Multiple desktop support has now also been added to waimea. Together with
waimea's action file system this allows for some really amazing
configurations. How about running a full Gnome environment on desktop 1,
a full KDE environment on desktop 2 and maybe a mixed one on desktop 3.
This commit is contained in:
mark 2002-10-18 02:05:19 +00:00
parent 6c9e9a1854
commit 18ca1c9df1
9 changed files with 37 additions and 129 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $
# $OpenBSD: Makefile,v 1.2 2002/10/18 02:05:19 mark Exp $
COMMENT= "Virtual desktop manager for X11"
VERSION=0.3.3
VERSION=0.3.5
DISTNAME= waimea-${VERSION}
CATEGORIES= x11
@ -23,7 +23,4 @@ USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --disable-pixmap
post-install:
${INSTALL_DATA} ${WRKSRC}/data/waimearc.example ${PREFIX}/share/Waimea
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (waimea-0.3.3.tar.gz) = 64c2b9009ead3b95f78a2365bad94cec
RMD160 (waimea-0.3.3.tar.gz) = 155940f079a0672cb3b147c6106c6fd0310d98b7
SHA1 (waimea-0.3.3.tar.gz) = 0bcebb23329321c413f56269c3abeab623d003ee
MD5 (waimea-0.3.5.tar.gz) = 07779d2a9b1e7b5238b5eec5cc5cd713
RMD160 (waimea-0.3.5.tar.gz) = 0c8650ee3565abc8177bf08197ebf04b59d0ef6f
SHA1 (waimea-0.3.5.tar.gz) = a58dbe286a773742acb86a6eaef670512cc7af22

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-data_Makefile_in,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $
--- data/Makefile.in.orig Sat Aug 31 14:51:45 2002
+++ data/Makefile.in Sat Aug 31 14:53:36 2002
@@ -84,7 +84,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
TAR = tar
GZIP_ENV = --best
-all: all-redirect
+all: waimearc.example all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-data_actions_Makefile_in,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $
--- data/actions/Makefile.in.orig Fri Aug 30 11:05:19 2002
+++ data/actions/Makefile.in Fri Aug 30 11:05:52 2002
@@ -200,11 +200,11 @@ mostlyclean distclean maintainer-clean
$OpenBSD: patch-data_actions_Makefile_in,v 1.2 2002/10/18 02:05:19 mark Exp $
--- data/actions/Makefile.in.orig Sun Oct 13 20:54:39 2002
+++ data/actions/Makefile.in Thu Oct 17 18:57:13 2002
@@ -226,11 +226,11 @@ uninstall-am: uninstall-actionsDATA unin
install-data-local:
@ -12,6 +12,6 @@ $OpenBSD: patch-data_actions_Makefile_in,v 1.1.1.1 2002/09/01 09:23:11 couderc E
uninstall-local:
- rm -f $(pkgdatadir)/actions/action
+ rm -f $(DESTDIR)$(pkgdatadir)/actions/action
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-data_styles_Default_in,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $
--- data/styles/Default.in.orig Sat Aug 31 13:45:01 2002
+++ data/styles/Default.in Sat Aug 31 13:45:42 2002
@@ -105,4 +105,4 @@ handleWidth: 3
! *.font: arial:pixelsize=12 [xft]
-rootCommand: Esetroot -s @pkgdatadir@/backgrounds/waimea.png
+!rootCommand: Esetroot -s @pkgdatadir@/backgrounds/waimea.png

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-data_styles_Default_style_in,v 1.1 2002/10/18 02:05:19 mark Exp $
--- data/styles/Default.style.in.orig Sun Oct 13 20:53:43 2002
+++ data/styles/Default.style.in Thu Oct 17 18:57:13 2002
@@ -112,4 +112,4 @@ handleWidth: 3
! *.font: arial:pixelsize=12 [xft]
-rootCommand: Esetroot -s @pkgdatadir@/backgrounds/waimea.png
+!rootCommand: Esetroot -s @pkgdatadir@/backgrounds/waimea.png

View File

@ -1,60 +0,0 @@
$OpenBSD: patch-src_EventHandler_cc,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $
--- src/EventHandler.cc.orig Fri May 17 16:56:26 2002
+++ src/EventHandler.cc Fri Aug 30 10:56:57 2002
@@ -94,7 +94,7 @@ void EventHandler::EventLoop(hash_set<in
void EventHandler::HandleEvent(XEvent *event) {
Window w;
int i, rx, ry;
- struct timeb click_time;
+ struct timeval click_time;
EventDetail *ed = new EventDetail;
@@ -136,36 +136,36 @@ void EventHandler::HandleEvent(XEvent *e
case ButtonPress:
ed->type = ButtonPress;
if (last_click_win == event->xbutton.window) {
- ftime(&click_time);
- if (click_time.time <= last_click.time + 1) {
- if (click_time.time == last_click.time &&
+ gettimeofday(&click_time, NULL);
+ if (click_time.tv_sec <= last_click.tv_sec + 1) {
+ if (click_time.tv_sec == last_click.tv_sec &&
(unsigned int)
- (click_time.millitm - last_click.millitm) <
+ ((click_time.tv_usec - last_click.tv_usec) / 1000) <
waimea->rh->double_click) {
ed->type = DoubleClick;
last_click_win = (Window) 0;
}
- else if ((1000 - last_click.millitm) +
- (unsigned int) click_time.millitm <
+ else if ((((1000000 - last_click.tv_usec) +
+ (unsigned int) click_time.tv_usec) / 1000) <
waimea->rh->double_click) {
ed->type = DoubleClick;
last_click_win = (Window) 0;
}
else {
last_click_win = event->xbutton.window;
- last_click.time = click_time.time;
- last_click.millitm = click_time.millitm;
+ last_click.tv_sec = click_time.tv_sec;
+ last_click.tv_usec = click_time.tv_usec;
}
}
else {
last_click_win = event->xbutton.window;
- last_click.time = click_time.time;
- last_click.millitm = click_time.millitm;
+ last_click.tv_sec = click_time.tv_sec;
+ last_click.tv_usec = click_time.tv_usec;
}
}
else {
last_click_win = event->xbutton.window;
- ftime(&last_click);
+ gettimeofday(&last_click, NULL);
}
case ButtonRelease:
if (event->type == ButtonRelease) ed->type = ButtonRelease;

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_EventHandler_hh,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $
--- src/EventHandler.hh.orig Fri Aug 30 10:42:45 2002
+++ src/EventHandler.hh Fri Aug 30 10:54:49 2002
@@ -15,7 +15,7 @@
#define __EventHandler_hh
#include <sys/types.h>
-#include <sys/timeb.h>
+#include <sys/time.h>
#include <X11/Xlib.h>
#include <hash_set.h>
@@ -64,7 +64,7 @@ private:
Waimea *waimea;
ResourceHandler *rh;
Window last_click_win;
- struct timeb last_click;
+ struct timeval last_click;
};
Bool eventmatch(WaAction *, EventDetail *);

View File

@ -1,16 +1,20 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2002/09/01 09:23:11 couderc Exp $
@comment $OpenBSD: PLIST,v 1.2 2002/10/18 02:05:19 mark Exp $
bin/waimea
man/man1/waimea.1
share/Waimea/actions/action
share/Waimea/actions/action.click-to-focus
share/Waimea/actions/action.no-mouse
share/Waimea/actions/action.non-opaque
share/Waimea/actions/action.sloppy-focus
share/Waimea/backgrounds/waimea.png
share/Waimea/menu
share/Waimea/styles/Default
share/Waimea/waimearc.example
@dirrm share/Waimea/styles
@dirrm share/Waimea/backgrounds
@dirrm share/Waimea/actions
@dirrm share/Waimea
share/waimea/actions/action
share/waimea/actions/action.click-to-focus
share/waimea/actions/action.no-mouse
share/waimea/actions/action.non-opaque
share/waimea/actions/action.sloppy-focus
share/waimea/backgrounds/waimea.png
share/waimea/config
share/waimea/menu
share/waimea/scripts/filelist.pl
share/waimea/scripts/procinfo.pl
share/waimea/scripts/stylesdir.pl
share/waimea/styles/Default.style
@dirrm share/waimea/styles
@dirrm share/waimea/scripts
@dirrm share/waimea/backgrounds
@dirrm share/waimea/actions
@dirrm share/waimea