snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

indent -linux -l144 -i4 -ts4 **/*.[ch]

Browse source
This commit is contained in:
Alexey I. Froloff 2012-08-14 17:04:20 +04:00 committed by Carlos R. Mafra
parent cb310ed1a1
commit 324a28e4ba
9 changed files with 719 additions and 784 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wmMatrix/config.h
View file

@ -9,7 +9,6 @@
* that your changes will be lost if you ever run `configure' again. * that your changes will be lost if you ever run `configure' again.
*/ */
/* ************************************************************************* /* *************************************************************************
CONFIGURING SERVER EXTENSIONS CONFIGURING SERVER EXTENSIONS
************************************************************************* */ ************************************************************************* */
@ -110,8 +109,6 @@
*/ */
/* #undef HAVE_PROC_INTERRUPTS */ /* #undef HAVE_PROC_INTERRUPTS */
/* ************************************************************************* /* *************************************************************************
CONFIGURING GRAPHICS TOOLKITS CONFIGURING GRAPHICS TOOLKITS
************************************************************************* */ ************************************************************************* */
@ -184,8 +181,6 @@
*/ */
#define ZIPPY_PROGRAM "/packages/libexec/emacs/20.2/sparc-sun-solaris2.6/yow" #define ZIPPY_PROGRAM "/packages/libexec/emacs/20.2/sparc-sun-solaris2.6/yow"
/* ************************************************************************* /* *************************************************************************
CONFIGURING PASSWORD AUTHENTICATION CONFIGURING PASSWORD AUTHENTICATION
************************************************************************* */ ************************************************************************* */
@ -258,13 +253,11 @@
*/ */
/* #undef HAVE_VT_LOCKSWITCH */ /* #undef HAVE_VT_LOCKSWITCH */
/* Define this if you the openlog(), syslog(), and closelog() functions. /* Define this if you the openlog(), syslog(), and closelog() functions.
This is used for logging failed login attempts. This is used for logging failed login attempts.
*/ */
#define HAVE_SYSLOG 1 #define HAVE_SYSLOG 1
/* ************************************************************************* /* *************************************************************************
OTHER C ENVIRONMENT JUNK OTHER C ENVIRONMENT JUNK
************************************************************************* */ ************************************************************************* */

117
wmMatrix/matrix.c
View file

