Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
st.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace alignment tabs with spaces.
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
ee8dc94
..
f883ac1
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-11,6
+11,7
@@
#include <stdlib.h>
#include <string.h>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include <signal.h>
+#include <stdint.h>
#include <sys/ioctl.h>
#include <sys/select.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/select.h>
#include <sys/stat.h>
@@
-180,8
+181,8
@@
typedef unsigned short ushort;
typedef struct {
char c[UTF_SIZ]; /* character code */
ushort mode; /* attribute flags */
typedef struct {
char c[UTF_SIZ]; /* character code */
ushort mode; /* attribute flags */
- ulong fg; /* foreground */
- ulong bg; /* background */
+ uint32_t fg; /* foreground */
+ uint32_t bg; /* background */
} Glyph;
typedef Glyph *Line;
} Glyph;
typedef Glyph *Line;
@@
-239,7
+240,7
@@
typedef struct {
Colourmap cmap;
Window win;
Drawable buf;
Colourmap cmap;
Window win;
Drawable buf;
- Atom xembed, wmdeletewin, netwmname;
+ Atom xembed, wmdeletewin, netwmname, netwmpid;
XIM xim;
XIC xic;
Draw draw;
XIM xim;
XIC xic;
Draw draw;
@@
-379,7
+380,7
@@
static void tsetdirtattr(int);
static void tsetmode(bool, bool, int *, int);
static void tfulldirt(void);
static void techo(char *, int);
static void tsetmode(bool, bool, int *, int);
static void tfulldirt(void);
static void techo(char *, int);
-static long tdefcolor(int *, int *, int);
+static int32_t tdefcolor(int *, int *, int);
static void tselcs(void);
static void tdeftran(char);
static inline bool match(uint, uint);
static void tselcs(void);
static void tdeftran(char);
static inline bool match(uint, uint);
@@
-1666,9
+1667,9
@@
tdeleteline(int n) {
tscrollup(term.c.y, n);
}
tscrollup(term.c.y, n);
}
-long
+int32_t
tdefcolor(int *attr, int *npar, int l) {
tdefcolor(int *attr, int *npar, int l) {
- long idx = -1;
+ int32_t idx = -1;
uint r, g, b;
switch (attr[*npar + 1]) {
uint r, g, b;
switch (attr[*npar + 1]) {
@@
-1717,7
+1718,7
@@
tdefcolor(int *attr, int *npar, int l) {
void
tsetattr(int *attr, int l) {
int i;
void
tsetattr(int *attr, int l) {
int i;
- long idx;
+ int32_t idx;
for(i = 0; i < l; i++) {
switch(attr[i]) {
for(i = 0; i < l; i++) {
switch(attr[i]) {
@@
-2932,6
+2933,7
@@
xinit(void) {
Cursor cursor;
Window parent;
int sw, sh;
Cursor cursor;
Window parent;
int sw, sh;
+ pid_t thispid = getpid();
if(!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
if(!(xw.dpy = XOpenDisplay(NULL)))
die("Can't open display\n");
@@
-3026,6
+3028,10
@@
xinit(void) {
xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);
XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);
XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
+ xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
+ XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
+ PropModeReplace, (unsigned char *)&thispid, 1);
+
xresettitle();
XMapWindow(xw.dpy, xw.win);
xhints();
xresettitle();
XMapWindow(xw.dpy, xw.win);
xhints();