Hello community, here is the log from the commit of package FA_clxclient checked in at Tue Dec 12 23:07:40 CET 2006. -------- --- FA_clxclient/FA_clxclient.changes 2006-09-18 16:37:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/FA_clxclient/FA_clxclient.changes 2006-12-12 18:52:18.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 12 18:51:53 CET 2006 - mkoenig@suse.de + +- update to version 3.3.1: + * minor fixes + +------------------------------------------------------------------- Old: ---- clxclient-3.3.0-1.tar.bz2 New: ---- clxclient-3.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FA_clxclient.spec ++++++ --- /var/tmp/diff_new_pack.c6SKF3/_old 2006-12-12 23:07:32.000000000 +0100 +++ /var/tmp/diff_new_pack.c6SKF3/_new 2006-12-12 23:07:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package FA_clxclient (Version 3.3.0) +# spec file for package FA_clxclient (Version 3.3.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,14 +13,14 @@ Name: FA_clxclient BuildRequires: FA_clthreads >= 2.2.0 alsa-devel gcc-c++ xorg-x11-devel Requires: FA_clthreads >= 2.2.0 -URL: http://users.skynet.be/solaris/linuxaudio -License: GPL +URL: http://www.kokkinizita.net/linuxaudio +License: GNU General Public License (GPL) Group: Development/Libraries/Other Autoreqprov: on -Version: 3.3.0 +Version: 3.3.1 Release: 1 Summary: Library Required for AEOLUS and JAAA -Source: clxclient-%{version}-1.tar.bz2 +Source: clxclient-%{version}.tar.bz2 Patch0: FA_clxclient-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,9 +64,12 @@ # %doc %{_docdir}/%{name} %changelog -n FA_clxclient +* Tue Dec 12 2006 - mkoenig@suse.de +- update to version 3.3.1: + * minor fixes * Mon Sep 18 2006 - mkoenig@suse.de - update to version 3.3.0-1 -- removed X_browse, mouse handling reworked + - removed X_browse, mouse handling reworked * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Wed Oct 12 2005 - meissner@suse.de ++++++ clxclient-3.3.0-1.tar.bz2 -> clxclient-3.3.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clxclient-3.3.0/Makefile new/clxclient-3.3.1/Makefile --- old/clxclient-3.3.0/Makefile 2006-05-15 19:03:42.000000000 +0200 +++ new/clxclient-3.3.1/Makefile 2006-10-08 16:59:35.000000000 +0200 @@ -23,7 +23,7 @@ MAJVERS = 3 -MINVERS = 3.0 +MINVERS = 3.1 VERSION = $(MAJVERS).$(MINVERS) DISTDIR = clxclient-$(VERSION) @@ -47,6 +47,7 @@ install: $(CLXCLIENT_MIN) + /usr/bin/install -d $(PREFIX)/$(LIBDIR) /usr/bin/install -m 644 $(CLXCLIENT_H) $(PREFIX)/include /usr/bin/install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR) /sbin/ldconfig -n $(PREFIX)/$(LIBDIR) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clxclient-3.3.0/button.cc new/clxclient-3.3.1/button.cc --- old/clxclient-3.3.0/button.cc 2006-05-05 21:24:32.000000000 +0200 +++ new/clxclient-3.3.1/button.cc 2006-10-08 16:55:13.000000000 +0200 @@ -241,7 +241,7 @@ XSetState (dpy (), dgc (), f, b, GXcopy, ~0); XSetWindowBackground (dpy (), win (), b); XClearWindow (dpy (), win ()); - XPutImage (dpy (), win (), dgc (), _image, 0, 0, (_xs - _image->width) / 2, (_ys - _image->height) / 2, _xs, _ys); + if (_image) XPutImage (dpy (), win (), dgc (), _image, 0, 0, (_xs - _image->width) / 2, (_ys - _image->height) / 2, _xs, _ys); if ((_style->type & 255) == X_button_style::BORDER) { XSetLineAttributes (dpy (), dgc (), 1, LineSolid, CapButt, JoinBevel); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clxclient-3.3.0/clxclient.h new/clxclient-3.3.1/clxclient.h --- old/clxclient-3.3.0/clxclient.h 2006-05-07 13:23:11.000000000 +0200 +++ new/clxclient-3.3.1/clxclient.h 2006-10-08 16:55:13.000000000 +0200 @@ -58,6 +58,7 @@ unsigned long alloc_color (const char *name, unsigned long d); XftColor *alloc_xftcolor (const char *name, XftColor *D); + XftColor *alloc_xftcolor (float r, float g, float b, float a); void free_xftcolor (XftColor *C); XFontStruct *alloc_font (const char *name); @@ -573,6 +574,7 @@ float offs (void) const { return _offs; } float frac (void) const { return _frac; } void geom (float offs, float frac, int size = 0); + void move (float drel); private: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clxclient-3.3.0/scroll.cc new/clxclient-3.3.1/scroll.cc --- old/clxclient-3.3.0/scroll.cc 2006-05-05 21:24:32.000000000 +0200 +++ new/clxclient-3.3.1/scroll.cc 2006-10-08 16:55:13.000000000 +0200 @@ -151,8 +151,8 @@ k = (_xs > _ys) ? E->x - 1 : E->y - 1; if (! _callb || (k < 0) || (k >= _km)) return; k -= _k0; - if (k >= _dk) _callb->handle_callb (X_callback::SCROLL | ((E->button == Button3) ? C3LU : C1LU), this, 0); - else if (k < 0) _callb->handle_callb (X_callback::SCROLL | ((E->button == Button3) ? C3RD : C1RD), this, 0); + if (k >= _dk) _callb->handle_callb (X_callback::SCROLL | ((E->button == Button3) ? C3RD : C1RD), this, 0); + else if (k < 0) _callb->handle_callb (X_callback::SCROLL | ((E->button == Button3) ? C3LU : C1LU), this, 0); else _zz = k + _k0; } @@ -225,6 +225,15 @@ } +void X_scroll::move (float drel) +{ + _offs += drel * _frac; + if (_offs < 0.0f) _offs = 0.0f; + if (_offs > 1.0f) _offs = 1.0f; + redraw (); +} + + void X_scroll::redraw (void) { _dk = (int)(_frac * _km + 0.5f); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clxclient-3.3.0/textip.cc new/clxclient-3.3.1/textip.cc --- old/clxclient-3.3.0/textip.cc 2006-05-05 21:24:32.000000000 +0200 +++ new/clxclient-3.3.1/textip.cc 2006-08-04 23:29:02.000000000 +0200 @@ -557,7 +557,7 @@ _xc = _x0 + textwidth (0, _ic); _x1 = _xc + textwidth (_ic, _i1 - _ic); - + if (_flags & RIGHT) { d = _x1 - _xs + DX; @@ -581,6 +581,7 @@ XftDraw *D = xft (); XftColor *C; + XSetWindowBackground (dpy (), win (), (_flags & FOCUS) ? _style->color.focus.bgnd : _bg); XClearWindow (dpy (), win ()); if (_i1) { @@ -602,7 +603,7 @@ XDrawPoint (dpy (), win (), gc, 0, _ys - 1); XDrawPoint (dpy (), win (), gc, _xs - 1, 0); } - if (_flags & FOCUS) xorcursor (); + xorcursor (); } @@ -612,7 +613,6 @@ { _flags ^= FOCUS; x_add_events (KeyPressMask); - XSetWindowBackground (dpy (), win (), _style->color.focus.bgnd); XSetICValues (_xic, XNFocusWindow, win (), NULL); redraw (); } @@ -625,7 +625,6 @@ { _flags ^= FOCUS; x_rem_events (KeyPressMask); - XSetWindowBackground (dpy (), win (), _bg); redraw (); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clxclient-3.3.0/xdisplay.cc new/clxclient-3.3.1/xdisplay.cc --- old/clxclient-3.3.0/xdisplay.cc 2006-05-05 21:24:32.000000000 +0200 +++ new/clxclient-3.3.1/xdisplay.cc 2006-06-19 00:23:15.000000000 +0200 @@ -23,21 +23,26 @@ X_display::X_display (const char *name) : _dsn (0), _dcm (0), _dgc (0), _dvi (0), _xft (0) { - int i; + int i; + XImage *I; _dpy = XOpenDisplay (name); - if (_dpy) + if (! _dpy) return; + + _dsn = DefaultScreen (_dpy); + _dcm = DefaultColormap (_dpy, _dsn); + _dgc = DefaultGC (_dpy, _dsn); + _dvi = DefaultVisual (_dpy, _dsn); + _xim = XOpenIM (_dpy, 0, 0, 0); + + for (i = 0; i < N_IMG1515; i++) { - _dsn = DefaultScreen (_dpy); - _dcm = DefaultColormap (_dpy, _dsn); - _dgc = DefaultGC (_dpy, _dsn); - _dvi = DefaultVisual (_dpy, _dsn); - _xim = XOpenIM (_dpy, 0, 0, 0); - - for (i = 0; i < N_IMG1515; i++) - { - _imgptr1515 [i] = XCreateImage (_dpy, _dvi, 1, XYBitmap, 0, _imgdef1515 + 30 * i, 15, 15, 8, 2); - } + I = XCreateImage (_dpy, _dvi, 1, XYBitmap, 0, _imgdef1515 + 30 * i, 15, 15, 8, 2); + I->bitmap_unit = 8; + I->bitmap_pad = 8; + I->bitmap_bit_order = LSBFirst; + XInitImage (I); + _imgptr1515 [i] = I; } } @@ -88,6 +93,21 @@ } +XftColor *X_display::alloc_xftcolor (float r, float g, float b, float a) +{ + XftColor *C = new XftColor; + XRenderColor R; + + R.red = (int)(65535 * r); + R.green = (int)(65535 * g); + R.blue = (int)(65535 * b); + R.alpha = (int)(65535 * a); + + XftColorAllocValue (_dpy, _dvi, _dcm, &R, C); + return C; +} + + void X_display::free_xftcolor (XftColor *C) { XftColorFree (_dpy, _dvi, _dcm, C); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org