| bb4e0973 |
1 | --- dosemu-1.0.2/etc/global.conf Tue May 14 15:25:38 2002 |
| 2 | +++ dosemu-1.0.2/etc/global.conf.new Tue May 14 17:13:19 2002 |
| 3 | @@ -232,33 +232,53 @@ |
| 4 | # we have GNU sh-utils < 2.0 |
| 5 | $xxx = shell("who am i") |
| 6 | endif |
| 7 | - if ( ($DOSEMU_STDIN_IS_CONSOLE eq "1") |
| 8 | - || ( strlen($xxx) && (strchr($xxx, "(" ) < 0 ))) |
| 9 | - $BEING_ON = "console" |
| 10 | + |
| 11 | + if ($DISPLAY ne "") |
| 12 | + if (strchr($DOSEMU_OPTIONS,"X") >= 0) |
| 13 | + $USING_X = (1) |
| 14 | + $BEING_ON = "" |
| 15 | + else |
| 16 | + $BEING_ON = $BEING_ON, "_xterm" |
| 17 | + endif |
| 18 | else |
| 19 | - if (strstr($xxx, "(:") < 0) |
| 20 | - $BEING_ON = "remote" |
| 21 | - $REMOTE_HOST = strsplit($xxx, strchr($xxx,"(")+1,99) |
| 22 | - $REMOTE_HOST = strdel($REMOTE_HOST, strchr($REMOTE_HOST,")"),99) |
| 23 | - else |
| 24 | - $BEING_ON = "" |
| 25 | - endif |
| 26 | - if ( (strchr($DOSEMU_OPTIONS,"X") >=0) && ($DISPLAY ne "") ) |
| 27 | - $USING_X = (1) |
| 28 | - endif |
| 29 | - if (strstr("xterm dtterm", $TERM) >= 0) |
| 30 | - $BEING_ON = $BEING_ON, "_xterm" |
| 31 | - else |
| 32 | - if (strstr("linux console", $TERM) < 0) |
| 33 | - # remote side must be some type of real terminal |
| 34 | - $BEING_ON = $BEING_ON, "_terminal" |
| 35 | - else |
| 36 | - # remote side is a Linux console |
| 37 | - $BEING_ON = $BEING_ON, "_console" |
| 38 | - endif |
| 39 | - endif |
| 40 | + if ($DOSEMU_STDIN_IS_CONSOLE eq "1") |
| 41 | + $BEING_ON = "console" |
| 42 | + else |
| 43 | + if (strstr("linux console", $TERM) < 0) |
| 44 | + $BEING_ON = $BEING_ON, "_terminal" |
| 45 | + else |
| 46 | + $BEIGN_ON = $BEIGN_ON, "_console" |
| 47 | + endif |
| 48 | + endif |
| 49 | endif |
| 50 | |
| 51 | +# if ( ($DOSEMU_STDIN_IS_CONSOLE eq "1") |
| 52 | +# || ( strlen($xxx) && (strchr($xxx, "(" ) < 0 ))) |
| 53 | +# $BEING_ON = "console" |
| 54 | +# else |
| 55 | +# if (strstr($xxx, "(:") < 0) |
| 56 | +# $BEING_ON = "remote" |
| 57 | +# $REMOTE_HOST = strsplit($xxx, strchr($xxx,"(")+1,99) |
| 58 | +# $REMOTE_HOST = strdel($REMOTE_HOST, strchr($REMOTE_HOST,")"),99) |
| 59 | +# else |
| 60 | +# $BEING_ON = "" |
| 61 | +# endif |
| 62 | +# if ( (strchr($DOSEMU_OPTIONS,"X") >=0) && ($DISPLAY ne "") ) |
| 63 | +# $USING_X = (1) |
| 64 | +# endif |
| 65 | +# if (strstr("xterm dtterm", $TERM) >= 0) |
| 66 | +# $BEING_ON = $BEING_ON, "_xterm" |
| 67 | +# else |
| 68 | +# if (strstr("linux console", $TERM) < 0) |
| 69 | +# # remote side must be some type of real terminal |
| 70 | +# $BEING_ON = $BEING_ON, "_terminal" |
| 71 | +# else |
| 72 | +# # remote side is a Linux console |
| 73 | +# $BEING_ON = $BEING_ON, "_console" |
| 74 | +# endif |
| 75 | +# endif |
| 76 | +# endif |
| 77 | + |
| 78 | warn "dosemu running on ", $BEING_ON; |
| 79 | |
| 80 | $xxx = $_term_char_set |
projects / packages / dosemu.git / blame