old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tue Dec 21 13:19:06 PST 1999 Michael Jennings <mej@eterm.org> 

Fixed the geometry handling again.  Also fixed the parsing of geometry
	strings like '-0+0'.


SVN revision: 1724
This commit is contained in:
Michael Jennings 1999-12-21 13:20:32 +00:00
parent d9251f002d
commit d4edaa77fc
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -2940,3 +2940,9 @@ Mon Dec 20 19:38:40 PST 1999 Michael Jennings <mej@eterm.org>
I'll make it the default in the themes.
-------------------------------------------------------------------------------
Tue Dec 21 13:19:06 PST 1999 Michael Jennings <mej@eterm.org>
Fixed the geometry handling again. Also fixed the parsing of geometry
strings like '-0+0'.
-------------------------------------------------------------------------------

4
src/options.c
View File

@ -943,7 +943,7 @@ get_options(int argc, char *argv[])
hasequal = 1;
} else {
if (argv[i + 1]) {
if (*argv[i + 1] != '-' || StrCaseStr(optList[j].long_opt, "font")) {
if (*argv[i + 1] != '-' || StrCaseStr(optList[j].long_opt, "font") || StrCaseStr(optList[j].long_opt, "geometry")) {
val_ptr = argv[++i];
}
}
@ -1060,7 +1060,7 @@ get_options(int argc, char *argv[])
if (j == 0 || j == 1) {
continue;
}
if ((val_ptr == NULL) || ((*val_ptr == '-') && (optList[j].short_opt != 'F'))) {
if ((val_ptr == NULL) || ((*val_ptr == '-') && (optList[j].short_opt != 'F') && (optList[j].short_opt != 'g'))) {
print_error("option -%c requires a%s value", opt[pos],
(optList[j].flag & OPT_INTEGER ? "n integer" : " string"));
CHECK_BAD();

12
src/windows.c
View File

@ -338,11 +338,7 @@ Create_Windows(int argc, char *argv[])
if (flags & XValue) {
if (flags & XNegative) {
if (check_for_enlightenment()) {
x += (DisplayWidth(Xdisplay, Xscreen));
} else {
x += (DisplayWidth(Xdisplay, Xscreen) - (szHint.width + TermWin.internalBorder));
}
x += (DisplayWidth(Xdisplay, Xscreen) - (szHint.width + TermWin.internalBorder));
szHint.win_gravity = NorthEastGravity;
}
szHint.x = x;
@ -350,11 +346,7 @@ Create_Windows(int argc, char *argv[])
}
if (flags & YValue) {
if (flags & YNegative) {
if (check_for_enlightenment()) {
y += (DisplayHeight(Xdisplay, Xscreen) - (2 * TermWin.internalBorder));
} else {
y += (DisplayHeight(Xdisplay, Xscreen) - (szHint.height + TermWin.internalBorder));
}
y += (DisplayHeight(Xdisplay, Xscreen) - (szHint.height + TermWin.internalBorder));
szHint.win_gravity = (szHint.win_gravity == NorthEastGravity ?
SouthEastGravity : SouthWestGravity);
}