commit - ac487c754e009b0f3c01c2a8ad5bda2143da4a6b
commit + 7f6458b045e04b97dd06b3171ac67e9ecde32429
blob - ad9c029e7661de4d1c32ef63605f87bba1a1780e
blob + 9e51eec6e7bd52227e109f9e9916af01ee953cf6
--- src/cmd/devdraw/mac-screen.m
+++ src/cmd/devdraw/mac-screen.m
char *s;
NSArray *allDevices;
- const NSWindowStyleMask Winstyle = NSWindowStyleMaskTitled
+ NSWindowStyleMask Winstyle = NSWindowStyleMaskTitled
| NSWindowStyleMaskClosable
| NSWindowStyleMaskMiniaturizable
| NSWindowStyleMaskResizable;
+ if(label == nil || *label == '\0')
+ Winstyle &= ~NSWindowStyleMaskTitled;
+
s = winsize;
sr = [[NSScreen mainScreen] frame];
r = [[NSScreen mainScreen] visibleFrame];
blob - 3b6471b79d2eb6478a41c75bcb4c838d3554fec9
blob + d74b95e33c6c25944eaa97c747eaea47dffc85a2
--- src/cmd/draw/stats.c
+++ src/cmd/draw/stats.c
void machproc(void*);
void updateproc(void*);
+
+int
+threadmaybackground(void)
+{
+ return 1;
+}
void
threadmain(int argc, char *argv[])
blob - 386fe8d479dd70ecb8a50239407df79b99a31225
blob + 7176a8271560f0d184460486d709d84bd7f87327
--- src/cmd/sam/cmd.c
+++ src/cmd/sam/cmd.c
static char linex[]="\n";
static char wordx[]=" \t\n";
-struct cmdtab cmdtab[]={
+struct Cmdtab cmdtab[]={
/* cmdc text regexp addr defcmd defaddr count token fn */
- '\n', 0, 0, 0, 0, aDot, 0, 0, nl_cmd,
- 'a', 1, 0, 0, 0, aDot, 0, 0, a_cmd,
- 'b', 0, 0, 0, 0, aNo, 0, linex, b_cmd,
- 'B', 0, 0, 0, 0, aNo, 0, linex, b_cmd,
- 'c', 1, 0, 0, 0, aDot, 0, 0, c_cmd,
- 'd', 0, 0, 0, 0, aDot, 0, 0, d_cmd,
- 'D', 0, 0, 0, 0, aNo, 0, linex, D_cmd,
- 'e', 0, 0, 0, 0, aNo, 0, wordx, e_cmd,
- 'f', 0, 0, 0, 0, aNo, 0, wordx, f_cmd,
- 'g', 0, 1, 0, 'p', aDot, 0, 0, g_cmd,
- 'i', 1, 0, 0, 0, aDot, 0, 0, i_cmd,
- 'k', 0, 0, 0, 0, aDot, 0, 0, k_cmd,
- 'm', 0, 0, 1, 0, aDot, 0, 0, m_cmd,
- 'n', 0, 0, 0, 0, aNo, 0, 0, n_cmd,
- 'p', 0, 0, 0, 0, aDot, 0, 0, p_cmd,
- 'q', 0, 0, 0, 0, aNo, 0, 0, q_cmd,
- 'r', 0, 0, 0, 0, aDot, 0, wordx, e_cmd,
- 's', 0, 1, 0, 0, aDot, 1, 0, s_cmd,
- 't', 0, 0, 1, 0, aDot, 0, 0, m_cmd,
- 'u', 0, 0, 0, 0, aNo, 2, 0, u_cmd,
- 'v', 0, 1, 0, 'p', aDot, 0, 0, g_cmd,
- 'w', 0, 0, 0, 0, aAll, 0, wordx, w_cmd,
- 'x', 0, 1, 0, 'p', aDot, 0, 0, x_cmd,
- 'y', 0, 1, 0, 'p', aDot, 0, 0, x_cmd,
- 'X', 0, 1, 0, 'f', aNo, 0, 0, X_cmd,
- 'Y', 0, 1, 0, 'f', aNo, 0, 0, X_cmd,
- '!', 0, 0, 0, 0, aNo, 0, linex, plan9_cmd,
- '>', 0, 0, 0, 0, aDot, 0, linex, plan9_cmd,
- '<', 0, 0, 0, 0, aDot, 0, linex, plan9_cmd,
- '|', 0, 0, 0, 0, aDot, 0, linex, plan9_cmd,
- '=', 0, 0, 0, 0, aDot, 0, linex, eq_cmd,
- 'c'|0x100,0, 0, 0, 0, aNo, 0, wordx, cd_cmd,
- 0, 0, 0, 0, 0, 0, 0, 0
+ {'\n', 0, 0, 0, 0, aDot, 0, 0, nl_cmd},
+ {'a', 1, 0, 0, 0, aDot, 0, 0, a_cmd},
+ {'b', 0, 0, 0, 0, aNo, 0, linex, b_cmd},
+ {'B', 0, 0, 0, 0, aNo, 0, linex, b_cmd},
+ {'c', 1, 0, 0, 0, aDot, 0, 0, c_cmd},
+ {'d', 0, 0, 0, 0, aDot, 0, 0, d_cmd},
+ {'D', 0, 0, 0, 0, aNo, 0, linex, D_cmd},
+ {'e', 0, 0, 0, 0, aNo, 0, wordx, e_cmd},
+ {'f', 0, 0, 0, 0, aNo, 0, wordx, f_cmd},
+ {'g', 0, 1, 0, 'p', aDot, 0, 0, g_cmd},
+ {'i', 1, 0, 0, 0, aDot, 0, 0, i_cmd},
+ {'k', 0, 0, 0, 0, aDot, 0, 0, k_cmd},
+ {'m', 0, 0, 1, 0, aDot, 0, 0, m_cmd},
+ {'n', 0, 0, 0, 0, aNo, 0, 0, n_cmd},
+ {'p', 0, 0, 0, 0, aDot, 0, 0, p_cmd},
+ {'q', 0, 0, 0, 0, aNo, 0, 0, q_cmd},
+ {'r', 0, 0, 0, 0, aDot, 0, wordx, e_cmd},
+ {'s', 0, 1, 0, 0, aDot, 1, 0, s_cmd},
+ {'t', 0, 0, 1, 0, aDot, 0, 0, m_cmd},
+ {'u', 0, 0, 0, 0, aNo, 2, 0, u_cmd},
+ {'v', 0, 1, 0, 'p', aDot, 0, 0, g_cmd},
+ {'w', 0, 0, 0, 0, aAll, 0, wordx, w_cmd},
+ {'x', 0, 1, 0, 'p', aDot, 0, 0, x_cmd},
+ {'y', 0, 1, 0, 'p', aDot, 0, 0, x_cmd},
+ {'X', 0, 1, 0, 'f', aNo, 0, 0, X_cmd},
+ {'Y', 0, 1, 0, 'f', aNo, 0, 0, X_cmd},
+ {'!', 0, 0, 0, 0, aNo, 0, linex, plan9_cmd},
+ {'>', 0, 0, 0, 0, aDot, 0, linex, plan9_cmd},
+ {'<', 0, 0, 0, 0, aDot, 0, linex, plan9_cmd},
+ {'|', 0, 0, 0, 0, aDot, 0, linex, plan9_cmd},
+ {'=', 0, 0, 0, 0, aDot, 0, linex, eq_cmd},
+ {'c'|0x100,0, 0, 0, 0, aNo, 0, wordx, cd_cmd},
+ {0, 0, 0, 0, 0, 0, 0, 0},
};
Cmd *parsecmd(int);
Addr *compoundaddr(void);
parsecmd(int nest)
{
int i, c;
- struct cmdtab *ct;
+ Cmdtab *ct;
Cmd *cp, *ncp;
Cmd cmd;
blob - d5fabf14ef8156a1aac0c1a64bcf2e04d55e63ca
blob + dd837a48cbe6cf437cf43da95e16e231a2050cc5
--- src/cmd/sam/parse.h
+++ src/cmd/sam/parse.h
#define ctext g.text
#define caddr g.addr
-extern struct cmdtab{
+typedef struct Cmdtab Cmdtab;
+struct Cmdtab {
ushort cmdc; /* command character */
uchar text; /* takes a textual argument? */
uchar regexp; /* takes a regular expression? */
uchar count; /* takes a count e.g. s2/// */
char *token; /* takes text terminated by one of these */
int (*fn)(File*, Cmd*); /* function to call with parse tree */
-}cmdtab[];
+};
+extern Cmdtab cmdtab[];
enum Defaddr{ /* default addresses */
aNo,
blob - aae39b4a44041ef8be8cd01728f55679af02ea23
blob + 6e018156f7942bda08e92093a08e7c7048251c7f
--- src/cmd/sam/sam.h
+++ src/cmd/sam/sam.h
typedef struct Block Block;
typedef struct Buffer Buffer;
typedef struct Disk Disk;
-typedef struct Discdesc Discdesc;
typedef struct File File;
typedef struct List List;
typedef struct Range Range;
int whichmenu(File*);
void writef(File*);
Posn writeio(File*);
-Discdesc *Dstart(void);
extern Rune samname[]; /* compiler dependent */
extern Rune *left[];