cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
aad559a670
openbsd-ports/net/wmwave/patches/patch-wmwave_wmwave_c
jcs ab48dc8a93 fix bug that can cause x to crash, bump pkgname to wmwave-0.4p1 
from Chris Kuethe <ckuethe at ualberta.ca>

remove me as maintainer
2004-04-23 20:29:20 +00:00

545 lines
11 KiB
Plaintext
Raw Blame History

$OpenBSD: patch-wmwave_wmwave_c,v 1.3 2004/04/23 20:29:20 jcs Exp $
--- wmwave.c.orig 1999-08-20 06:44:21.000000000 -0700
+++ wmwave.c 2004-04-22 13:22:47.000000000 -0700
@@ -32,7 +32,6 @@
*
*/
-
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
@@ -44,6 +43,7 @@
#include <math.h>
#include <limits.h>
#include <errno.h>
+#include <err.h>
#include <signal.h>
#include <sys/wait.h>
@@ -57,6 +57,11 @@
#include <X11/xpm.h>
#include <X11/extensions/shape.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
+#include <dev/ic/if_wi_ieee.h>
#include "wmgeneral.h"
@@ -67,6 +72,9 @@ int wmwave_mask_width = 64;
int wmwave_mask_height = 64;
#define WMWAVE_VERSION "0.4"
+#define WI_WORDS 0x03
+
+#define WI_INTERFACE "wi0"
int update_rate=100000;
@@ -75,8 +83,8 @@ char *ProgName;
time_t curtime;
time_t prevtime;
-int mode = 0; // default: no card detected
-int screen = 0; // default: Quality screen is displayed
+int mode = 0; // default: no card detected
+int screen = 0; // default: Quality screen is displayed
void usage(void);
void printversion(void);
@@ -86,272 +94,270 @@ void wmwave_routine(int, char **);
void DrawBar(float percent, int dx, int dy);
void DrawGreenBar(float percent, int dx, int dy);
+static void wi_getval __P((struct wi_req *));
+
inline void DrawBar(float percent, int dx, int dy) {
- int tx;
-
- tx = (float)((float)54 * ((float)percent / (float)100.0));
- copyXPMArea(67, 36, tx, 4, dx, dy);
- copyXPMArea(67, 43, 54-tx, 4, dx+tx, dy);
-}
+ int tx;
+ percent = abs(percent);
+ tx = (float)((float)54 * ((float)percent / (float)100.0));
+ copyXPMArea(67, 36, tx, 4, dx, dy);
+ copyXPMArea(67, 43, 54-tx, 4, dx+tx, dy);
+}
inline void DrawGreenBar(float percent, int dx, int dy) {
- int tx;
-
- tx = (float)((float)54 * ((float)percent / (float)100.0));
- copyXPMArea(67, 58, tx, 4, dx, dy);
- copyXPMArea(67, 43, 54-tx, 4, dx+tx, dy);
+ int tx;
+
+ percent = abs(percent);
+ tx = (float)((float)54 * ((float)percent / (float)100.0));
+ copyXPMArea(67, 58, tx, 4, dx, dy);
+ copyXPMArea(67, 43, 54-tx, 4, dx+tx, dy);
}
inline void DrawRedDot() {
- copyXPMArea(80, 65, 6, 6, 52, 5);
+ copyXPMArea(80, 65, 6, 6, 52, 5);
}
inline void DrawYellowDot() {
- copyXPMArea(86, 65, 6, 6, 52, 5);
+ copyXPMArea(86, 65, 6, 6, 52, 5);
}
inline void DrawGreenDot() {
- copyXPMArea(92, 65, 6, 6, 52, 5);
+ copyXPMArea(92, 65, 6, 6, 52, 5);
}
inline void DrawEmptyDot() {
- copyXPMArea(98, 65, 6, 6, 52, 5);
+ copyXPMArea(98, 65, 6, 6, 52, 5);
}
float min (float x, float y) {
- if (x < y) {return x;}
- else {return y;}
+ if (x < y) {
+ return x;
+ } else {
+ return y;
+ }
}
-/*
- * Find CPU times for all processes
- */
void DisplayWireless(void) {
- FILE *wireless; // File handle for /proc/net/wireless
-
- char line[255];
- char iface[5];
- char status [3];
- float link = 0;
- float level = 0;
- float noise = 0;
- int nwid = 0;
- int crypt = 0;
- int misc = 0;
-
- if ((wireless = fopen ("/proc/net/wireless", "r")) != NULL)
- {
- fgets(line,sizeof(line),wireless);
- fgets(line,sizeof(line),wireless);
- if (fgets(line,sizeof(line),wireless) == NULL) {
- mode = 0;
- }
- else {
- sscanf(line,"%s %s %f %f %f %d %d %d",
- iface,status,&link,&level,&noise,&nwid,&crypt,&misc);
- mode = 1;
- }
- fclose(wireless);
-
-
- /* Print channel information, and signal ratio */
-
- switch (mode) {
- case 1: BlitString("Quality",4,4);
- if (link<=10) {DrawRedDot ();}
- else if (link<=20) {DrawYellowDot ();}
- else {DrawGreenDot();};
- BlitString("Link ", 4,18);
- DrawBar(min ((int)(link * 1.8), 100.0), 4, 27);
- BlitString("Level ", 4,32);
- DrawGreenBar(min ((int)(level * 0.3), 100.0), 4, 41);
- BlitString("Noise ", 4,46);
- DrawGreenBar(min ((int)(noise * 0.3), 100.0), 4, 55);
- break;
- case 0: BlitString("NO CARD",4,4);
- DrawEmptyDot();
- BlitString(" ", 4,18);
- DrawBar(0.0, 4, 27);
- BlitString(" ", 4,32);
- DrawGreenBar(0.0, 4, 41);
- BlitString(" ", 4,46);
- DrawGreenBar(0.0, 4, 55);
- break;
- };
- }
- else {
- printf ("Wirless device /proc/net/wireless not found\nEnable radio networking and recompile your kernel\n");
- exit (0);
- }
+ float link = 0;
+ float level = 0;
+ float noise = 0;
+ struct wi_req wreq;
+
+ bzero((char *)&wreq, sizeof(wreq));
+
+ wreq.wi_len = WI_MAX_DATALEN;
+ wreq.wi_type = WI_RID_COMMS_QUALITY;
+
+ wi_getval(&wreq);
+
+ link = wreq.wi_val[0];
+ level = wreq.wi_val[1];
+ noise = wreq.wi_val[2];
+
+ switch (mode) {
+ case 1:
+ BlitString("Quality",4,4);
+ if (link <= 10) {
+ DrawRedDot();
+ } else if (link <= 40) {
+ DrawYellowDot();
+ } else {
+ DrawGreenDot();
+ }
+ BlitString("Link ", 4, 18);
+ DrawBar(min (link, 100.0), 4, 27);
+ BlitString("Level ", 4, 32);
+ if (level == 0)
+ DrawGreenBar(min ((level), 100.0), 4, 41);
+ else
+ DrawGreenBar(min ((level - 27), 100.0), 4, 41);
+ BlitString("Noise ", 4, 46);
+ DrawGreenBar(min ((noise - 27), 100.0), 4, 55);
+ break;
+ case 0:
+ BlitString("NO CARD", 4, 4);
+ DrawEmptyDot();
+ BlitString(" ", 4, 18);
+ DrawBar(0.0, 4, 27);
+ BlitString(" ", 4, 32);
+ DrawGreenBar(0.0, 4, 41);
+ BlitString(" ", 4, 46);
+ DrawGreenBar(0.0, 4, 55);
+ break;
+ }
}
/* SIGCHLD handler */
void sig_chld(int signo)
{
- waitpid((pid_t) -1, NULL, WNOHANG);
- signal(SIGCHLD, sig_chld);
+ waitpid((pid_t) -1, NULL, WNOHANG);
+ signal(SIGCHLD, sig_chld);
}
int main(int argc, char *argv[]) {
- int i;
-
- /* Parse Command Line */
-
- signal(SIGCHLD, sig_chld);
- ProgName = argv[0];
- if (strlen(ProgName) >= 5)
- ProgName += (strlen(ProgName) - 5);
-
- for (i=1; i<argc; i++) {
- char *arg = argv[i];
-
- if (*arg=='-') {
- switch (arg[1]) {
- case 'd' :
- if (strcmp(arg+1, "display")) {
- usage();
- exit(1);
- }
- break;
- case 'g' :
- if (strcmp(arg+1, "geometry")) {
- usage();
- exit(1);
- }
- break;
- case 'v' :
- printversion();
- exit(0);
- break;
- case 'r':
- if (argc > (i+1)) {
- update_rate = (atoi(argv[i+1]) * 1000);
- i++;
+ int i;
+
+ /* Parse Command Line */
+ signal(SIGCHLD, sig_chld);
+ ProgName = argv[0];
+ if (strlen(ProgName) >= 5)
+ ProgName += (strlen(ProgName) - 5);
+
+ for (i=1; i<argc; i++) {
+ char *arg = argv[i];
+
+ if (*arg == '-') {
+ switch (arg[1]) {
+ case 'd':
+ if (strcmp(arg + 1, "display")) {
+ usage();
+ exit(1);
+ }
+ break;
+ case 'g':
+ if (strcmp(arg + 1, "geometry")) {
+ usage();
+ exit(1);
+ }
+ break;
+ case 'v':
+ printversion();
+ exit(0);
+ break;
+ case 'r':
+ if (argc > (i + 1)) {
+ update_rate = (atoi(argv[i + 1]) * 1000);
+ i++;
+ }
+ break;
+ default:
+ usage();
+ exit(0);
+ break;
+ }
+ }
}
- break;
- default:
- usage();
- exit(0);
- break;
- }
- }
- }
-
- wmwave_routine(argc, argv);
-
- return 0;
+
+ wmwave_routine(argc, argv);
+
+ return 0;
}
-/*
- * Main loop
- */
+/* Main loop */
void wmwave_routine(int argc, char **argv) {
- XEvent Event;
- struct timeval tv={0,0};
- struct timeval last={0,0};
-
- createXBMfromXPM(wmwave_mask_bits, wmwave_master_xpm, wmwave_mask_width, wmwave_mask_height);
-
- openXwindow(argc, argv, wmwave_master_xpm, wmwave_mask_bits, wmwave_mask_width, wmwave_mask_height);
-
- RedrawWindow();
-
-
- while (1) {
-
- curtime = time(0);
-
- if (1) {
- memcpy(&last, &tv, sizeof(tv));
-
- /*
- * Update display
- */
- DisplayWireless();
-
- RedrawWindow();
- }
-
- /*
- * X Events
- */
- while (XPending(display)) {
- XNextEvent(display, &Event);
- switch (Event.type) {
- case Expose:
+ XEvent Event;
+ struct timeval tv={0,0};
+ struct timeval last={0,0};
+
+ createXBMfromXPM(wmwave_mask_bits, wmwave_master_xpm, wmwave_mask_width, wmwave_mask_height);
+
+ openXwindow(argc, argv, wmwave_master_xpm, wmwave_mask_bits, wmwave_mask_width, wmwave_mask_height);
+
RedrawWindow();
- break;
- case DestroyNotify:
- XCloseDisplay(display);
- exit(0);
- case ButtonPress:
- switch (screen) {
- case 0: screen=1; break;
- case 1: screen=0; break;
- };
- break;
- }
- }
-
- usleep(update_rate);
- }
+
+ while (1) {
+ curtime = time(0);
+ memcpy(&last, &tv, sizeof(tv));
+
+ /* Update display */
+ DisplayWireless();
+ RedrawWindow();
+
+ /* X Events */
+ while (XPending(display)) {
+ XNextEvent(display, &Event);
+ switch (Event.type) {
+ case Expose:
+ RedrawWindow();
+ break;
+ case DestroyNotify:
+ XCloseDisplay(display);
+ exit(0);
+ case ButtonPress:
+ switch (screen) {
+ case 0: screen=1; break;
+ case 1: screen=0; break;
+ }
+ break;
+ }
+ }
+ usleep(update_rate);
+ }
}
-/*
- * Blits a string at given co-ordinates
- */
+/* Blits a string at given co-ordinates */
void BlitString(char *name, int x, int y) {
- int i;
- int c;
- int k;
-
- k = x;
- for (i=0; name[i]; i++)
- {
-
- c = toupper(name[i]);
- if (c >= 'A' && c <= 'Z')
- { // its a letter
- c -= 'A';
- copyXPMArea(c * 6, 74, 6, 8, k, y);
- k += 6;
- } else
- if (c>='0' && c<='9') { // its a number or symbol
- c -= '0';
- copyXPMArea(c * 6, 64, 6, 8, k, y);
- k += 6;
- } else {
- copyXPMArea(5, 84, 6, 8, k, y);
- k += 6;
-
- }
- }
+ int i;
+ int c;
+ int k;
+
+ k = x;
+ for (i=0; name[i]; i++) {
+ c = toupper(name[i]);
+ if (c >= 'A' && c <= 'Z') {
+ // its a letter
+ c -= 'A';
+ copyXPMArea(c * 6, 74, 6, 8, k, y);
+ k += 6;
+ } else if (c >= '0' && c <= '9') {
+ // its a number or symbol
+ c -= '0';
+ copyXPMArea(c * 6, 64, 6, 8, k, y);
+ k += 6;
+ } else {
+ copyXPMArea(5, 84, 6, 8, k, y);
+ k += 6;
+ }
+ }
}
void BlitNum(int num, int x, int y) {
- char buf[1024];
- int newx=x;
-
- sprintf(buf, "%03i", num);
-
- BlitString(buf, newx, y);
+ char buf[1024];
+ int newx = x;
+
+ sprintf(buf, "%03i", num);
+
+ BlitString(buf, newx, y);
}
-/*
- * Usage
- */
+/* Usage */
void usage(void) {
- fprintf(stderr, "\nWmwave - Carsten Schuermann <carsten@schuermann.org> http://www.schuermann.org/~dockapps\n\n");
- fprintf(stderr, "usage:\n");
- fprintf(stderr, " -display <display name>\n");
- fprintf(stderr, " -r update rate in milliseconds (default:100)\n");
- fprintf(stderr, "\n");
+ fprintf(stderr, "\nWmwave - Carsten Schuermann <carsten@schuermann.org>\n");
+ fprintf(stderr, " http://www.schuermann.org/~dockapps\n\n");
+ fprintf(stderr, "usage:\n");
+ fprintf(stderr, " -display <display name>\n");
+ fprintf(stderr, " -r update rate in milliseconds (default:100)\n");
+ fprintf(stderr, "\n");
}
-/*
- * printversion
- */
+/* printversion */
void printversion(void) {
- fprintf(stderr, "wmwave v%s\n", WMWAVE_VERSION);
+ fprintf(stderr, "wmwave v%s\n", WMWAVE_VERSION);
+}
+
+static void wi_getval(wreq)
+ struct wi_req *wreq;
+{
+ struct ifreq ifr;
+ int s;
+
+ bzero((char *)&ifr, sizeof(ifr));
+
+ strcpy(ifr.ifr_name, WI_INTERFACE);
+ ifr.ifr_data = (caddr_t)wreq;
+
+ s = socket(AF_INET, SOCK_DGRAM, 0);
+
+ if (s == -1)
+ err(1, "socket");
+
+ if (ioctl(s, SIOCGWAVELAN, &ifr) == -1) {
+ mode = 0;
+ } else {
+ mode = 1;
+ }
+
+ close(s);
+ return;
}
Reference in New Issue View Git Blame Copy Permalink