@ -37,11 +37,8 @@ extern Pixel back_pix, fore_pix;
extern int PixmapSize; extern int PixmapSize;
int CHAR_HEIGHT; int CHAR_HEIGHT;
static void load_images(m_state * state)
{
static void load_images (m_state *state) {
if (state->xgwa.depth > 1) { if (state->xgwa.depth > 1) {
@ -61,20 +58,17 @@ static void load_images (m_state *state) {
if (PixmapSize == 1) { if (PixmapSize == 1) {
CHAR_HEIGHT = 4; CHAR_HEIGHT = 4;
result = XpmCreatePixmapFromData (state->dpy, state->window, small, result = XpmCreatePixmapFromData(state->dpy, state->window, small, &state->images, 0 /* mask */ ,
&state->images, 0 /* mask */,
&xpmattrs); &xpmattrs);
} else if (PixmapSize == 2) { } else if (PixmapSize == 2) {
CHAR_HEIGHT = 6; CHAR_HEIGHT = 6;
result = XpmCreatePixmapFromData (state->dpy, state->window, medium, result = XpmCreatePixmapFromData(state->dpy, state->window, medium, &state->images, 0 /* mask */ ,
&state->images, 0 /* mask */,
&xpmattrs); &xpmattrs);
} else { } else {
CHAR_HEIGHT = 8; CHAR_HEIGHT = 8;
result = XpmCreatePixmapFromData (state->dpy, state->window, large, result = XpmCreatePixmapFromData(state->dpy, state->window, large, &state->images, 0 /* mask */ ,
&state->images, 0 /* mask */,
&xpmattrs); &xpmattrs);
} }
@ -93,18 +87,16 @@ static void load_images (m_state *state) {
state->images = XCreatePixmapFromBitmapData(state->dpy, state->window, state->images = XCreatePixmapFromBitmapData(state->dpy, state->window,
(char *)matrix_bits, (char *)matrix_bits,
state->image_width, state->image_height, state->image_width, state->image_height, back_pix, fore_pix, state->xgwa.depth);
back_pix, fore_pix, state->xgwa.depth);
} }
} }
m_state *init_matrix(Display * dpy, Window window)
m_state *init_matrix( Display *dpy, Window window ) { {
m_state *state = (m_state *) calloc(sizeof(*state), 1); m_state *state = (m_state *) calloc(sizeof(*state), 1);
state->dpy = dpy; state->dpy = dpy;
state->window = window; state->window = window;
@ -130,18 +122,18 @@ m_state *init_matrix( Display *dpy, Window window ) {
state->insert_top_p = False; state->insert_top_p = False;
state->insert_bottom_p = True; state->insert_bottom_p = True;
return state; return state;
} }
static void insert_glyph(m_state * state, int glyph, int x, int y)
static void insert_glyph (m_state *state, int glyph, int x, int y) { {
Bool bottom_feeder_p = (y >= 0); Bool bottom_feeder_p = (y >= 0);
m_cell *from, *to; m_cell *from, *to;
if (y >= state->grid_height) return; if (y >= state->grid_height)
return;
if (bottom_feeder_p) { if (bottom_feeder_p) {
@ -165,17 +157,18 @@ static void insert_glyph (m_state *state, int glyph, int x, int y) {
to->changed = True; to->changed = True;
if (!to->glyph) ; if (!to->glyph) ;
else if (bottom_feeder_p) to->glow = 1 + (random() % 2); else if (bottom_feeder_p)
else to->glow = 0; to->glow = 1 + (random() % 2);
else
to->glow = 0;
} }
static void feed_matrix(m_state * state)
static void feed_matrix (m_state *state) { {
int x; int x;
/* /*
* Update according to current feeders. * Update according to current feeders.
*/ */
@ -192,12 +185,14 @@ static void feed_matrix (m_state *state) {
int g = (random() % state->nglyphs) + 1; int g = (random() % state->nglyphs) + 1;
insert_glyph(state, g, x, f->y); insert_glyph(state, g, x, f->y);
f->remaining--; f->remaining--;
if (f->y >= 0) f->y++; /* bottom_feeder_p */ if (f->y >= 0)
f->y++; /* bottom_feeder_p */
} else { /* if pipe is empty, insert spaces */ } else { /* if pipe is empty, insert spaces */
insert_glyph(state, 0, x, f->y); insert_glyph(state, 0, x, f->y);
if (f->y >= 0) f->y++; /* bottom_feeder_p */ if (f->y >= 0)
f->y++; /* bottom_feeder_p */
} }
@ -211,29 +206,43 @@ static void feed_matrix (m_state *state) {
} }
static int densitizer (m_state *state) { static int densitizer(m_state * state)
{
/* Horrid kludge that converts percentages (density of screen coverage) /* Horrid kludge that converts percentages (density of screen coverage)
to the parameter that actually controls this. I got this mapping to the parameter that actually controls this. I got this mapping
empirically, on a 1024x768 screen. Sue me. */ empirically, on a 1024x768 screen. Sue me. */
if (state->density < 10) return 85; if (state->density < 10)
else if (state->density < 15) return 60; return 85;
else if (state->density < 20) return 45; else if (state->density < 15)
else if (state->density < 25) return 25; return 60;
else if (state->density < 30) return 20; else if (state->density < 20)
else if (state->density < 35) return 15; return 45;
else if (state->density < 45) return 10; else if (state->density < 25)
else if (state->density < 50) return 8; return 25;
else if (state->density < 55) return 7; else if (state->density < 30)
else if (state->density < 65) return 5; return 20;
else if (state->density < 80) return 3; else if (state->density < 35)
else if (state->density < 90) return 2; return 15;
else return 1; else if (state->density < 45)
return 10;
else if (state->density < 50)
return 8;
else if (state->density < 55)
return 7;
else if (state->density < 65)
return 5;
else if (state->density < 80)
return 3;
else if (state->density < 90)
return 2;
else
return 1;
} }
static void hack_matrix(m_state * state)
static void hack_matrix (m_state *state) { {
int x; int x;
@ -285,8 +294,8 @@ static void hack_matrix (m_state *state) {
} }
} }
void draw_matrix(m_state * state, int d)
void draw_matrix (m_state *state, int d) { {
int x, y; int x, y;
int count = 0; int count = 0;
@ -300,15 +309,16 @@ void draw_matrix (m_state *state, int d) {
m_cell *cell = &state->cells[state->grid_width * y + x]; m_cell *cell = &state->cells[state->grid_width * y + x];
if ( cell->glyph ) count++; if (cell->glyph)
count++;
if ( !cell->changed ) continue; if (!cell->changed)
continue;
if (cell->glyph == 0) { if (cell->glyph == 0) {
XFillRectangle(state->dpy, state->window, state->erase_gc, XFillRectangle(state->dpy, state->window, state->erase_gc,
x * state->char_width, y * state->char_height, x * state->char_width, y * state->char_height, state->char_width, state->char_height);
state->char_width, state->char_height );
} else { } else {
XCopyArea(state->dpy, state->images, state->window, state->draw_gc, XCopyArea(state->dpy, state->images, state->window, state->draw_gc,
@ -329,18 +339,14 @@ void draw_matrix (m_state *state, int d) {
} }
} }
#if 0 #if 0
{ {
static int i = 0; static int i = 0;
static int ndens = 0; static int ndens = 0;
static int tdens = 0; static int tdens = 0;
i++; i++;
if (i > 50) if (i > 50) {
{ int dens = (100.0 * (((double)count) / ((double)(state->grid_width * state->grid_height))));
int dens = (100.0 *
(((double)count) /
((double) (state->grid_width * state->grid_height))));
tdens += dens; tdens += dens;
ndens++; ndens++;
printf("density: %d%% (%d%%)\n", dens, (tdens / ndens)); printf("density: %d%% (%d%%)\n", dens, (tdens / ndens));
@ -350,4 +356,3 @@ void draw_matrix (m_state *state, int d) {
#endif #endif
} }

2
wmMatrix/matrix.h
View file

@ -6,7 +6,6 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/xpm.h> #include <X11/xpm.h>
typedef struct { typedef struct {
int glyph; int glyph;
int changed; int changed;
@ -36,4 +35,3 @@ typedef struct {
int nglyphs; int nglyphs;
} m_state; } m_state;

3
wmMatrix/version.h
View file

@ -1,2 +1 @@
static const char screensaver_id[] = static const char screensaver_id[] = "@(#)xscreensaver 3.17 (15-Jul-99), by Jamie Zawinski (jwz@jwz.org)";
"@(#)xscreensaver 3.17 (15-Jul-99), by Jamie Zawinski (jwz@jwz.org)";

51
wmMatrix/wmMatrix.c
View file

@ -38,7 +38,6 @@
* *
*/ */
/* /*
* Includes * Includes
*/ */
@ -54,21 +53,18 @@
#include "wmMatrix_mask.xbm" #include "wmMatrix_mask.xbm"
#include "matrix.h" #include "matrix.h"
/* /*
* Delay between refreshes (in microseconds) * Delay between refreshes (in microseconds)
*/ */
#define DELAY 20000UL /* 0.020000 sec */ #define DELAY 20000UL /* 0.020000 sec */
#define WMMATRIX_VERSION "0.2" #define WMMATRIX_VERSION "0.2"
void ParseCMDLine(int argc, char *argv[]); void ParseCMDLine(int argc, char *argv[]);
void ButtonPressEvent(XButtonEvent *); void ButtonPressEvent(XButtonEvent *);
void print_usage(); void print_usage();
m_state *init_matrix(Display *, Window); m_state *init_matrix(Display *, Window);
void draw_matrix(m_state *, int); void draw_matrix(m_state *, int);
int GotFirstClick1, GotDoubleClick1; int GotFirstClick1, GotDoubleClick1;
int GotFirstClick2, GotDoubleClick2; int GotFirstClick2, GotDoubleClick2;
int GotFirstClick3, GotDoubleClick3; int GotFirstClick3, GotDoubleClick3;
@ -83,15 +79,14 @@ char *RDoubleClickCmd = NULL;
char *TimeColor = "#ffff00"; char *TimeColor = "#ffff00";
char *BackgroundColor = "#181818"; char *BackgroundColor = "#181818";
/* /*
* main * main
*/ */
int main(int argc, char *argv[]) { int main(int argc, char *argv[])
{
XEvent event; XEvent event;
m_state *state; m_state *state;
/* /*
* Parse any command line arguments. * Parse any command line arguments.
*/ */
@ -117,9 +112,12 @@ int main(int argc, char *argv[]) {
/* 25 * 0.02 = .5 sec */ /* 25 * 0.02 = .5 sec */
if (DblClkDelay > 25) { if (DblClkDelay > 25) {
DblClkDelay = 0; DblClkDelay = 0;
GotFirstClick1 = 0; GotDoubleClick1 = 0; GotFirstClick1 = 0;
GotFirstClick2 = 0; GotDoubleClick2 = 0; GotDoubleClick1 = 0;
GotFirstClick3 = 0; GotDoubleClick3 = 0; GotFirstClick2 = 0;
GotDoubleClick2 = 0;
GotFirstClick3 = 0;
GotDoubleClick3 = 0;
} else { } else {
++DblClkDelay; ++DblClkDelay;
} }
@ -152,11 +150,11 @@ int main(int argc, char *argv[]) {
} }
} }
/* /*
* ParseCMDLine() * ParseCMDLine()
*/ */
void ParseCMDLine(int argc, char *argv[]) { void ParseCMDLine(int argc, char *argv[])
{
int i; int i;
PixmapSize = 2; PixmapSize = 2;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
@ -193,8 +191,8 @@ void ParseCMDLine(int argc, char *argv[]) {
} }
} }
void print_usage()
void print_usage() { {
printf("\nwmMatrix version: %s\n", WMMATRIX_VERSION); printf("\nwmMatrix version: %s\n", WMMATRIX_VERSION);
printf("\t-h\t\tDisplay help screen.\n"); printf("\t-h\t\tDisplay help screen.\n");
printf("\t-c cmd\t\tCommand executed on doubleclick.\n"); printf("\t-c cmd\t\tCommand executed on doubleclick.\n");
@ -204,7 +202,6 @@ void print_usage() {
printf("\t-lrg\t\tUse large size pixmap.\n"); printf("\t-lrg\t\tUse large size pixmap.\n");
} }
/* /*
* This routine handles button presses. * This routine handles button presses.
* *
@ -215,20 +212,26 @@ void print_usage() {
* *
* *
*/ */
void ButtonPressEvent(XButtonEvent *xev){ void ButtonPressEvent(XButtonEvent * xev)
{
DblClkDelay = 0; DblClkDelay = 0;
if ((xev->button == Button1) && (xev->type == ButtonPress)) { if ((xev->button == Button1) && (xev->type == ButtonPress)) {
if (GotFirstClick1) GotDoubleClick1 = 1; if (GotFirstClick1)
else GotFirstClick1 = 1; GotDoubleClick1 = 1;
else
GotFirstClick1 = 1;
} else if ((xev->button == Button2) && (xev->type == ButtonPress)) { } else if ((xev->button == Button2) && (xev->type == ButtonPress)) {
if (GotFirstClick2) GotDoubleClick2 = 1; if (GotFirstClick2)
else GotFirstClick2 = 1; GotDoubleClick2 = 1;
else
GotFirstClick2 = 1;
} else if ((xev->button == Button3) && (xev->type == ButtonPress)) { } else if ((xev->button == Button3) && (xev->type == ButtonPress)) {
if (GotFirstClick3) GotDoubleClick3 = 1; if (GotFirstClick3)
else GotFirstClick3 = 1; GotDoubleClick3 = 1;
else
GotFirstClick3 = 1;
} }
/* /*
* We got a double click on Mouse Button1 (i.e. the left one) * We got a double click on Mouse Button1 (i.e. the left one)
*/ */
@ -238,7 +241,6 @@ void ButtonPressEvent(XButtonEvent *xev){
system(DoubleClickCmd); system(DoubleClickCmd);
} }
/* /*
* We got a double click on Mouse Button2 (i.e. the middle one) * We got a double click on Mouse Button2 (i.e. the middle one)
*/ */
@ -247,7 +249,6 @@ void ButtonPressEvent(XButtonEvent *xev){
GotDoubleClick2 = 0; GotDoubleClick2 = 0;
} }
/* /*
* We got a double click on Mouse Button3 (i.e. the right one) * We got a double click on Mouse Button3 (i.e. the right one)
*/ */

107
wmMatrix/xutils.c
View file

@ -41,8 +41,6 @@
#include <sys/select.h> #include <sys/select.h>
#include "xutils.h" #include "xutils.h"
/* /*
* X11 Variables * X11 Variables
*/ */
@ -56,22 +54,17 @@ GC EraseGC;
XpmIcon wmgen; XpmIcon wmgen;
Pixmap pixmask; Pixmap pixmask;
/* /*
* Colors for wmCalClock * Colors for wmCalClock
*/ */
extern char TimeColor[30]; extern char TimeColor[30];
extern char BackgroundColor[30]; extern char BackgroundColor[30];
/* /*
* flush_expose * flush_expose
*/ */
static int flush_expose(Window w) { static int flush_expose(Window w)
{
XEvent dummy; XEvent dummy;
int i = 0; int i = 0;
@ -83,19 +76,12 @@ static int flush_expose(Window w) {
} }
/* /*
* RedrawWindow * RedrawWindow
* RedrawWindowXY * RedrawWindowXY
*/ */
void RedrawWindow(void) { void RedrawWindow(void)
{
flush_expose(iconwin); flush_expose(iconwin);
XCopyArea(display, wmgen.pixmap, iconwin, NormalGC, 0, 0, wmgen.attributes.width, wmgen.attributes.height, 0, 0); XCopyArea(display, wmgen.pixmap, iconwin, NormalGC, 0, 0, wmgen.attributes.width, wmgen.attributes.height, 0, 0);
@ -105,7 +91,8 @@ void RedrawWindow(void) {
} }
void RedrawWindowXY(int x, int y) { void RedrawWindowXY(int x, int y)
{
flush_expose(iconwin); flush_expose(iconwin);
XCopyArea(display, wmgen.pixmap, iconwin, NormalGC, x, y, wmgen.attributes.width, wmgen.attributes.height, 0, 0); XCopyArea(display, wmgen.pixmap, iconwin, NormalGC, x, y, wmgen.attributes.width, wmgen.attributes.height, 0, 0);
@ -115,47 +102,40 @@ void RedrawWindowXY(int x, int y) {
} }
/* /*
* copyXPMArea * copyXPMArea
* copyXBMArea * copyXBMArea
*/ */
void copyXPMArea(int x, int y, int sx, int sy, int dx, int dy) { void copyXPMArea(int x, int y, int sx, int sy, int dx, int dy)
{
XCopyArea(display, wmgen.pixmap, wmgen.pixmap, NormalGC, x, y, sx, sy, dx, dy); XCopyArea(display, wmgen.pixmap, wmgen.pixmap, NormalGC, x, y, sx, sy, dx, dy);
} }
void copyXBMArea(int x, int y, int sx, int sy, int dx, int dy) { void copyXBMArea(int x, int y, int sx, int sy, int dx, int dy)
{
XCopyArea(display, wmgen.mask, wmgen.pixmap, NormalGC, x, y, sx, sy, dx, dy); XCopyArea(display, wmgen.mask, wmgen.pixmap, NormalGC, x, y, sx, sy, dx, dy);
} }
/* /*
* initXwindow * initXwindow
*/ */
void initXwindow(int argc, char *argv[]){ void initXwindow(int argc, char *argv[])
{
int i; int i;
char *display_name = NULL; char *display_name = NULL;
for (i = 1; argv[i]; ++i) { for (i = 1; argv[i]; ++i) {
if (!strcmp(argv[i], "-display")) display_name = argv[i+1]; if (!strcmp(argv[i], "-display"))
display_name = argv[i + 1];
} }
if (!(display = XOpenDisplay(display_name))) { if (!(display = XOpenDisplay(display_name))) {
fprintf(stderr, "%s: can't open display %s\n", fprintf(stderr, "%s: can't open display %s\n", argv[0], XDisplayName(display_name));
argv[0], XDisplayName(display_name));
exit(1); exit(1);
} }
screen = DefaultScreen(display); screen = DefaultScreen(display);
Root = RootWindow(display, screen); Root = RootWindow(display, screen);
DisplayDepth = DefaultDepth(display, screen); DisplayDepth = DefaultDepth(display, screen);
@ -163,15 +143,11 @@ void initXwindow(int argc, char *argv[]){
} }
/* /*
* openXwindow * openXwindow
*/ */
void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bits, void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bits, int pixmask_width, int pixmask_height)
int pixmask_width, int pixmask_height) { {
unsigned int borderwidth = 1; unsigned int borderwidth = 1;
XClassHint classHint; XClassHint classHint;
@ -189,10 +165,8 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
{"Color6", NULL, 0}, {"Color6", NULL, 0},
{"Color7", NULL, 0}, {"Color7", NULL, 0},
{"Color8", NULL, 0}, {"Color8", NULL, 0},
{"Color9", NULL, 0}}; {"Color9", NULL, 0}
};
/* /*
* Create Pixmap * Create Pixmap
@ -212,17 +186,12 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
wmgen.attributes.colorsymbols = cols; wmgen.attributes.colorsymbols = cols;
wmgen.attributes.exactColors = False; wmgen.attributes.exactColors = False;
wmgen.attributes.closeness = 40000; wmgen.attributes.closeness = 40000;
wmgen.attributes.valuemask = XpmReturnPixels | XpmReturnExtensions | XpmColorSymbols wmgen.attributes.valuemask = XpmReturnPixels | XpmReturnExtensions | XpmColorSymbols | XpmExactColors | XpmCloseness | XpmSize;
| XpmExactColors | XpmCloseness | XpmSize; if (XpmCreatePixmapFromData(display, Root, pixmap_bytes, &(wmgen.pixmap), &(wmgen.mask), &(wmgen.attributes)) != XpmSuccess) {
if (XpmCreatePixmapFromData(display, Root, pixmap_bytes,
&(wmgen.pixmap), &(wmgen.mask), &(wmgen.attributes)) != XpmSuccess){
fprintf(stderr, "Not enough free colorcells.\n"); fprintf(stderr, "Not enough free colorcells.\n");
exit(1); exit(1);
} }
/* /*
* Create a window * Create a window
*/ */
@ -239,16 +208,12 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
mysizehints.width = 64; mysizehints.width = 64;
mysizehints.height = 64; mysizehints.height = 64;
win = XCreateSimpleWindow(display, Root, mysizehints.x, mysizehints.y, win = XCreateSimpleWindow(display, Root, mysizehints.x, mysizehints.y,
mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix); mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
iconwin = XCreateSimpleWindow(display, win, mysizehints.x, mysizehints.y, iconwin = XCreateSimpleWindow(display, win, mysizehints.x, mysizehints.y,
mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix); mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
/* /*
* Activate hints * Activate hints
*/ */
@ -257,8 +222,6 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
classHint.res_class = wname; classHint.res_class = wname;
XSetClassHint(display, win, &classHint); XSetClassHint(display, win, &classHint);
/* /*
* Set up the xevents that you want the relevent windows to inherit * Set up the xevents that you want the relevent windows to inherit
* Currently, its seems that setting KeyPress events here has no * Currently, its seems that setting KeyPress events here has no
@ -266,19 +229,15 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
* it after you are done... * it after you are done...
*/ */
XSelectInput(display, win, ButtonPressMask | ExposureMask | ButtonReleaseMask XSelectInput(display, win, ButtonPressMask | ExposureMask | ButtonReleaseMask
| PointerMotionMask | StructureNotifyMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | StructureNotifyMask | EnterWindowMask | LeaveWindowMask | KeyPressMask | KeyReleaseMask);
| KeyPressMask | KeyReleaseMask);
XSelectInput(display, iconwin, ButtonPressMask | ExposureMask | ButtonReleaseMask XSelectInput(display, iconwin, ButtonPressMask | ExposureMask | ButtonReleaseMask
| PointerMotionMask | StructureNotifyMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | StructureNotifyMask | EnterWindowMask | LeaveWindowMask | KeyPressMask | KeyReleaseMask);
| KeyPressMask | KeyReleaseMask);
if (XStringListToTextProperty(&wname, 1, &name) == 0) { if (XStringListToTextProperty(&wname, 1, &name) == 0) {
fprintf(stderr, "%s: can't allocate window name\n", wname); fprintf(stderr, "%s: can't allocate window name\n", wname);
exit(1); exit(1);
} }
XSetWMName(display, win, &name); XSetWMName(display, win, &name);
/* /*
@ -299,13 +258,10 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
gcv.graphics_exposures = 0; gcv.graphics_exposures = 0;
EraseGC = XCreateGC(display, Root, gcm, &gcv); EraseGC = XCreateGC(display, Root, gcm, &gcv);
pixmask = XCreateBitmapFromData(display, win, pixmask_bits, pixmask_width, pixmask_height); pixmask = XCreateBitmapFromData(display, win, pixmask_bits, pixmask_width, pixmask_height);
XShapeCombineMask(display, win, ShapeBounding, 0, 0, pixmask, ShapeSet); XShapeCombineMask(display, win, ShapeBounding, 0, 0, pixmask, ShapeSet);
XShapeCombineMask(display, iconwin, ShapeBounding, 0, 0, pixmask, ShapeSet); XShapeCombineMask(display, iconwin, ShapeBounding, 0, 0, pixmask, ShapeSet);
mywmhints.initial_state = WithdrawnState; mywmhints.initial_state = WithdrawnState;
mywmhints.icon_window = iconwin; mywmhints.icon_window = iconwin;
mywmhints.icon_x = mysizehints.x; mywmhints.icon_x = mysizehints.x;
@ -313,16 +269,15 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
mywmhints.window_group = win; mywmhints.window_group = win;
mywmhints.flags = StateHint | IconWindowHint | IconPositionHint | WindowGroupHint; mywmhints.flags = StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
XSetWMHints(display, win, &mywmhints); XSetWMHints(display, win, &mywmhints);
XSetCommand(display, win, argv, argc); XSetCommand(display, win, argv, argc);
XMapWindow(display, win); XMapWindow(display, win);
} }
unsigned long getColor(char *ColorName, float fac, int *red, int *grn, int *blu) { unsigned long getColor(char *ColorName, float fac, int *red, int *grn, int *blu)
{
XColor Color; XColor Color;
XWindowAttributes Attributes; XWindowAttributes Attributes;
@ -337,7 +292,6 @@ unsigned long getColor(char *ColorName, float fac, int *red, int *grn, int *blu)
Color.flags = DoRed | DoGreen | DoBlue; Color.flags = DoRed | DoGreen | DoBlue;
XAllocColor(display, Attributes.colormap, &Color); XAllocColor(display, Attributes.colormap, &Color);
*red = Color.red; *red = Color.red;
*grn = Color.green; *grn = Color.green;
*blu = Color.blue; *blu = Color.blue;
@ -345,7 +299,8 @@ unsigned long getColor(char *ColorName, float fac, int *red, int *grn, int *blu)
} }
unsigned long getBlendedColor(char *ColorName, float fac, int red, int grn, int blu) { unsigned long getBlendedColor(char *ColorName, float fac, int red, int grn, int blu)
{
XColor Color; XColor Color;
XWindowAttributes Attributes; XWindowAttributes Attributes;
@ -364,11 +319,11 @@ unsigned long getBlendedColor(char *ColorName, float fac, int red, int grn, int
} }
/* /*
* Here is a faster version of usleep using select() * Here is a faster version of usleep using select()
*/ */
void uusleep(unsigned long usecs) { void uusleep(unsigned long usecs)
{
struct timeval tv; struct timeval tv;
fd_set fds; fd_set fds;
@ -385,7 +340,8 @@ void uusleep(unsigned long usecs) {
* will be less than 1 second. This allows us to save on a div operation. * will be less than 1 second. This allows us to save on a div operation.
* *
*/ */
void short_uusleep(unsigned long usecs) { void short_uusleep(unsigned long usecs)
{
struct timeval tv; struct timeval tv;
fd_set fds; fd_set fds;
@ -396,4 +352,3 @@ void short_uusleep(unsigned long usecs) {
select(x_fd + 1, &fds, NULL, NULL, &tv); select(x_fd + 1, &fds, NULL, NULL, &tv);
} }

11
wmMatrix/xutils.h
View file

@ -1,8 +1,6 @@
#ifndef WMGENERAL_H_INCLUDED #ifndef WMGENERAL_H_INCLUDED
#define WMGENERAL_H_INCLUDED #define WMGENERAL_H_INCLUDED
/* /*
* Typedefs * Typedefs
*/ */
@ -12,9 +10,6 @@ typedef struct {
XpmAttributes attributes; XpmAttributes attributes;
} XpmIcon; } XpmIcon;
/* /*
* Global variable * Global variable
*/ */
@ -24,10 +19,6 @@ Window iconwin, win;
int screen; int screen;
int DisplayDepth; int DisplayDepth;
/* /*
* Function Prototypes * Function Prototypes
*/ */
@ -46,6 +37,4 @@ void RedrawWindow(void);
void uusleep(unsigned long); void uusleep(unsigned long);
void short_uusleep(unsigned long); void short_uusleep(unsigned long);
#endif #endif

20
wmMatrix/yarandom.c
View file

@ -42,7 +42,6 @@
Irix 6.2; Indy r5k; SGI cc version 6; gcc version 2.7.2.1. Irix 6.2; Indy r5k; SGI cc version 6; gcc version 2.7.2.1.
*/ */
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> /* for getpid() */ #include <unistd.h> /* for getpid() */
#endif #endif
@ -50,7 +49,6 @@
#include "yarandom.h" #include "yarandom.h"
/* The following 'random' numbers are taken from CRC, 18th Edition, page 622. /* The following 'random' numbers are taken from CRC, 18th Edition, page 622.
Each array element was taken from the corresponding line in the table, Each array element was taken from the corresponding line in the table,
except that a[0] was from line 100. 8s and 9s in the table were simply except that a[0] was from line 100. 8s and 9s in the table were simply
@ -73,22 +71,21 @@ static unsigned int a[VectorSize] = {
static int i1, i2; static int i1, i2;
unsigned int unsigned int ya_random(void)
ya_random (void)
{ {
register int ret = a[i1] + a[i2]; register int ret = a[i1] + a[i2];
a[i1] = ret; a[i1] = ret;
if (++i1 >= VectorSize) i1 = 0; if (++i1 >= VectorSize)
if (++i2 >= VectorSize) i2 = 0; i1 = 0;
if (++i2 >= VectorSize)
i2 = 0;
return ret; return ret;
} }
void void ya_rand_init(unsigned int seed)
ya_rand_init(unsigned int seed)
{ {
int i; int i;
if (seed == 0) if (seed == 0) {
{
struct timeval tp; struct timeval tp;
#ifdef GETTIMEOFDAY_TWO_ARGS #ifdef GETTIMEOFDAY_TWO_ARGS
struct timezone tzp; struct timezone tzp;
@ -101,8 +98,7 @@ ya_rand_init(unsigned int seed)
} }
a[0] += seed; a[0] += seed;
for (i = 1; i < VectorSize; i++) for (i = 1; i < VectorSize; i++) {
{
seed = a[i - 1] * 1001 + seed * 999; seed = a[i - 1] * 1001 + seed * 999;
a[i] += seed; a[i] += seed;
} }

1
wmMatrix/yarandom.h
View file

@ -32,7 +32,6 @@
extern unsigned int ya_random(void); extern unsigned int ya_random(void);
extern void ya_rand_init(unsigned int); extern void ya_rand_init(unsigned int);
#if defined (__GNUC__) && (__GNUC__ >= 2) #if defined (__GNUC__) && (__GNUC__ >= 2)
/* Implement frand using GCC's statement-expression extension. */ /* Implement frand using GCC's statement-expression extension. */