This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 7c320447fbabf36527dbd2c3405cb18ab0bfbb19 (commit)
via 7c98f7cfc464a67e4bb66925f830f70c54801eba (commit)
via fc262124cd04f4d2c6716e0071e1ed791dc1338d (commit)
via 664ab79add830dfe724cd8c37aaf1b961bbd9b55 (commit)
via 7e424bf232343d04ba05a7b521ebedf32f9d5d75 (commit)
via e7c2a3dc69e548d9492a7978e75655a7e178f80d (commit)
via c15da2e406a040c4359be2193eaafae1cc9c57d7 (commit)
via 35f2b667db10a8dbb24a7f54f52e135aed2a93f9 (commit)
from f29fba2c8392ccd88f83c1cf6482d144a2651d23 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/7c320447fbabf36527dbd2c3405cb18ab0bfbb19
commit 7c320447fbabf36527dbd2c3405cb18ab0bfbb19
Author: Christophe CURIS <[email protected]>
Date: Fri May 10 18:35:45 2013 +0200
Added missing include guards in a few headers
Considering the number of headers we have, it is a good idea to
avoid possible problems. For details, you may read:
http://en.wikipedia.org/wiki/Include_guard
All headers should be ok now.
diff --git a/src/geomview.h b/src/geomview.h
index 2bd1ddd..ec135fe 100644
--- a/src/geomview.h
+++ b/src/geomview.h
@@ -17,6 +17,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#ifndef GEOMVIEW_H
+#define GEOMVIEW_H
+
typedef struct W_GeometryView WGeometryView;
@@ -27,7 +30,4 @@ void WSetGeometryViewShownPosition(WGeometryView *gview, int
x, int y);
void WSetGeometryViewShownSize(WGeometryView *gview,
unsigned width, unsigned height);
-
-
-
-
+#endif /* GEOMVIEW_H */
diff --git a/src/placement.h b/src/placement.h
index 5f7a907..e9bfed8 100644
--- a/src/placement.h
+++ b/src/placement.h
@@ -20,6 +20,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#ifndef PLACEMENT_H
+#define PLACEMENT_H
+
void PlaceIcon(WScreen *scr, int *x_ret, int *y_ret, int head);
/* Computes the intersecting length of two line sections */
@@ -32,3 +35,5 @@ void PlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
unsigned width, unsigned
/* Set the points x and y inside the screen */
void get_right_position_on_screen(WScreen *scr, int *x, int *y, int size_x,
int size_y);
+
+#endif /* PLACEMENT_H */
diff --git a/src/shutdown.h b/src/shutdown.h
index a88398f..bb29b39 100644
--- a/src/shutdown.h
+++ b/src/shutdown.h
@@ -19,6 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
*/
+#ifndef SHUTDOWN_H
+#define SHUTDOWN_H
+
/* shutdown modes */
typedef enum {
WSExitMode,
@@ -29,3 +32,5 @@ typedef enum {
void Shutdown(WShutdownMode mode);
void RestoreDesktop(WScreen *scr);
+
+#endif /* SHUTDOWN_H */
diff --git a/util/wmmenugen.h b/util/wmmenugen.h
index 54a162d..cdefbe9 100644
--- a/util/wmmenugen.h
+++ b/util/wmmenugen.h
@@ -18,6 +18,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#ifndef WMMENUGEN_H
+#define WMMENUGEN_H
+
#include <WINGs/WUtil.h>
#include "../src/wconfig.h"
@@ -59,3 +62,4 @@ void parse_xdg(const char *file, void
(*addWMMenuEntryCallback)(WMMenuEntry *aEn
void parse_wmconfig(const char *file, void
(*addWMMenuEntryCallback)(WMMenuEntry *aEntry));
Bool wmconfig_validate_file(const char *filename, const struct stat *st, int
tflags, struct FTW *ftw);
+#endif /* WMMENUGEN_H */
http://repo.or.cz/w/wmaker-crm.git/commit/7c98f7cfc464a67e4bb66925f830f70c54801eba
commit 7c98f7cfc464a67e4bb66925f830f70c54801eba
Author: Christophe CURIS <[email protected]>
Date: Fri May 10 18:35:44 2013 +0200
Added proper legal notice at beginning of header files
Some header were missing the notice; used git blame to find the
original date and author (without guarantee.
diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h
index ab5b274..0104e03 100644
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -1,4 +1,23 @@
-
+/* WINGs.h
+ *
+ * Copyright (c) 1998 scottc
+ * Copyright (c) 1999-2004 Dan Pascu
+ * Copyright (c) 1999-2001 Alfredo K. Kojima
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
#ifndef _WINGS_H_
#define _WINGS_H_
diff --git a/WINGs/WINGs/WUtil.h b/WINGs/WINGs/WUtil.h
index 0922cc8..f14af47 100644
--- a/WINGs/WINGs/WUtil.h
+++ b/WINGs/WINGs/WUtil.h
@@ -1,3 +1,24 @@
+/* WUtil.h
+ *
+ * Copyright (c) 1998 scottc
+ * Copyright (c) 1999-2004 Dan Pascu
+ * Copyright (c) 1999-2000 Alfredo K. Kojima
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
#ifndef _WUTIL_H_
#define _WUTIL_H_
diff --git a/WINGs/wconfig.h b/WINGs/wconfig.h
index 5cf10e2..819ad5f 100644
--- a/WINGs/wconfig.h
+++ b/WINGs/wconfig.h
@@ -1,4 +1,21 @@
-
+/* wconfig.h
+ *
+ * Copyright (c) 2001 Dan Pascu
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
#ifndef WINGS_CONFIG_H_
#define WINGS_CONFIG_H_
diff --git a/src/geomview.h b/src/geomview.h
index ac51afc..2bd1ddd 100644
--- a/src/geomview.h
+++ b/src/geomview.h
@@ -1,4 +1,21 @@
-
+/* geomview.h
+ *
+ * Copyright (c) 2000 Alfredo K. Kojima
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
typedef struct W_GeometryView WGeometryView;
diff --git a/src/xutil.h b/src/xutil.h
index 4e5bbee..e44f379 100644
--- a/src/xutil.h
+++ b/src/xutil.h
@@ -1,4 +1,21 @@
-
+/* xutil.h
+ *
+ * Copyright (c) 1998 scottc
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
#ifndef _WM_XUTIL_H_
#define _WM_XUTIL_H_
diff --git a/util/wmgenmenu.h b/util/wmgenmenu.h
index 18eb8d9..6091ebd 100644
--- a/util/wmgenmenu.h
+++ b/util/wmgenmenu.h
@@ -1,4 +1,21 @@
-/* Copyright (C) 2010 Carlos R. Mafra */
+/* wmgenmenu.h
+ *
+ * Copyright (C) 2010 Carlos R. Mafra
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
/*
* If the program should run from inside a terminal it has
http://repo.or.cz/w/wmaker-crm.git/commit/fc262124cd04f4d2c6716e0071e1ed791dc1338d
commit fc262124cd04f4d2c6716e0071e1ed791dc1338d
Author: Christophe CURIS <[email protected]>
Date: Fri May 10 18:35:43 2013 +0200
WPrefs: Added a few comments in header file
Nothing really interresting, just separators to group definitions
by theme, using the same syntax that can be found in other headers.
diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h
index 6cc02b7..6c7b90f 100644
--- a/WPrefs.app/WPrefs.h
+++ b/WPrefs.app/WPrefs.h
@@ -68,6 +68,7 @@ typedef struct PanelRec {
} PanelRec;
+/* ---[ Wprefs.c ] ------------------------------------------------------- */
void AddSection(Panel *panel, char *iconFile);
@@ -110,7 +111,7 @@ void SetBoolForKey(Bool value, const char *defaultName);
void SetSpeedForKey(int speed, const char *defaultName);
-
+/* ---[ main.c ] --------------------------------------------------------- */
void AddDeadChildHandler(pid_t pid, void (*handler)(void*), void *data);
http://repo.or.cz/w/wmaker-crm.git/commit/664ab79add830dfe724cd8c37aaf1b961bbd9b55
commit 664ab79add830dfe724cd8c37aaf1b961bbd9b55
Author: Christophe CURIS <[email protected]>
Date: Fri May 10 18:35:42 2013 +0200
Changed WM_OSDEP to use Conditional instead of Substitution
The automake documentation states that using substitution inside the
list of SOURCES will not work and calls for not doing it. The use
of 'EXTRA_xxx' made things look like they worked but is probably not
enough for corner cases.
This patches switches to the conditional method which will be safe.
diff --git a/configure.ac b/configure.ac
index 006c8fa..f3e113e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,10 @@ AS_CASE(["$host"],
[*-apple-darwin*], [WM_OSDEP="darwin"],
[*-*-solaris*], [WM_OSDEP="stub"], dnl solaris.c when
done
[WM_OSDEP="stub"])
-AC_SUBST(WM_OSDEP)
+AM_CONDITIONAL([WM_OSDEP_LINUX], [test "x$WM_OSDEP" = "xlinux"])
+AM_CONDITIONAL([WM_OSDEP_BSD], [test "x$WM_OSDEP" = "xbsd"])
+AM_CONDITIONAL([WM_OSDEP_DARWIN], [test "x$WM_OSDEP" = "xdarwin"])
+AM_CONDITIONAL([WM_OSDEP_GENERIC], [test "x$WM_OSDEP" = "xstub"])
dnl the prefix
diff --git a/src/Makefile.am b/src/Makefile.am
index f67e1cf..2d1bd2b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,6 @@ wmaker_SOURCES = menu.h misc.c
misc.h - osdep_@[email protected] monitor.c motif.c motif.h
@@ -105,7 +104,18 @@ wmaker_SOURCES = workspace.c workspace.h
-EXTRA_wmaker_SOURCES = osdep_bsd.c osdep_darwin.c osdep_linux.c osdep_stub.c
+if WM_OSDEP_BSD
+wmaker_SOURCES += osdep_bsd.c
+endif
+if WM_OSDEP_DARWIN
+wmaker_SOURCES += osdep_darwin.c
+endif
+if WM_OSDEP_LINUX
+wmaker_SOURCES += osdep_linux.c
+endif
+if WM_OSDEP_GENERIC
+wmaker_SOURCES += osdep_stub.c
+endif
AM_CFLAGS =
http://repo.or.cz/w/wmaker-crm.git/commit/7e424bf232343d04ba05a7b521ebedf32f9d5d75
commit 7e424bf232343d04ba05a7b521ebedf32f9d5d75
Author: Christophe CURIS <[email protected]>
Date: Fri May 10 18:35:41 2013 +0200
Configure: Changed OS dependant check to use Autoconf's macro
The macro provided by Autoconf will generate a similar code but
with better portability, and the source file is more consistent.
diff --git a/configure.ac b/configure.ac
index 957568d..006c8fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,38 +92,15 @@ AX_CFLAGS_GCC_OPTION(-Wextra -Wno-sign-compare
-Wno-unused-parameter)
dnl Platform-specific Makefile setup
dnl ================================
-
-case "${host}" in
- *-*-linux*|*-*-cygwin*|*-gnu*)
- WM_OSDEP="linux"
- CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600"
- ;;
- *-*-freebsd*|*-k*bsd-gnu*)
- WM_OSDEP="bsd"
- CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -DFREEBSD"
- ;;
- *-*-netbsd*)
- WM_OSDEP="bsd"
- CFLAGS="$CFLAGS -DNETBSD"
- ;;
- *-*-openbsd*)
- WM_OSDEP="bsd"
- CFLAGS="$CFLAGS -DOPENBSD"
- ;;
- *-*-dragonfly*)
- WM_OSDEP="bsd"
- CFLAGS="$CFLAGS -DDRAGONFLYBSD"
- ;;
- *-apple-darwin*)
- WM_OSDEP="darwin"
- ;;
- *-*-solaris*)
- WM_OSDEP="stub" # solaris.c when done
- ;;
- *)
- WM_OSDEP="stub"
- ;;
-esac
+AS_CASE(["$host"],
+ [*-*-linux*|*-*-cygwin*|*-gnu*], [WM_OSDEP="linux" ; CFLAGS="$CFLAGS
-D_XOPEN_SOURCE=600"],
+ [*-*-freebsd*|*-k*bsd-gnu*], [WM_OSDEP="bsd" ; CFLAGS="$CFLAGS
-D_XOPEN_SOURCE=600 -DFREEBSD"],
+ [*-*-netbsd*], [WM_OSDEP="bsd" ; CFLAGS="$CFLAGS
-DNETBSD"],
+ [*-*-openbsd*], [WM_OSDEP="bsd" ; CFLAGS="$CFLAGS
-DOPENBSD"],
+ [*-*-dragonfly*], [WM_OSDEP="bsd" ; CFLAGS="$CFLAGS
-DDRAGONFLYBSD"],
+ [*-apple-darwin*], [WM_OSDEP="darwin"],
+ [*-*-solaris*], [WM_OSDEP="stub"], dnl solaris.c when
done
+ [WM_OSDEP="stub"])
AC_SUBST(WM_OSDEP)
http://repo.or.cz/w/wmaker-crm.git/commit/e7c2a3dc69e548d9492a7978e75655a7e178f80d
commit e7c2a3dc69e548d9492a7978e75655a7e178f80d
Author: Christophe CURIS <[email protected]>
Date: Fri May 10 18:35:40 2013 +0200
util: removed deprecated file 'directjpeg.c'
The content is not used anywhere, and this is probably mostly due
to the fact that the behaviour is provided by the WRaster library
in a better way.
diff --git a/util/Makefile.am b/util/Makefile.am
index d177818..5335bd2 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -9,7 +9,7 @@ bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle
convertfonts
bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
-EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new directjpeg.c wkdemenu.pl
+EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wkdemenu.pl
AM_CPPFLAGS = -DLOCALEDIR="$(NLSDIR)" $(DFLAGS)
-I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib diff --git a/util/directjpeg.c
b/util/directjpeg.c
deleted file mode 100644
index f7f6245..0000000
--- a/util/directjpeg.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/* directjpeg.c- loads a jpeg file directly into a XImage
- *
- * WindowMaker window manager
- *
- * Copyright (c) 1999-2003 Alfredo K. Kojima
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "../config.h"
-
-#ifdef USE_JPEG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <jpeglib.h>
-
-#include "../wrlib/wraster.h"
-
-#include <setjmp.h>
-
-struct my_error_mgr {
- struct jpeg_error_mgr pub; /* "public" fields */
-
- jmp_buf setjmp_buffer; /* for return to caller */
-};
-
-typedef struct my_error_mgr *my_error_ptr;
-
-/*
- * Here's the routine that will replace the standard error_exit method:
- */
-
-static void my_error_exit(j_common_ptr cinfo)
-{
- /* cinfo->err really points to a my_error_mgr struct, so coerce pointer
*/
- my_error_ptr myerr = (my_error_ptr) cinfo->err;
-
- /* Always display the message. */
- /* We could postpone this until after returning, if we chose. */
- (*cinfo->err->output_message) (cinfo);
-
- /* Return control to the setjmp point */
- longjmp(myerr->setjmp_buffer, 1);
-}
-
-static Bool canLoad(RContext * rc)
-{
- if (rc->depth != 16 || rc->vclass != TrueColor
- || rc->red_offset != 11 || rc->green_offset != 5 || rc->blue_offset
!= 0)
- return False;
-
- return True;
-}
-
-static void readData(RContext * rc, struct jpeg_decompress_struct *cinfo,
JSAMPROW * buffer, RXImage * ximg)
-{
- int i, j;
- unsigned long pixel;
- int y = 0;
-
- /* for 16bpp only */
- while (cinfo->output_scanline < cinfo->output_height) {
-
- jpeg_read_scanlines(cinfo, buffer, (JDIMENSION) 1);
-
- if (cinfo->out_color_space == JCS_RGB) {
- for (i = 0, j = 0; i < cinfo->image_width; i++) {
-
- printf("%i %i %in",
- (((unsigned long)buffer[0][j]) & 0xf8)
<< 8,
- (((unsigned long)buffer[0][j + 1]) &
0xf4) << 3,
- (((unsigned long)buffer[0][j + 2])) >>
3);
-
- pixel = (((unsigned long)buffer[0][j++]) &
0xf8) << 8
- | (((unsigned long)buffer[0][j++]) & 0xf4)
<< 3
- | (((unsigned long)buffer[0][j++])) >> 3;
-
- XPutPixel(ximg->image, i, y, pixel);
- }
- } else {
- for (i = 0, j = 0; i < cinfo->image_width; i++, j++) {
-
- pixel = (unsigned long)buffer[0][j] << 8
- | (unsigned long)buffer[0][j] << 3 |
(unsigned long)buffer[0][j] >> 3;
-
- XPutPixel(ximg->image, i, y, pixel);
- }
- }
- y++;
- }
-}
-
-Pixmap LoadJPEG(RContext * rc, char *file_name, int *width, int *height)
-{
- struct jpeg_decompress_struct cinfo;
- JSAMPROW buffer[1];
- FILE *file;
- struct my_error_mgr jerr;
- RXImage *ximg = NULL;
- unsigned char buf[8];
- Pixmap p = None;
-
- if (!canLoad(rc))
- return None;
-
- file = fopen(file_name, "rb");
- if (!file) {
- return None;
- }
- if (fread(buf, 2, 1, file) != 1) {
- fclose(file);
- return None;
- }
- if (buf[0] != 0xff || buf[1] != 0xd8) {
- fclose(file);
- return None;
- }
- rewind(file);
-
- cinfo.err = jpeg_std_error(&jerr.pub);
- jerr.pub.error_exit = my_error_exit;
- /* Establish the setjmp return context for my_error_exit to use. */
- if (setjmp(jerr.setjmp_buffer)) {
- /* If we get here, the JPEG code has signaled an error.
- * We need to clean up the JPEG object, close the input file,
and return.
- */
- jpeg_destroy_decompress(&cinfo);
- fclose(file);
-
- if (ximg) {
- RDestroyXImage(rc, ximg);
- }
-
- return None;
- }
-
- jpeg_create_decompress(&cinfo);
-
- jpeg_stdio_src(&cinfo, file);
-
- jpeg_read_header(&cinfo, TRUE);
-
- buffer[0] = (JSAMPROW) malloc(cinfo.image_width * cinfo.num_components);
- if (!buffer[0]) {
- RErrorCode = RERR_NOMEMORY;
- goto bye;
- }
-
- if (cinfo.jpeg_color_space == JCS_GRAYSCALE) {
- cinfo.out_color_space = JCS_GRAYSCALE;
- } else
- cinfo.out_color_space = JCS_RGB;
- cinfo.quantize_colors = FALSE;
- cinfo.do_fancy_upsampling = FALSE;
- cinfo.do_block_smoothing = FALSE;
- jpeg_calc_output_dimensions(&cinfo);
-
- ximg = RCreateXImage(rc, rc->depth, cinfo.image_width,
cinfo.image_height);
- if (!ximg) {
- goto bye;
- }
- jpeg_start_decompress(&cinfo);
-
- readData(rc, &cinfo, buffer, ximg);
-
- jpeg_finish_decompress(&cinfo);
-
- p = XCreatePixmap(rc->dpy, rc->drawable, cinfo.image_width,
cinfo.image_height, rc->depth);
-
- RPutXImage(rc, p, rc->copy_gc, ximg, 0, 0, 0, 0, cinfo.image_width,
cinfo.image_height);
-
- *width = cinfo.image_width;
- *height = cinfo.image_height;
-
- bye:
- jpeg_destroy_decompress(&cinfo);
-
- fclose(file);
-
- if (buffer[0])
- free(buffer[0]);
-
- if (ximg)
- RDestroyXImage(rc, ximg);
-
- return p;
-}
-
-#endif /* USE_JPEG */
diff --git a/util/wmsetbg.c b/util/wmsetbg.c
index a75ae95..abbf6ff 100644
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -81,7 +81,6 @@ Bool xineStretch = False;
Pixmap CurrentPixmap = None;
char *PixmapPath = NULL;
-extern Pixmap LoadJPEG(RContext * rc, char *file_name, int *width, int
*height);
extern char *__progname;
typedef struct BackgroundTexture {
http://repo.or.cz/w/wmaker-crm.git/commit/c15da2e406a040c4359be2193eaafae1cc9c57d7
commit c15da2e406a040c4359be2193eaafae1cc9c57d7
Author: Christophe CURIS <[email protected]>
Date: Fri May 10 18:35:39 2013 +0200
Readme: Removed reference to 'contrib' directory
This directory have been removed long time ago (in 2010 by Tamas
TEVESZ, in commit c960ae622e48477b11cfbd6b2f6b98add3dca242) so we
should not document it.
diff --git a/README b/README
index 12f1b9b..429dbf0 100644
--- a/README
+++ b/README
@@ -111,10 +111,6 @@ Directories & Files in the Source Tree
* TODO: plans for the future
-* contrib/ has some contributed patches that are not supported by Window Maker
- because they conflict with design philosophies of the developers or some
other
- reason.
-
* util/ has various utility programs.
* WPrefs.app/ is the configuration program.
http://repo.or.cz/w/wmaker-crm.git/commit/35f2b667db10a8dbb24a7f54f52e135aed2a93f9
commit 35f2b667db10a8dbb24a7f54f52e135aed2a93f9
Author: Christophe CURIS <[email protected]>
Date: Fri May 10 18:35:38 2013 +0200
Readme: Removed reference to the tutorial
This page does not exist anymore, and may have been outdated anyway
as it appears to be like 10 years old contribution.
diff --git a/README b/README
index 67c6f9e..12f1b9b 100644
--- a/README
+++ b/README
@@ -85,12 +85,6 @@ you are upgrading.
* BUGS: list of known bugs
-*** Tutorial
-
-There's a tutorial maintained by Georges Tarbouriech at:
-
-http://www.linuxfocus.org/~georges.t/
-
*** User Guide
-----------------------------------------------------------------------
Summary of changes:
README | 10 ---
WINGs/WINGs/WINGs.h | 21 +++++-
WINGs/WINGs/WUtil.h | 21 +++++
WINGs/wconfig.h | 19 +++++-
WPrefs.app/WPrefs.h | 3 +-
configure.ac | 46 +++--------
src/Makefile.am | 14 +++-
src/geomview.h | 27 ++++++-
src/placement.h | 5 +
src/shutdown.h | 5 +
src/xutil.h | 19 +++++-
util/Makefile.am | 2 +-
util/directjpeg.c | 204 ---------------------------------------------------
util/wmgenmenu.h | 19 +++++-
util/wmmenugen.h | 4 +
util/wmsetbg.c | 1 -
16 files changed, 159 insertions(+), 261 deletions(-)
delete mode 100644 util/directjpeg.c
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
