1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
diff -Naur aterm-0.4.2/src/main.c aterm-0.4.2-spock/src/main.c
--- aterm-0.4.2/src/main.c 2005-01-18 14:40:55.000000000 +0100
+++ aterm-0.4.2-spock/src/main.c 2005-01-18 14:42:35.000000000 +0100
@@ -838,7 +838,7 @@
Resize_menuBar(x, 0, width, y);
}
}
- XMoveResizeWindow(Xdisplay, TermWin.vt, x, y, width, height + 1);
+ XMoveResizeWindow(Xdisplay, TermWin.vt, x, y, width, (height < 0xffff) ? height + 1 : height);
if (old_width)
Gr_Resize(old_width, old_height);
@@ -1634,6 +1634,7 @@
rs_minBufferWidth = NULL;
rs_saveLines = NULL; /* scrollback buffer [lines] */
rs_borderWidth = NULL;
+ rs_internal_border = NULL;
rs_modifier = NULL; /* modifier */
#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
/* recognized when combined with HOTKEY */
@@ -1771,6 +1772,12 @@
else
TermWin.borderWidth = t;
+ if (!rs_internal_border|| (t = atoi(rs_internal_border)) < 0)
+ TermWin_internalBorder = 2;
+ else
+ TermWin_internalBorder = t;
+ TermWin_internalBorders = 2 * TermWin_internalBorder;
+
/* no point having a scrollbar without having any scrollback! */
if (!TermWin.saveLines)
Options &= ~Opt_scrollBar;
diff -Naur aterm-0.4.2/src/rxvt.h aterm-0.4.2-spock/src/rxvt.h
--- aterm-0.4.2/src/rxvt.h 2005-01-18 14:40:55.000000000 +0100
+++ aterm-0.4.2-spock/src/rxvt.h 2005-01-18 14:41:50.000000000 +0100
@@ -603,10 +603,6 @@
#define scrollBar_esc 30
#define menuBar_margin 2 /* margin below text */
-/* gap between text and window edges (could be configurable) */
-#define TermWin_internalBorder 2
-#define TermWin_internalBorders 4 /* must be two times of value above */
-
/* width of scrollBar, menuBar shadow, must be 1 or 2 */
#ifdef HALFSHADOW
# define SHADOW 1
@@ -944,6 +940,12 @@
extern Window ParentWin[PARENTS_NUM];
extern int ParentWinNum;
+/* gap between text and window edges (could be configurable) */
+EXTERN int TermWin_internalBorder;
+/* must be two times of value above */
+EXTERN int TermWin_internalBorders;
+
+
EXTERN scrollBar_t scrollBar;
EXTERN menuBar_t menuBar;
EXTERN Display *Xdisplay;
@@ -968,6 +970,7 @@
EXTERN const char *rs_minBufferWidth; /* minimum buffer width - so we can scroll horizontally */
EXTERN const char *rs_saveLines; /* scrollback buffer [lines] */
EXTERN const char *rs_borderWidth; /* border width [pixels] */
+EXTERN const char *rs_internal_border; /* internal border width [pixels] */
EXTERN const char *rs_cutchars; /* chars for selection boundaries */
#ifdef META8_OPTION
EXTERN const char *rs_modifier;
diff -Naur aterm-0.4.2/src/xdefaults.c aterm-0.4.2-spock/src/xdefaults.c
--- aterm-0.4.2/src/xdefaults.c 2005-01-18 14:40:28.000000000 +0100
+++ aterm-0.4.2-spock/src/xdefaults.c 2005-01-18 14:41:50.000000000 +0100
@@ -302,6 +302,8 @@
"pointer color"),
STRG(rs_borderWidth, "borderWidth", "bw", "number",
"width of border"),
+ STRG(rs_internal_border, "internalBorder", "ib", "number",
+ "width of the internal border"),
STRG(rs_color[Color_border], "borderColor", "bd", "color",
"border color"),
BOOL(rs_borderLess, "borderLess", "bl", Opt_borderLess, "no decoration"),
|
GitWeb