15 |
|
#include <ctype.h> |
16 |
|
|
17 |
|
#ifndef VIEWHISTLEN |
18 |
< |
#define VIEWHISTLEN 2 /* number of remembered views */ |
18 |
> |
#define VIEWHISTLEN 4 /* number of remembered views */ |
19 |
|
#endif |
20 |
|
|
21 |
|
HOLO *hdlist[HDMAX+1]; /* global holodeck list */ |
64 |
|
printview(); |
65 |
|
if (inp & DFL(DC_LASTVIEW)) |
66 |
|
new_view(NULL); |
67 |
– |
if (inp & DFL(DC_PAUSE)) |
68 |
– |
pause = 1; |
67 |
|
if (inp & DFL(DC_RESUME)) { |
68 |
|
serv_request(DR_NOOP, 0, NULL); |
69 |
|
pause = 0; |
70 |
|
} |
71 |
+ |
if (inp & DFL(DC_PAUSE)) |
72 |
+ |
pause = 1; |
73 |
|
if (inp & DFL(DC_REDRAW)) |
74 |
|
imm_mode = beam_sync() > 0; |
75 |
< |
if (inp & DFL(DC_KILL)) |
75 |
> |
if (inp & DFL(DC_KILL)) { |
76 |
|
serv_request(DR_KILL, 0, NULL); |
77 |
+ |
pause = 0; |
78 |
+ |
} |
79 |
|
if (inp & DFL(DC_CLOBBER)) |
80 |
|
serv_request(DR_CLOBBER, 0, NULL); |
81 |
< |
if (inp & DFL(DC_RESTART)) |
81 |
> |
if (inp & DFL(DC_RESTART)) { |
82 |
|
serv_request(DR_RESTART, 0, NULL); |
83 |
+ |
pause = 0; |
84 |
+ |
} |
85 |
|
if (inp & DFL(DC_QUIT)) |
86 |
|
serv_request(DR_SHUTDOWN, 0, NULL); |
87 |
|
} |
92 |
|
break; |
93 |
|
case DC_RESUME: |
94 |
|
serv_request(DR_NOOP, 0, NULL); |
95 |
+ |
/* fall through */ |
96 |
+ |
case DC_KILL: |
97 |
+ |
case DC_RESTART: |
98 |
|
pause = 0; |
99 |
|
break; |
100 |
|
} |
214 |
|
char *err; |
215 |
|
/* restore previous view? */ |
216 |
|
if (v == NULL) { |
217 |
< |
if (nhist < 2) { |
218 |
< |
error(COMMAND, "no previous view"); |
219 |
< |
return; |
220 |
< |
} |
221 |
< |
nhist--; /* get one before last setting */ |
217 |
> |
if (nhist > 1) /* get one before last setting */ |
218 |
> |
nhist--; |
219 |
> |
else /* else go to end of list */ |
220 |
> |
while (nhist < VIEWHISTLEN && viewhist[nhist].type) |
221 |
> |
nhist++; |
222 |
|
v = viewhist + ((nhist-1)%VIEWHISTLEN); |
223 |
< |
} else if ((err = setview(v)) != NULL) { |
223 |
> |
} else |
224 |
> |
again: |
225 |
> |
if ((err = setview(v)) != NULL) { |
226 |
|
error(COMMAND, err); |
227 |
|
return; |
228 |
|
} |
220 |
– |
again: |
229 |
|
if (v->type == VT_PAR) { |
230 |
|
error(COMMAND, "cannot handle parallel views"); |
231 |
|
return; |