ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.34 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.38 by pcg, Mon Feb 9 07:11:49 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.34 2004/01/31 00:20:21 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
54 53
55/*----------------------------------------------------------------------*/ 54/*----------------------------------------------------------------------*/
56 55
57/*{{{ Convert the keypress event into a string */ 56/*{{{ Convert the keypress event into a string */
58void 57void
59rxvt_term::lookup_key (XKeyEvent *ev) 58rxvt_term::lookup_key (XKeyEvent &ev)
60{ 59{
61 int ctrl, meta, shft, len; 60 int ctrl, meta, shft, len;
62 unsigned int newlen; 61 unsigned int newlen;
63 KeySym keysym; 62 KeySym keysym;
64#ifdef DEBUG_CMD 63#ifdef DEBUG_CMD
65 static int debug_key = 1; /* accessible by a debugger only */ 64 static int debug_key = 1; /* accessible by a debugger only */
66#endif 65#endif
67 int valid_keysym; 66 int valid_keysym;
68 unsigned char kbuf[KBUFSZ]; 67 unsigned char kbuf[KBUFSZ];
69 68
70/* 69 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad. 71 * escape sequence to toggle the Keypad.
73 * 72 *
74 * Always permit `shift' to override the current setting 73 * Always permit `shift' to override the current setting
75 */ 74 */
76 shft = (ev->state & ShiftMask); 75 shft = (ev.state & ShiftMask);
77 ctrl = (ev->state & ControlMask); 76 ctrl = (ev.state & ControlMask);
78 meta = (ev->state & ModMetaMask); 77 meta = (ev.state & ModMetaMask);
79 78
80 if (numlock_state || (ev->state & ModNumLockMask)) 79 if (numlock_state || (ev.state & ModNumLockMask))
81 { 80 {
82 numlock_state = (ev->state & ModNumLockMask); 81 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode((!numlock_state), PrivMode_aplKP); 82 PrivMode((!numlock_state), PrivMode_aplKP);
84 } 83 }
85 84
86 kbuf[0] = 0; 85 kbuf[0] = 0;
87 86
88#ifdef USE_XIM 87#ifdef USE_XIM
89 if (Input_Context) 88 if (Input_Context)
90 { 89 {
91 Status status_return; 90 Status status_return;
92 91
93#ifdef X_HAVE_UTF8_STRING 92#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) 93 if (enc_utf8 && 0)
95 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 95 KBUFSZ, &keysym, &status_return);
97 else 96 else
98#endif 97#endif
98
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 { 114 {
115 wkbuf[len] = 0; 115 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 117 if (len < 0)
118 len = 0; 118 len = 0;
119 } 119 }
120 else 120 else
121 len = 0; 121 len = 0;
122 } 122 }
123 123
124 valid_keysym = status_return == XLookupKeySym 124 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 125 || status_return == XLookupBoth;
126 } 126 }
127 else 127 else
128#endif 128#endif
129
129 { 130 {
130 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
131 valid_keysym = !len; 132 valid_keysym = !len;
132 } 133 }
133 134
134 if (valid_keysym) 135 if (valid_keysym)
135 { 136 {
136/* for some backwards compatibility */ 137 /* for some backwards compatibility */
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
138# ifdef HOTKEY_CTRL 139# ifdef HOTKEY_CTRL
139 if (ctrl) 140 if (ctrl)
140# else 141# else
141 if (meta) 142 if (meta)
142# endif 143# endif
143 { 144 {
144 if (keysym == ks_bigfont) 145 if (keysym == ks_bigfont)
145 { 146 {
146 change_font (0, FONT_UP); 147 change_font (0, FONT_UP);
147 return; 148 return;
148 } 149 }
149 else if (keysym == ks_smallfont) 150 else if (keysym == ks_smallfont)
150 { 151 {
151 change_font (0, FONT_DN); 152 change_font (0, FONT_DN);
152 return; 153 return;
154 }
153 } 155 }
154 }
155#endif 156#endif
156 157
157 if (TermWin.saveLines) { 158 if (TermWin.saveLines)
159 {
158#ifdef UNSHIFTED_SCROLLKEYS 160#ifdef UNSHIFTED_SCROLLKEYS
159 if (!ctrl && !meta) { 161 if (!ctrl && !meta)
162 {
160#else 163#else
161 if (IS_SCROLL_MOD) { 164 if (IS_SCROLL_MOD)
165 {
162#endif 166#endif
163 int lnsppg; 167 int lnsppg;
164 168
165#ifdef PAGING_CONTEXT_LINES 169#ifdef PAGING_CONTEXT_LINES
166 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
167#else 171#else
168 lnsppg = TermWin.nrow * 4 / 5; 172 lnsppg = TermWin.nrow * 4 / 5;
169#endif 173#endif
170 if (keysym == XK_Prior) { 174 if (keysym == XK_Prior)
175 {
171 scr_page (UP, lnsppg); 176 scr_page (UP, lnsppg);
172 return; 177 return;
178 }
173 } else if (keysym == XK_Next) { 179 else if (keysym == XK_Next)
180 {
174 scr_page (DN, lnsppg); 181 scr_page (DN, lnsppg);
175 return; 182 return;
176 } 183 }
177 } 184 }
178#ifdef SCROLL_ON_UPDOWN_KEYS 185#ifdef SCROLL_ON_UPDOWN_KEYS
179 if (IS_SCROLL_MOD) { 186 if (IS_SCROLL_MOD)
180 if (keysym == XK_Up) { 187 {
181 scr_page (UP, 1); 188 if (keysym == XK_Up)
182 return; 189 {
190 scr_page (UP, 1);
191 return;
192 }
183 } else if (keysym == XK_Down) { 193 else if (keysym == XK_Down)
184 scr_page (DN, 1); 194 {
185 return; 195 scr_page (DN, 1);
186 } 196 return;
187 } 197 }
198 }
188#endif 199#endif
189#ifdef SCROLL_ON_HOMEEND_KEYS 200#ifdef SCROLL_ON_HOMEEND_KEYS
190 if (IS_SCROLL_MOD) { 201 if (IS_SCROLL_MOD)
191 if (keysym == XK_Home) { 202 {
192 scr_move_to (0, 1); 203 if (keysym == XK_Home)
193 return; 204 {
205 scr_move_to (0, 1);
206 return;
207 }
194 } else if (keysym == XK_End) { 208 else if (keysym == XK_End)
195 scr_move_to (1, 0); 209 {
196 return; 210 scr_move_to (1, 0);
197 } 211 return;
198 } 212 }
213 }
199#endif 214#endif
200 }
201 215
202 if (shft) { 216 }
217
218 if (shft)
219 {
203 /* Shift + F1 - F10 generates F11 - F20 */ 220 /* Shift + F1 - F10 generates F11 - F20 */
204 if (keysym >= XK_F1 && keysym <= XK_F10) { 221 if (keysym >= XK_F1 && keysym <= XK_F10)
222 {
205 keysym += (XK_F11 - XK_F1); 223 keysym += (XK_F11 - XK_F1);
206 shft = 0; /* turn off Shift */ 224 shft = 0; /* turn off Shift */
225 }
207 } else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) { 226 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
208 switch (keysym) { 227 {
209 /* normal XTerm key bindings */ 228 switch (keysym)
229 {
230 /* normal XTerm key bindings */
210 case XK_Insert: /* Shift+Insert = paste mouse selection */ 231 case XK_Insert: /* Shift+Insert = paste mouse selection */
211 selection_request (ev->time, 0, 0); 232 selection_request (ev.time, 0, 0);
212 return; 233 return;
213 /* rxvt extras */ 234 /* rxvt extras */
214 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 235 case XK_KP_Add: /* Shift+KP_Add = bigger font */
215 change_font (0, FONT_UP); 236 change_font (0, FONT_UP);
216 return; 237 return;
217 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
218 change_font (0, FONT_DN); 239 change_font (0, FONT_DN);
219 return; 240 return;
220 } 241 }
221 } 242 }
222 } 243 }
223#ifdef PRINTPIPE 244#ifdef PRINTPIPE
224 if (keysym == XK_Print) { 245 if (keysym == XK_Print)
246 {
225 scr_printscreen (ctrl | shft); 247 scr_printscreen (ctrl | shft);
226 return; 248 return;
227 } 249 }
228#endif 250#endif
229#ifdef GREEK_SUPPORT 251#ifdef GREEK_SUPPORT
230 if (keysym == ks_greekmodeswith) { 252 if (keysym == ks_greekmodeswith)
253 {
231 greek_mode = !greek_mode; 254 greek_mode = !greek_mode;
232 if (greek_mode) { 255 if (greek_mode)
233 xterm_seq (XTerm_title, 256 {
257 xterm_seq (XTerm_title,
234 (greek_getmode() == GREEK_ELOT928 258 (greek_getmode() == GREEK_ELOT928
235 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
236 greek_reset(); 260 greek_reset();
237 } else 261 }
262 else
238 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
239 return; 264 return;
240 } 265 }
241#endif 266#endif
242 267
243 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 268 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 {
244#ifdef KEYSYM_RESOURCE 270#ifdef KEYSYM_RESOURCE
245 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) { 271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
246 unsigned int l; 272 {
273 unsigned int l;
247 const unsigned char *kbuf0; 274 const unsigned char *kbuf0;
248 const unsigned char ch = C0_ESC; 275 const unsigned char ch = C0_ESC;
249 276
250 kbuf0 = (Keysym_map[keysym & 0xFF]); 277 kbuf0 = (Keysym_map[keysym & 0xFF]);
251 l = (unsigned int)*kbuf0++; 278 l = (unsigned int)*kbuf0++;
252 279
253 /* escape prefix */ 280 /* escape prefix */
254 if (meta) 281 if (meta)
255# ifdef META8_OPTION 282# ifdef META8_OPTION
256 if (meta_char == C0_ESC) 283 if (meta_char == C0_ESC)
257# endif 284# endif
258 tt_write (&ch, 1); 285 tt_write (&ch, 1);
259 tt_write (kbuf0, l); 286 tt_write (kbuf0, l);
260 return; 287 return;
261 } else 288 }
289 else
262#endif 290#endif
263 { 291
264 newlen = 1; 292 {
265 switch (keysym) { 293 newlen = 1;
294 switch (keysym)
295 {
266#ifndef NO_BACKSPACE_KEY 296#ifndef NO_BACKSPACE_KEY
267 case XK_BackSpace: 297 case XK_BackSpace:
268 if (PrivateModes & PrivMode_HaveBackSpace) { 298 if (PrivateModes & PrivMode_HaveBackSpace)
299 {
269 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace)
270 ^ !!ctrl) ? '\b' : '\177'; 301 ^ !!ctrl) ? '\b' : '\177';
271 kbuf[1] = '\0'; 302 kbuf[1] = '\0';
272 } else 303 }
273 STRCPY(kbuf, key_backspace); 304 else
305 STRCPY(kbuf, key_backspace);
274# ifdef MULTICHAR_SET 306# ifdef MULTICHAR_SET
275 if ((Options & Opt_mc_hack) && screen.cur.col > 0) { 307 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
276 int col, row; 308 {
309 int col, row;
277 310
278 newlen = STRLEN(kbuf); 311 newlen = STRLEN(kbuf);
279 col = screen.cur.col - 1; 312 col = screen.cur.col - 1;
280 row = screen.cur.row + TermWin.saveLines; 313 row = screen.cur.row + TermWin.saveLines;
281 if (IS_MULTI2(screen.rend[row][col])) 314 if (IS_MULTI2(screen.rend[row][col]))
282 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
283 } 316 }
284# endif 317# endif
285 break; 318 break;
286#endif 319#endif
287#ifndef NO_DELETE_KEY 320#ifndef NO_DELETE_KEY
288 case XK_Delete: 321 case XK_Delete:
289 STRCPY(kbuf, key_delete); 322 STRCPY(kbuf, key_delete);
290# ifdef MULTICHAR_SET 323# ifdef MULTICHAR_SET
291 if (Options & Opt_mc_hack) { 324 if (Options & Opt_mc_hack)
292 int col, row; 325 {
293 326 int col, row;
294 newlen = STRLEN(kbuf); 327
295 col = screen.cur.col; 328 newlen = STRLEN(kbuf);
329 col = screen.cur.col;
296 row = screen.cur.row + TermWin.saveLines; 330 row = screen.cur.row + TermWin.saveLines;
297 if (IS_MULTI1(screen.rend[row][col])) 331 if (IS_MULTI1(screen.rend[row][col]))
298 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
299 } 333 }
300# endif 334# endif
301 break; 335 break;
302#endif 336#endif
303 case XK_Tab: 337 case XK_Tab:
304 if (shft) 338 if (shft)
305 STRCPY(kbuf, "\033[Z"); 339 STRCPY(kbuf, "\033[Z");
306 else { 340 else
341 {
307#ifdef CTRL_TAB_MAKES_META 342#ifdef CTRL_TAB_MAKES_META
308 if (ctrl) 343 if (ctrl)
309 meta = 1; 344 meta = 1;
310#endif 345#endif
311#ifdef MOD4_TAB_MAKES_META 346#ifdef MOD4_TAB_MAKES_META
312 if (ev->state & Mod4Mask) 347 if (ev.state & Mod4Mask)
313 meta = 1; 348 meta = 1;
314#endif 349#endif
315 newlen = 0; 350 newlen = 0;
316 } 351 }
317 break; 352 break;
318 353
319 354
320#ifdef XK_KP_Left 355#ifdef XK_KP_Left
321 case XK_KP_Up: /* \033Ox or standard */ 356 case XK_KP_Up: /* \033Ox or standard */
322 case XK_KP_Down: /* \033Or or standard */ 357 case XK_KP_Down: /* \033Or or standard */
323 case XK_KP_Right: /* \033Ov or standard */ 358 case XK_KP_Right: /* \033Ov or standard */
324 case XK_KP_Left: /* \033Ot or standard */ 359 case XK_KP_Left: /* \033Ot or standard */
325 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
326 STRCPY(kbuf, "\033OZ"); 361 {
327 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 362 STRCPY(kbuf, "\033OZ");
328 break; 363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]);
329 } else 364 break;
365 }
366 else
330 /* translate to std. cursor key */ 367 /* translate to std. cursor key */
331 keysym = XK_Left + (keysym - XK_KP_Left); 368 keysym = XK_Left + (keysym - XK_KP_Left);
332 /* FALLTHROUGH */ 369 /* FALLTHROUGH */
333#endif 370#endif
334 case XK_Up: /* "\033[A" */ 371 case XK_Up: /* "\033[A" */
335 case XK_Down: /* "\033[B" */ 372 case XK_Down: /* "\033[B" */
336 case XK_Right: /* "\033[C" */ 373 case XK_Right: /* "\033[C" */
337 case XK_Left: /* "\033[D" */ 374 case XK_Left: /* "\033[D" */
338 STRCPY(kbuf, "\033[Z"); 375 STRCPY(kbuf, "\033[Z");
339 kbuf[2] = ("DACB"[keysym - XK_Left]); 376 kbuf[2] = ("DACB"[keysym - XK_Left]);
340 /* do Shift first */ 377 /* do Shift first */
341 if (shft) 378 if (shft)
342 kbuf[2] = ("dacb"[keysym - XK_Left]); 379 kbuf[2] = ("dacb"[keysym - XK_Left]);
343 else if (ctrl) { 380 else if (ctrl)
344 kbuf[1] = 'O'; 381 {
345 kbuf[2] = ("dacb"[keysym - XK_Left]); 382 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]);
384 }
346 } else if (PrivateModes & PrivMode_aplCUR) 385 else if (PrivateModes & PrivMode_aplCUR)
347 kbuf[1] = 'O'; 386 kbuf[1] = 'O';
348#ifdef MULTICHAR_SET 387#ifdef MULTICHAR_SET
349 //TODO: ?? 388 //TODO: ??
350 if (Options & Opt_mc_hack) { 389 if (Options & Opt_mc_hack)
351 int col, row, m; 390 {
391 int col, row, m;
352 392
353 col = screen.cur.col; 393 col = screen.cur.col;
354 row = screen.cur.row + TermWin.saveLines; 394 row = screen.cur.row + TermWin.saveLines;
355 m = 0; 395 m = 0;
356 if (keysym == XK_Right 396 if (keysym == XK_Right
357 && IS_MULTI1(screen.rend[row][col])) 397 && IS_MULTI1(screen.rend[row][col]))
358 m = 1; 398 m = 1;
359 else if (keysym == XK_Left) { 399 else if (keysym == XK_Left)
360 if (col > 0) { 400 {
361 if (IS_MULTI2(screen.rend[row][col - 1])) 401 if (col > 0)
362 m = 1; 402 {
363 } else if (screen.cur.row > 0) { 403 if (IS_MULTI2(screen.rend[row][col - 1]))
364 col = screen.tlen[--row]; 404 m = 1;
365 if (col == -1) 405 }
366 col = TermWin.ncol - 1; 406 else if (screen.cur.row > 0)
367 else 407 {
368 col--; 408 col = screen.tlen[--row];
369 if (col > 0 409 if (col == -1)
370 && IS_MULTI2(screen.rend[row][col])) 410 col = TermWin.ncol - 1;
371 m = 1; 411 else
372 } 412 col--;
373 } 413 if (col > 0
374 if (m) 414 && IS_MULTI2(screen.rend[row][col]))
375 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 415 m = 1;
376 } 416 }
417 }
418 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
420 }
377#endif 421#endif
378 break; 422 break;
379 423
380#ifndef UNSHIFTED_SCROLLKEYS 424#ifndef UNSHIFTED_SCROLLKEYS
381# ifdef XK_KP_Prior 425# ifdef XK_KP_Prior
382 case XK_KP_Prior: 426 case XK_KP_Prior:
383 /* allow shift to override */ 427 /* allow shift to override */
384 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
385 STRCPY(kbuf, "\033Oy"); 429 {
386 break; 430 STRCPY(kbuf, "\033Oy");
387 } 431 break;
388 /* FALLTHROUGH */ 432 }
433 /* FALLTHROUGH */
389# endif 434# endif
390 case XK_Prior: 435 case XK_Prior:
391 STRCPY(kbuf, "\033[5~"); 436 STRCPY(kbuf, "\033[5~");
392 break; 437 break;
393# ifdef XK_KP_Next 438# ifdef XK_KP_Next
394 case XK_KP_Next: 439 case XK_KP_Next:
395 /* allow shift to override */ 440 /* allow shift to override */
396 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
397 STRCPY(kbuf, "\033Os"); 442 {
398 break; 443 STRCPY(kbuf, "\033Os");
399 } 444 break;
400 /* FALLTHROUGH */ 445 }
446 /* FALLTHROUGH */
401# endif 447# endif
402 case XK_Next: 448 case XK_Next:
403 STRCPY(kbuf, "\033[6~"); 449 STRCPY(kbuf, "\033[6~");
404 break; 450 break;
405#endif 451#endif
406 case XK_KP_Enter: 452 case XK_KP_Enter:
407 /* allow shift to override */ 453 /* allow shift to override */
408 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
409 STRCPY(kbuf, "\033OM"); 455 {
410 } else { 456 STRCPY(kbuf, "\033OM");
411 kbuf[0] = '\r'; 457 }
412 kbuf[1] = '\0'; 458 else
413 } 459 {
414 break; 460 kbuf[0] = '\r';
461 kbuf[1] = '\0';
462 }
463 break;
415 464
416#ifdef XK_KP_Begin 465#ifdef XK_KP_Begin
417 case XK_KP_Begin: 466 case XK_KP_Begin:
418 STRCPY(kbuf, "\033Ou"); 467 STRCPY(kbuf, "\033Ou");
419 break; 468 break;
420 469
421 case XK_KP_Insert: 470 case XK_KP_Insert:
422 STRCPY(kbuf, "\033Op"); 471 STRCPY(kbuf, "\033Op");
423 break; 472 break;
424 473
425 case XK_KP_Delete: 474 case XK_KP_Delete:
426 STRCPY(kbuf, "\033On"); 475 STRCPY(kbuf, "\033On");
427 break; 476 break;
428#endif 477#endif
429 case XK_KP_F1: /* "\033OP" */ 478 case XK_KP_F1: /* "\033OP" */
430 case XK_KP_F2: /* "\033OQ" */ 479 case XK_KP_F2: /* "\033OQ" */
431 case XK_KP_F3: /* "\033OR" */ 480 case XK_KP_F3: /* "\033OR" */
432 case XK_KP_F4: /* "\033OS" */ 481 case XK_KP_F4: /* "\033OS" */
433 STRCPY(kbuf, "\033OP"); 482 STRCPY(kbuf, "\033OP");
434 kbuf[2] += (keysym - XK_KP_F1); 483 kbuf[2] += (keysym - XK_KP_F1);
435 break; 484 break;
436 485
437 case XK_KP_Multiply: /* "\033Oj" : "*" */ 486 case XK_KP_Multiply: /* "\033Oj" : "*" */
438 case XK_KP_Add: /* "\033Ok" : "+" */ 487 case XK_KP_Add: /* "\033Ok" : "+" */
439 case XK_KP_Separator: /* "\033Ol" : "," */ 488 case XK_KP_Separator: /* "\033Ol" : "," */
440 case XK_KP_Subtract: /* "\033Om" : "-" */ 489 case XK_KP_Subtract: /* "\033Om" : "-" */
441 case XK_KP_Decimal: /* "\033On" : "." */ 490 case XK_KP_Decimal: /* "\033On" : "." */
442 case XK_KP_Divide: /* "\033Oo" : "/" */ 491 case XK_KP_Divide: /* "\033Oo" : "/" */
443 case XK_KP_0: /* "\033Op" : "0" */ 492 case XK_KP_0: /* "\033Op" : "0" */
444 case XK_KP_1: /* "\033Oq" : "1" */ 493 case XK_KP_1: /* "\033Oq" : "1" */
445 case XK_KP_2: /* "\033Or" : "2" */ 494 case XK_KP_2: /* "\033Or" : "2" */
446 case XK_KP_3: /* "\033Os" : "3" */ 495 case XK_KP_3: /* "\033Os" : "3" */
447 case XK_KP_4: /* "\033Ot" : "4" */ 496 case XK_KP_4: /* "\033Ot" : "4" */
448 case XK_KP_5: /* "\033Ou" : "5" */ 497 case XK_KP_5: /* "\033Ou" : "5" */
449 case XK_KP_6: /* "\033Ov" : "6" */ 498 case XK_KP_6: /* "\033Ov" : "6" */
450 case XK_KP_7: /* "\033Ow" : "7" */ 499 case XK_KP_7: /* "\033Ow" : "7" */
451 case XK_KP_8: /* "\033Ox" : "8" */ 500 case XK_KP_8: /* "\033Ox" : "8" */
452 case XK_KP_9: /* "\033Oy" : "9" */ 501 case XK_KP_9: /* "\033Oy" : "9" */
453 /* allow shift to override */ 502 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 STRCPY(kbuf, "\033Oj"); 504 {
456 kbuf[2] += (keysym - XK_KP_Multiply); 505 STRCPY(kbuf, "\033Oj");
457 } else { 506 kbuf[2] += (keysym - XK_KP_Multiply);
507 }
508 else
509 {
458 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
459 kbuf[1] = '\0'; 511 kbuf[1] = '\0';
460 } 512 }
461 break; 513 break;
462 514
463 case XK_Find: 515 case XK_Find:
464 STRCPY(kbuf, "\033[1~"); 516 STRCPY(kbuf, "\033[1~");
465 break; 517 break;
466 case XK_Insert: 518 case XK_Insert:
467 STRCPY(kbuf, "\033[2~"); 519 STRCPY(kbuf, "\033[2~");
468 break; 520 break;
469#ifdef DXK_Remove /* support for DEC remove like key */ 521#ifdef DXK_Remove /* support for DEC remove like key */
470 case DXK_Remove: 522 case DXK_Remove:
471 /* FALLTHROUGH */ 523 /* FALLTHROUGH */
472#endif 524#endif
473 case XK_Execute: 525 case XK_Execute:
474 STRCPY(kbuf, "\033[3~"); 526 STRCPY(kbuf, "\033[3~");
475 break; 527 break;
476 case XK_Select: 528 case XK_Select:
477 STRCPY(kbuf, "\033[4~"); 529 STRCPY(kbuf, "\033[4~");
478 break; 530 break;
479#ifdef XK_KP_End 531#ifdef XK_KP_End
480 case XK_KP_End: 532 case XK_KP_End:
481 /* allow shift to override */ 533 /* allow shift to override */
482 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
483 STRCPY(kbuf, "\033Oq"); 535 {
484 break; 536 STRCPY(kbuf, "\033Oq");
485 } 537 break;
486 /* FALLTHROUGH */ 538 }
539 /* FALLTHROUGH */
487#endif 540#endif
488 case XK_End: 541 case XK_End:
489 STRCPY(kbuf, KS_END); 542 STRCPY(kbuf, KS_END);
490 break; 543 break;
491#ifdef XK_KP_Home 544#ifdef XK_KP_Home
492 case XK_KP_Home: 545 case XK_KP_Home:
493 /* allow shift to override */ 546 /* allow shift to override */
494 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
495 STRCPY(kbuf, "\033Ow"); 548 {
496 break; 549 STRCPY(kbuf, "\033Ow");
497 } 550 break;
498 /* FALLTHROUGH */ 551 }
552 /* FALLTHROUGH */
499#endif 553#endif
500 case XK_Home: 554 case XK_Home:
501 STRCPY(kbuf, KS_HOME); 555 STRCPY(kbuf, KS_HOME);
502 break; 556 break;
503 557
504#define FKEY(n, fkey) \ 558#define FKEY(n, fkey) \
505 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey)))
506 560
507 case XK_F1: /* "\033[11~" */ 561 case XK_F1: /* "\033[11~" */
508 case XK_F2: /* "\033[12~" */ 562 case XK_F2: /* "\033[12~" */
509 case XK_F3: /* "\033[13~" */ 563 case XK_F3: /* "\033[13~" */
510 case XK_F4: /* "\033[14~" */ 564 case XK_F4: /* "\033[14~" */
511 case XK_F5: /* "\033[15~" */ 565 case XK_F5: /* "\033[15~" */
512 FKEY(11, XK_F1); 566 FKEY(11, XK_F1);
513 break; 567 break;
514 case XK_F6: /* "\033[17~" */ 568 case XK_F6: /* "\033[17~" */
515 case XK_F7: /* "\033[18~" */ 569 case XK_F7: /* "\033[18~" */
516 case XK_F8: /* "\033[19~" */ 570 case XK_F8: /* "\033[19~" */
517 case XK_F9: /* "\033[20~" */ 571 case XK_F9: /* "\033[20~" */
518 case XK_F10: /* "\033[21~" */ 572 case XK_F10: /* "\033[21~" */
519 FKEY(17, XK_F6); 573 FKEY(17, XK_F6);
520 break; 574 break;
521 case XK_F11: /* "\033[23~" */ 575 case XK_F11: /* "\033[23~" */
522 case XK_F12: /* "\033[24~" */ 576 case XK_F12: /* "\033[24~" */
523 case XK_F13: /* "\033[25~" */ 577 case XK_F13: /* "\033[25~" */
524 case XK_F14: /* "\033[26~" */ 578 case XK_F14: /* "\033[26~" */
525 FKEY(23, XK_F11); 579 FKEY(23, XK_F11);
526 break; 580 break;
527 case XK_F15: /* "\033[28~" */ 581 case XK_F15: /* "\033[28~" */
528 case XK_F16: /* "\033[29~" */ 582 case XK_F16: /* "\033[29~" */
529 FKEY(28, XK_F15); 583 FKEY(28, XK_F15);
530 break; 584 break;
531 case XK_Help: /* "\033[28~" */ 585 case XK_Help: /* "\033[28~" */
532 FKEY(28, XK_Help); 586 FKEY(28, XK_Help);
533 break; 587 break;
534 case XK_Menu: /* "\033[29~" */ 588 case XK_Menu: /* "\033[29~" */
535 FKEY(29, XK_Menu); 589 FKEY(29, XK_Menu);
536 break; 590 break;
537 case XK_F17: /* "\033[31~" */ 591 case XK_F17: /* "\033[31~" */
538 case XK_F18: /* "\033[32~" */ 592 case XK_F18: /* "\033[32~" */
539 case XK_F19: /* "\033[33~" */ 593 case XK_F19: /* "\033[33~" */
540 case XK_F20: /* "\033[34~" */ 594 case XK_F20: /* "\033[34~" */
541 case XK_F21: /* "\033[35~" */ 595 case XK_F21: /* "\033[35~" */
542 case XK_F22: /* "\033[36~" */ 596 case XK_F22: /* "\033[36~" */
543 case XK_F23: /* "\033[37~" */ 597 case XK_F23: /* "\033[37~" */
544 case XK_F24: /* "\033[38~" */ 598 case XK_F24: /* "\033[38~" */
545 case XK_F25: /* "\033[39~" */ 599 case XK_F25: /* "\033[39~" */
546 case XK_F26: /* "\033[40~" */ 600 case XK_F26: /* "\033[40~" */
547 case XK_F27: /* "\033[41~" */ 601 case XK_F27: /* "\033[41~" */
548 case XK_F28: /* "\033[42~" */ 602 case XK_F28: /* "\033[42~" */
549 case XK_F29: /* "\033[43~" */ 603 case XK_F29: /* "\033[43~" */
550 case XK_F30: /* "\033[44~" */ 604 case XK_F30: /* "\033[44~" */
551 case XK_F31: /* "\033[45~" */ 605 case XK_F31: /* "\033[45~" */
552 case XK_F32: /* "\033[46~" */ 606 case XK_F32: /* "\033[46~" */
553 case XK_F33: /* "\033[47~" */ 607 case XK_F33: /* "\033[47~" */
554 case XK_F34: /* "\033[48~" */ 608 case XK_F34: /* "\033[48~" */
555 case XK_F35: /* "\033[49~" */ 609 case XK_F35: /* "\033[49~" */
556 FKEY(31, XK_F17); 610 FKEY(31, XK_F17);
557 break; 611 break;
558#undef FKEY 612#undef FKEY
559 default: 613 default:
560 newlen = 0; 614 newlen = 0;
561 break; 615 break;
562 } 616 }
563 if (newlen) 617 if (newlen)
564 len = STRLEN(kbuf); 618 len = STRLEN(kbuf);
565 } 619 }
566 /* 620 /*
567 * Pass meta for all function keys, if 'meta' option set 621 * Pass meta for all function keys, if 'meta' option set
568 */ 622 */
569#ifdef META8_OPTION 623#ifdef META8_OPTION
570 if (meta && (meta_char == 0x80) && len > 0) 624 if (meta && (meta_char == 0x80) && len > 0)
571 kbuf[len - 1] |= 0x80; 625 kbuf[len - 1] |= 0x80;
572#endif 626#endif
627
628 }
573 } else if (ctrl && keysym == XK_minus) { 629 else if (ctrl && keysym == XK_minus)
630 {
574 len = 1; 631 len = 1;
575 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 632 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
576 } else { 633 }
634 else
635 {
577#ifdef META8_OPTION 636#ifdef META8_OPTION
578 /* set 8-bit on */ 637 /* set 8-bit on */
579 if (meta && (meta_char == 0x80)) { 638 if (meta && (meta_char == 0x80))
580 unsigned char *ch; 639 {
640 unsigned char *ch;
581 641
582 for (ch = kbuf; ch < kbuf + len; ch++) 642 for (ch = kbuf; ch < kbuf + len; ch++)
583 *ch |= 0x80; 643 *ch |= 0x80;
584 meta = 0; 644 meta = 0;
585 } 645 }
586#endif 646#endif
587#ifdef GREEK_SUPPORT 647#ifdef GREEK_SUPPORT
588 if (greek_mode) 648 if (greek_mode)
589 len = greek_xlat(kbuf, len); 649 len = greek_xlat(kbuf, len);
590#endif 650#endif
591 /* nil */ ; 651 /* nil */ ;
592 } 652 }
653 }
654
655 if (len <= 0)
656 return; /* not mapped */
657
658 if (Options & Opt_scrollTtyKeypress)
659 if (TermWin.view_start)
660 {
661 TermWin.view_start = 0;
662 want_refresh = 1;
593 } 663 }
594 664
595 if (len <= 0) 665 /*
596 return; /* not mapped */
597
598 if (Options & Opt_scrollTtyKeypress)
599 if (TermWin.view_start) {
600 TermWin.view_start = 0;
601 want_refresh = 1;
602 }
603
604/*
605 * these modifications only affect the static keybuffer 666 * these modifications only affect the static keybuffer
606 * pass Shift/Control indicators for function keys ending with `~' 667 * pass Shift/Control indicators for function keys ending with `~'
607 * 668 *
608 * eg, 669 * eg,
609 * Prior = "ESC[5~" 670 * Prior = "ESC[5~"
610 * Shift+Prior = "ESC[5$" 671 * Shift+Prior = "ESC[5$"
611 * Ctrl+Prior = "ESC[5^" 672 * Ctrl+Prior = "ESC[5^"
612 * Ctrl+Shift+Prior = "ESC[5@" 673 * Ctrl+Shift+Prior = "ESC[5@"
613 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 674 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
614 */ 675 */
615 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 676 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
616 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
617 678
618/* escape prefix */ 679 /* escape prefix */
619 if (meta 680 if (meta
620#ifdef META8_OPTION 681#ifdef META8_OPTION
621 && (meta_char == C0_ESC) 682 && (meta_char == C0_ESC)
622#endif 683#endif
623 ) { 684 )
685 {
624 const unsigned char ch = C0_ESC; 686 const unsigned char ch = C0_ESC;
625 687
626 tt_write(&ch, 1); 688 tt_write(&ch, 1);
627 } 689 }
628#ifdef DEBUG_CMD 690#ifdef DEBUG_CMD
691 if (debug_key)
629 if (debug_key) { /* Display keyboard buffer contents */ 692 { /* Display keyboard buffer contents */
630 char *p; 693 char *p;
631 int i; 694 int i;
632 695
633 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
634 for (i = 0, p = kbuf; i < len; i++, p++) 697 for (i = 0, p = kbuf; i < len; i++, p++)
635 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
636 fprintf(stderr, "'\n"); 699 fprintf(stderr, "'\n");
637 } 700 }
638#endif /* DEBUG_CMD */ 701#endif /* DEBUG_CMD */
639 tt_write (kbuf, (unsigned int)len); 702 tt_write (kbuf, (unsigned int)len);
640} 703}
641/*}}} */ 704/*}}} */
642 705
643#if (MENUBAR_MAX) 706#if (MENUBAR_MAX)
644/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
645/* attempt to `write' count to the input buffer */ 708/* attempt to `write' count to the input buffer */
646unsigned int 709unsigned int
647rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 710rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
648{ 711{
649 unsigned int n, s; 712 unsigned int n, s;
650 713
651 n = cmdbuf_ptr - cmdbuf_base; 714 n = cmdbuf_ptr - cmdbuf_base;
652 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
653 if (n > 0 && s < count) { 716 if (n > 0 && s < count)
717 {
654 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 718 MEMMOVE(cmdbuf_base, cmdbuf_ptr,
655 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr));
656 cmdbuf_ptr = cmdbuf_base; 720 cmdbuf_ptr = cmdbuf_base;
657 cmdbuf_endp -= n; 721 cmdbuf_endp -= n;
658 s += n; 722 s += n;
659 } 723 }
660 if (count > s) { 724 if (count > s)
725 {
661 rxvt_print_error("data loss: cmd_write too large"); 726 rxvt_print_error("data loss: cmd_write too large");
662 count = s; 727 count = s;
663 } 728 }
664 for (; count--;) 729 for (; count--;)
665 *cmdbuf_endp++ = *str++; 730 *cmdbuf_endp++ = *str++;
666 return 0; 731 return 0;
667} 732}
668#endif /* MENUBAR_MAX */ 733#endif /* MENUBAR_MAX */
669 734
670void 735void
671rxvt_term::flush () 736rxvt_term::flush ()
… …
685 scr_refresh (refresh_type); 750 scr_refresh (refresh_type);
686 scrollbar_show (1); 751 scrollbar_show (1);
687#ifdef USE_XIM 752#ifdef USE_XIM
688 IMSendSpot (); 753 IMSendSpot ();
689#endif 754#endif
690 }
691 755
756 }
757
692 XFlush (Xdisplay); 758 XFlush (display->display);
693} 759}
694 760
695void 761void
696rxvt_term::check_cb (check_watcher &w) 762rxvt_term::check_cb (check_watcher &w)
697{ 763{
698 SET_R (this); 764 SET_R (this);
699 SET_LOCALE (locale); 765 SET_LOCALE (locale);
700 766
701 flush (); 767 flush ();
702}
703
704void
705rxvt_term::process_x_events ()
706{
707 do
708 {
709 XEvent xev;
710
711 XNextEvent (Xdisplay, &xev);
712
713#if defined(CURSOR_BLINK)
714 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
715 {
716 if (hidden_cursor)
717 {
718 hidden_cursor = 0;
719 want_refresh = 1;
720 }
721
722 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
723 }
724#endif
725
726#if defined(POINTER_BLANK)
727 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
728 {
729 if (xev.type == MotionNotify
730 || xev.type == ButtonPress
731 || xev.type == ButtonRelease)
732 if (hidden_pointer)
733 pointer_unblank ();
734
735 if (xev.type == KeyPress && hidden_pointer == 0)
736 pointer_blank ();
737 }
738#endif
739
740#ifdef USE_XIM
741 if (!XFilterEvent (&xev, xev.xany.window))
742#endif
743 process_x_event (&xev);
744 }
745 while (XPending (Xdisplay));
746} 768}
747 769
748#ifdef CURSOR_BLINK 770#ifdef CURSOR_BLINK
749void 771void
750rxvt_term::cursor_blink_cb (time_watcher &w) 772rxvt_term::cursor_blink_cb (time_watcher &w)
… …
767 w.start (w.at + TEXT_BLINK_INTERVAL); 789 w.start (w.at + TEXT_BLINK_INTERVAL);
768 } 790 }
769} 791}
770#endif 792#endif
771 793
772void
773rxvt_term::x_cb (io_watcher &w, short revents)
774{
775 SET_R (this);
776 SET_LOCALE (locale);
777
778 process_x_events ();
779}
780
781bool 794bool
782rxvt_term::pty_fill () 795rxvt_term::pty_fill ()
783{ 796{
784 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 797 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
785 798
786 memmove (cmdbuf_base, cmdbuf_ptr, n); 799 memmove (cmdbuf_base, cmdbuf_ptr, n);
787 cmdbuf_ptr = cmdbuf_base; 800 cmdbuf_ptr = cmdbuf_base;
788 cmdbuf_endp = cmdbuf_ptr + n; 801 cmdbuf_endp = cmdbuf_ptr + n;
789 802
790 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 803 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
791 804
792 if (n > 0) 805 if (n > 0)
793 { 806 {
794 cmdbuf_endp += n; 807 cmdbuf_endp += n;
… …
863 { 876 {
864 refreshnow = true; 877 refreshnow = true;
865 flag = false; 878 flag = false;
866 ch = NOCHAR; 879 ch = NOCHAR;
867 break; 880 break;
881 }
882
883 // scr_add_lines only works for nlines < TermWin.nrow - 1.
884 if (nlines >= TermWin.nrow - 1)
885 {
886 scr_add_lines (buf, nlines, str - buf);
887 nlines = 0;
888 str = buf;
868 } 889 }
869 } 890 }
870 891
871 if (str >= buf + BUFSIZ) 892 if (str >= buf + BUFSIZ)
872 { 893 {
… …
904 process_nonprinting (ch); 925 process_nonprinting (ch);
905 break; 926 break;
906 case C0_ESC: /* escape char */ 927 case C0_ESC: /* escape char */
907 process_escape_seq (); 928 process_escape_seq ();
908 break; 929 break;
909 /*case 0x9b: */ /* CSI */ 930 /*case 0x9b: */ /* CSI */
910 /* process_csi_seq (); */ 931 /* process_csi_seq (); */
911 } 932 }
912 933
913 ch = NOCHAR; 934 ch = NOCHAR;
914 } 935 }
915 } 936 }
… …
962 // would be preferred. either setjmp/longjmp or better design. 983 // would be preferred. either setjmp/longjmp or better design.
963 fcntl (cmd_fd, F_SETFL, 0); 984 fcntl (cmd_fd, F_SETFL, 0);
964 pty_fill (); 985 pty_fill ();
965 fcntl (cmd_fd, F_SETFL, O_NONBLOCK); 986 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
966 } 987 }
967
968#if 0
969#define TIMEOUT_USEC 5000
970 fd_set readfds;
971 int quick_timeout, select_res;
972 int want_motion_time, want_keypress_time;
973 struct timeval value;
974#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
975 struct timeval tp;
976#endif
977
978 for (;;) {
979 /* loop until we can return something */
980
981 if (v_bufstr < v_bufptr) /* output any pending chars */
982 tt_write(NULL, 0);
983
984#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
985 if (mouse_slip_wheel_speed) {
986 quick_timeout = 1;
987 if (!mouse_slip_wheel_delay--
988 && scr_page (mouse_slip_wheel_speed > 0 ? UP : DN,
989 abs(mouse_slip_wheel_speed))) {
990 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
991 refresh_type |= SMOOTH_REFRESH;
992 want_refresh = 1;
993 }
994 }
995#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
996#ifdef SELECTION_SCROLLING
997 if (pending_scroll_selection) {
998 quick_timeout = 1;
999 if (!scroll_selection_delay--
1000 && scr_page (scroll_selection_dir,
1001 scroll_selection_lines)) {
1002 selection_extend (selection_save_x,
1003 selection_save_y, selection_save_state);
1004 scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1005 refresh_type |= SMOOTH_REFRESH;
1006 want_refresh = 1;
1007 }
1008 }
1009#endif
1010#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1011 if (scrollbar_isUp() || scrollbar_isDn()) {
1012 quick_timeout = 1;
1013 if (!scroll_arrow_delay--
1014 && scr_page (scrollbar_isUp() ? UP : DN, 1)) {
1015 scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1016 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1;
1018 }
1019 }
1020#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1021
1022#ifdef TRANSPARENT
1023 quick_timeout |= want_full_refresh;
1024#endif
1025#endif
1026} 988}
1027 989
1028#ifdef POINTER_BLANK 990#ifdef POINTER_BLANK
1029void 991void
1030rxvt_term::pointer_unblank () 992rxvt_term::pointer_unblank ()
1031{ 993{
1032 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 994 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1033 recolour_cursor (); 995 recolour_cursor ();
1034 996
1035 hidden_pointer = 0; 997 hidden_pointer = 0;
1036 998
1037 if (Options & Opt_pointerBlank) 999 if (Options & Opt_pointerBlank)
… …
1042rxvt_term::pointer_blank () 1004rxvt_term::pointer_blank ()
1043{ 1005{
1044 if (!(Options & Opt_pointerBlank)) 1006 if (!(Options & Opt_pointerBlank))
1045 return; 1007 return;
1046 1008
1047 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1009 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1048 XFlush (Xdisplay); 1010 XFlush (display->display);
1049 1011
1050 hidden_pointer = 1; 1012 hidden_pointer = 1;
1051} 1013}
1052 1014
1053void 1015void
… …
1059 pointer_blank (); 1021 pointer_blank ();
1060} 1022}
1061#endif 1023#endif
1062 1024
1063void 1025void
1064rxvt_term::mouse_report (const XButtonEvent *ev) 1026rxvt_term::mouse_report (const XButtonEvent &ev)
1065{ 1027{
1066 int button_number, key_state = 0; 1028 int button_number, key_state = 0;
1067 int x, y; 1029 int x, y;
1068 1030
1069 x = ev->x; 1031 x = ev.x;
1070 y = ev->y; 1032 y = ev.y;
1071 pixel_position (&x, &y); 1033 pixel_position (&x, &y);
1072 1034
1073 if (MEvent.button == AnyButton) { 1035 if (MEvent.button == AnyButton)
1036 {
1074 button_number = 3; 1037 button_number = 3;
1075 } else { 1038 }
1039 else
1040 {
1076 button_number = MEvent.button - Button1; 1041 button_number = MEvent.button - Button1;
1077 /* add 0x3D for wheel events, like xterm does */ 1042 /* add 0x3D for wheel events, like xterm does */
1078 if (button_number >= 3) 1043 if (button_number >= 3)
1079 button_number += (64 - 3); 1044 button_number += (64 - 3);
1080 } 1045 }
1081 1046
1082 if (PrivateModes & PrivMode_MouseX10) { 1047 if (PrivateModes & PrivMode_MouseX10)
1048 {
1083 /* 1049 /*
1084 * do not report ButtonRelease 1050 * do not report ButtonRelease
1085 * no state info allowed 1051 * no state info allowed
1086 */ 1052 */
1087 key_state = 0; 1053 key_state = 0;
1088 if (button_number == 3) 1054 if (button_number == 3)
1089 return; 1055 return;
1090 } else { 1056 }
1057 else
1058 {
1091 /* XTerm mouse reporting needs these values: 1059 /* XTerm mouse reporting needs these values:
1092 * 4 = Shift 1060 * 4 = Shift
1093 * 8 = Meta 1061 * 8 = Meta
1094 * 16 = Control 1062 * 16 = Control
1095 * plus will add in our own Double-Click reporting 1063 * plus will add in our own Double-Click reporting
1096 * 32 = Double Click 1064 * 32 = Double Click
1097 */ 1065 */
1098 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1066 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1099 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1067 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1100 + ((MEvent.state & ControlMask) ? 16 : 0); 1068 + ((MEvent.state & ControlMask) ? 16 : 0);
1101#ifdef MOUSE_REPORT_DOUBLECLICK 1069#ifdef MOUSE_REPORT_DOUBLECLICK
1102 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1070 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1103#endif 1071#endif
1072
1104 } 1073 }
1105 1074
1106#ifdef DEBUG_MOUSEREPORT 1075#ifdef DEBUG_MOUSEREPORT
1107 fprintf(stderr, "Mouse ["); 1076 fprintf(stderr, "Mouse [");
1108 if (key_state & 16) 1077 if (key_state & 16)
1109 fputc('C', stderr); 1078 fputc('C', stderr);
1110 if (key_state & 4) 1079 if (key_state & 4)
1111 fputc('S', stderr); 1080 fputc('S', stderr);
1112 if (key_state & 8) 1081 if (key_state & 8)
1113 fputc('A', stderr); 1082 fputc('A', stderr);
1114 if (key_state & 32) 1083 if (key_state & 32)
1115 fputc('2', stderr); 1084 fputc('2', stderr);
1116 fprintf(stderr, "]: <%d>, %d/%d\n", 1085 fprintf(stderr, "]: <%d>, %d/%d\n",
1117 button_number, 1086 button_number,
1118 x + 1, 1087 x + 1,
1119 y + 1); 1088 y + 1);
1120#else 1089#else
1121 tt_printf("\033[M%c%c%c", 1090 tt_printf("\033[M%c%c%c",
1122 (32 + button_number + key_state), 1091 (32 + button_number + key_state),
1123 (32 + x + 1), 1092 (32 + x + 1),
1124 (32 + y + 1)); 1093 (32 + y + 1));
1125#endif 1094#endif
1126} 1095}
1127 1096
1128#ifdef USING_W11LIB 1097#ifdef USING_W11LIB
1129void 1098void
1130rxvt_W11_process_x_event(XEvent *ev) 1099rxvt_W11_process_x_event(XEvent *ev)
1131{ 1100{
1132 rxvt_t *r = rxvt_get_r(); 1101 rxvt_t *r = rxvt_get_r();
1133 1102
1134 process_x_event (ev); 1103 x_cb (*ev);
1135} 1104}
1136#endif 1105#endif
1137 1106
1138/*{{{ process an X event */ 1107/*{{{ process an X event */
1139void 1108void
1140rxvt_term::process_x_event (XEvent *ev) 1109rxvt_term::x_cb (XEvent &ev)
1141{ 1110{
1111 SET_R (this);
1112 SET_LOCALE (locale);
1113
1114#if defined(CURSOR_BLINK)
1115 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1116 {
1117 if (hidden_cursor)
1118 {
1119 hidden_cursor = 0;
1120 want_refresh = 1;
1121 }
1122
1123 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1124 }
1125#endif
1126
1127#if defined(POINTER_BLANK)
1128 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1129 {
1130 if (ev.type == MotionNotify
1131 || ev.type == ButtonPress
1132 || ev.type == ButtonRelease)
1133 if (hidden_pointer)
1134 pointer_unblank ();
1135
1136 if (ev.type == KeyPress && hidden_pointer == 0)
1137 pointer_blank ();
1138 }
1139#endif
1140
1141#ifdef USE_XIM
1142 if (XFilterEvent (&ev, None))
1143 return;
1144#endif
1145
1142 Window unused_root, unused_child; 1146 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1147 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1148 unsigned int unused_mask;
1145 1149
1146#ifdef DEBUG_X 1150#ifdef DEBUG_X
1147 const char *const eventnames[] = 1151 const char *const eventnames[] =
1148 { /* mason - this matches my system */ 1152 { /* mason - this matches my system */
1149 "", 1153 "",
1150 "", 1154 "",
1151 "KeyPress", 1155 "KeyPress",
1152 "KeyRelease", 1156 "KeyRelease",
1153 "ButtonPress", 1157 "ButtonPress",
1154 "ButtonRelease", 1158 "ButtonRelease",
1155 "MotionNotify", 1159 "MotionNotify",
1156 "EnterNotify", 1160 "EnterNotify",
1157 "LeaveNotify", 1161 "LeaveNotify",
1158 "FocusIn", 1162 "FocusIn",
1159 "FocusOut", 1163 "FocusOut",
1160 "KeymapNotify", 1164 "KeymapNotify",
1161 "Expose", 1165 "Expose",
1162 "GraphicsExpose", 1166 "GraphicsExpose",
1163 "NoExpose", 1167 "NoExpose",
1164 "VisibilityNotify", 1168 "VisibilityNotify",
1165 "CreateNotify", 1169 "CreateNotify",
1166 "DestroyNotify", 1170 "DestroyNotify",
1167 "UnmapNotify", 1171 "UnmapNotify",
1168 "MapNotify", 1172 "MapNotify",
1169 "MapRequest", 1173 "MapRequest",
1170 "ReparentNotify", 1174 "ReparentNotify",
1171 "ConfigureNotify", 1175 "ConfigureNotify",
1172 "ConfigureRequest", 1176 "ConfigureRequest",
1173 "GravityNotify", 1177 "GravityNotify",
1174 "ResizeRequest", 1178 "ResizeRequest",
1175 "CirculateNotify", 1179 "CirculateNotify",
1176 "CirculateRequest", 1180 "CirculateRequest",
1177 "PropertyNotify", 1181 "PropertyNotify",
1178 "SelectionClear", 1182 "SelectionClear",
1179 "SelectionRequest", 1183 "SelectionRequest",
1180 "SelectionNotify", 1184 "SelectionNotify",
1181 "ColormapNotify", 1185 "ColormapNotify",
1182 "ClientMessage", 1186 "ClientMessage",
1183 "MappingNotify" 1187 "MappingNotify"
1184 }; 1188 };
1185#endif 1189#endif
1186 1190
1187#ifdef DEBUG_X 1191#ifdef DEBUG_X
1188 struct timeval tp; 1192 struct timeval tp;
1189 struct tm *ltt; 1193 struct tm *ltt;
1190 (void)gettimeofday(&tp, NULL); 1194 (void)gettimeofday(&tp, NULL);
1191 ltt = localtime(&(tp.tv_sec)); 1195 ltt = localtime(&(tp.tv_sec));
1192 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == TermWin.parent[0] ? "parent" : (ev->xany.window == TermWin.vt ? "vt" : (ev->xany.window == scrollBar.win ? "scroll" : (ev->xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev->xany.window == TermWin.vt ? TermWin.vt : (ev->xany.window == scrollBar.win ? scrollBar.win : (ev->xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial)); 1196 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1193#endif 1197#endif
1194 1198
1195 switch (ev->type) { 1199 switch (ev.type)
1200 {
1196 case KeyPress: 1201 case KeyPress:
1197 lookup_key ((XKeyEvent *)ev); 1202 lookup_key (ev.xkey);
1198 break; 1203 break;
1199 1204
1200#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1201 case KeyRelease: 1206 case KeyRelease:
1202 { 1207 {
1203 if (!(ev->xkey.state & ControlMask)) 1208 if (!(ev.xkey.state & ControlMask))
1204 mouse_slip_wheel_speed = 0;
1205 else {
1206 KeySym ks;
1207
1208 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0);
1209 if (ks == XK_Control_L || ks == XK_Control_R)
1210 mouse_slip_wheel_speed = 0; 1209 mouse_slip_wheel_speed = 0;
1211 } 1210 else
1212 break; 1211 {
1213 } 1212 KeySym ks;
1214#endif
1215 1213
1214 ks = XKeycodeToKeysym(display->display, ev.xkey.keycode, 0);
1215 if (ks == XK_Control_L || ks == XK_Control_R)
1216 mouse_slip_wheel_speed = 0;
1217 }
1218 break;
1219 }
1220#endif
1221
1216 case ButtonPress: 1222 case ButtonPress:
1217 button_press ((XButtonEvent *)ev); 1223 button_press (ev.xbutton);
1218 break; 1224 break;
1219 1225
1220 case ButtonRelease: 1226 case ButtonRelease:
1221 button_release ((XButtonEvent *)ev); 1227 button_release (ev.xbutton);
1222 break; 1228 break;
1223 1229
1224 case ClientMessage: 1230 case ClientMessage:
1225 if (ev->xclient.format == 32 1231 if (ev.xclient.format == 32
1226 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1232 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1227 destroy (); 1233 destroy ();
1228#ifdef OFFIX_DND 1234#ifdef OFFIX_DND
1229 /* OffiX Dnd (drag 'n' drop) protocol */ 1235 /* OffiX Dnd (drag 'n' drop) protocol */
1230 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1236 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1231 && (ev->xclient.data.l[0] == DndFile 1237 && (ev.xclient.data.l[0] == DndFile
1232 || ev->xclient.data.l[0] == DndDir 1238 || ev.xclient.data.l[0] == DndDir
1233 || ev->xclient.data.l[0] == DndLink)) { 1239 || ev.xclient.data.l[0] == DndLink))
1234 /* Get Dnd data */ 1240 {
1241 /* Get Dnd data */
1235 Atom ActualType; 1242 Atom ActualType;
1236 int ActualFormat; 1243 int ActualFormat;
1237 unsigned char *data; 1244 unsigned char *data;
1238 unsigned long Size, RemainingBytes; 1245 unsigned long Size, RemainingBytes;
1239 1246
1240 XGetWindowProperty(Xdisplay, Xroot, 1247 XGetWindowProperty(display->display, display->root,
1241 xa[XA_DNDSELECTION], 1248 xa[XA_DNDSELECTION],
1242 0L, 1000000L, 1249 0L, 1000000L,
1243 False, AnyPropertyType, 1250 False, AnyPropertyType,
1244 &ActualType, &ActualFormat, 1251 &ActualType, &ActualFormat,
1245 &Size, &RemainingBytes, 1252 &Size, &RemainingBytes,
1246 &data); 1253 &data);
1247 XChangeProperty(Xdisplay, Xroot, 1254 XChangeProperty(display->display, display->root,
1248 XA_CUT_BUFFER0, XA_STRING, 1255 XA_CUT_BUFFER0, XA_STRING,
1249 8, PropModeReplace, 1256 8, PropModeReplace,
1250 data, STRLEN(data)); 1257 data, STRLEN(data));
1251 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1258 selection_paste (display->root, XA_CUT_BUFFER0, True);
1252 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1259 XSetInputFocus(display->display, display->root, RevertToNone, CurrentTime);
1253 } 1260 }
1254#endif /* OFFIX_DND */ 1261#endif /* OFFIX_DND */
1255 break; 1262 break;
1256 1263
1257 case MappingNotify: 1264 case MappingNotify:
1258 XRefreshKeyboardMapping(&(ev->xmapping)); 1265 XRefreshKeyboardMapping(&(ev.xmapping));
1259 break; 1266 break;
1260 1267
1261 /* 1268 /*
1262 * XXX: this is not the _current_ arrangement 1269 * XXX: this is not the _current_ arrangement
1263 * Here's my conclusion: 1270 * Here's my conclusion:
1264 * If the window is completely unobscured, use bitblt's 1271 * If the window is completely unobscured, use bitblt's
1265 * to scroll. Even then, they're only used when doing partial 1272 * to scroll. Even then, they're only used when doing partial
1266 * screen scrolling. When partially obscured, we have to fill 1273 * screen scrolling. When partially obscured, we have to fill
1267 * in the GraphicsExpose parts, which means that after each refresh, 1274 * in the GraphicsExpose parts, which means that after each refresh,
1268 * we need to wait for the graphics expose or Noexpose events, 1275 * we need to wait for the graphics expose or Noexpose events,
1269 * which ought to make things real slow! 1276 * which ought to make things real slow!
1270 */ 1277 */
1271 case VisibilityNotify: 1278 case VisibilityNotify:
1272 switch (ev->xvisibility.state) 1279 switch (ev.xvisibility.state)
1273 { 1280 {
1274 case VisibilityUnobscured: 1281 case VisibilityUnobscured:
1275 refresh_type = FAST_REFRESH; 1282 refresh_type = FAST_REFRESH;
1276 break; 1283 break;
1277 case VisibilityPartiallyObscured: 1284 case VisibilityPartiallyObscured:
… …
1279 break; 1286 break;
1280 default: 1287 default:
1281 refresh_type = NO_REFRESH; 1288 refresh_type = NO_REFRESH;
1282 break; 1289 break;
1283 } 1290 }
1284 break; 1291 break;
1285 1292
1286 case FocusIn: 1293 case FocusIn:
1287 if (!TermWin.focus) { 1294 if (!TermWin.focus)
1295 {
1288 TermWin.focus = 1; 1296 TermWin.focus = 1;
1289 want_refresh = 1; 1297 want_refresh = 1;
1290#ifdef USE_XIM 1298#ifdef USE_XIM
1291 if (Input_Context != NULL) 1299 if (Input_Context != NULL)
1292 XSetICFocus(Input_Context); 1300 XSetICFocus(Input_Context);
1293#endif 1301#endif
1294#ifdef CURSOR_BLINK 1302#ifdef CURSOR_BLINK
1295 if (Options & Opt_cursorBlink) 1303 if (Options & Opt_cursorBlink)
1296 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1297#endif 1305#endif
1298 }
1299 break;
1300 1306
1307 }
1308 break;
1309
1301 case FocusOut: 1310 case FocusOut:
1302 if (TermWin.focus) { 1311 if (TermWin.focus)
1312 {
1303 TermWin.focus = 0; 1313 TermWin.focus = 0;
1304 want_refresh = 1; 1314 want_refresh = 1;
1305#ifdef USE_XIM 1315#ifdef USE_XIM
1306 if (Input_Context != NULL) 1316 if (Input_Context != NULL)
1307 XUnsetICFocus(Input_Context); 1317 XUnsetICFocus(Input_Context);
1308#endif 1318#endif
1309#ifdef CURSOR_BLINK 1319#ifdef CURSOR_BLINK
1310 if (Options & Opt_cursorBlink) 1320 if (Options & Opt_cursorBlink)
1311 cursor_blink_ev.stop (); 1321 cursor_blink_ev.stop ();
1312 hidden_cursor = 0; 1322 hidden_cursor = 0;
1313#endif 1323#endif
1314 }
1315 break;
1316 1324
1325 }
1326 break;
1327
1317 case ConfigureNotify: 1328 case ConfigureNotify:
1318 if (ev->xconfigure.window == TermWin.parent[0]) { 1329 if (ev.xconfigure.window == TermWin.parent[0])
1319 int height, width; 1330 {
1331 int height, width;
1320 1332
1333 do
1321 do { /* Wrap lots of configures into one */ 1334 { /* Wrap lots of configures into one */
1322 width = ev->xconfigure.width; 1335 width = ev.xconfigure.width;
1323 height = ev->xconfigure.height; 1336 height = ev.xconfigure.height;
1324 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1337 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1325 } while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1338 }
1326 ConfigureNotify, ev)); 1339 while (XCheckTypedWindowEvent(display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1340
1327 if (szHint.width != width || szHint.height != height) { 1341 if (szHint.width != width || szHint.height != height)
1342 {
1328 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1343 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1329 resize_all_windows (width, height, 1); 1344 resize_all_windows (width, height, 1);
1330 } 1345 }
1331#ifdef DEBUG_SIZE 1346#ifdef DEBUG_SIZE
1332 else { 1347 else
1348 {
1333 D_SIZE((stderr, "Size: Not resizing")); 1349 D_SIZE((stderr, "Size: Not resizing"));
1334 } 1350 }
1335#endif 1351#endif
1336#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1337 if (Options & Opt_transparent) { 1353 if (Options & Opt_transparent)
1338 check_our_parents (); 1354 {
1339 if (am_transparent) 1355 check_our_parents ();
1356 if (am_transparent)
1340 want_full_refresh = 1; 1357 want_full_refresh = 1;
1341 } 1358 }
1342#endif 1359#endif
1343 }
1344 break;
1345 1360
1361 }
1362 break;
1363
1346 case SelectionClear: 1364 case SelectionClear:
1347 selection_clear (); 1365 selection_clear ();
1348 break; 1366 break;
1349 1367
1350 case SelectionNotify: 1368 case SelectionNotify:
1351 if (selection_wait == Sel_normal) 1369 if (selection_wait == Sel_normal)
1352 selection_paste (ev->xselection.requestor, 1370 selection_paste (ev.xselection.requestor,
1353 ev->xselection.property, True); 1371 ev.xselection.property, True);
1354 break; 1372 break;
1355 1373
1356 case SelectionRequest: 1374 case SelectionRequest:
1357 selection_send (&(ev->xselectionrequest)); 1375 selection_send (ev.xselectionrequest);
1358 break; 1376 break;
1359 1377
1360 case UnmapNotify: 1378 case UnmapNotify:
1361 TermWin.mapped = 0; 1379 TermWin.mapped = 0;
1362#ifdef TEXT_BLINK 1380#ifdef TEXT_BLINK
1363 text_blink_ev.stop (); 1381 text_blink_ev.stop ();
1364#endif 1382#endif
1365 break; 1383 break;
1366 1384
1367 case MapNotify: 1385 case MapNotify:
1368 TermWin.mapped = 1; 1386 TermWin.mapped = 1;
1369#ifdef TEXT_BLINK 1387#ifdef TEXT_BLINK
1370 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1388 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1371#endif 1389#endif
1372 break; 1390 break;
1373 1391
1374 case PropertyNotify: 1392 case PropertyNotify:
1375 if (ev->xproperty.atom == xa[XA_VT_SELECTION]) { 1393 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1376 if (ev->xproperty.state == PropertyNewValue) 1394 if (ev.xproperty.state == PropertyNewValue)
1377 selection_property (ev->xproperty.window, 1395 selection_property (ev.xproperty.window, ev.xproperty.atom);
1378 ev->xproperty.atom);
1379 break; 1396 break;
1380 } 1397
1381#ifdef TRANSPARENT 1398#ifdef TRANSPARENT
1382 /*
1383 * if user used some Esetroot compatible prog to set the root bg,
1384 * use the property to determine the pixmap. We use it later on.
1385 */
1386 if (xa[XA_XROOTPMAPID] == 0)
1387 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1388 "_XROOTPMAP_ID", False);
1389 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1390 break;
1391 /* FALLTHROUGH */
1392 case ReparentNotify: 1399 case ReparentNotify:
1393 if ((Options & Opt_transparent) && check_our_parents ()) { 1400 rootwin_cb (ev);
1394 if (am_transparent) 1401 break;
1395 want_full_refresh = 1;
1396 }
1397#endif /* TRANSPARENT */ 1402#endif /* TRANSPARENT */
1398 break;
1399 1403
1400 case GraphicsExpose: 1404 case GraphicsExpose:
1401 case Expose: 1405 case Expose:
1402 if (ev->xany.window == TermWin.vt) { 1406 if (ev.xany.window == TermWin.vt)
1407 {
1403#ifdef NO_SLOW_LINK_SUPPORT 1408#ifdef NO_SLOW_LINK_SUPPORT
1404 scr_expose (ev->xexpose.x, ev->xexpose.y, 1409 scr_expose (ev.xexpose.x, ev.xexpose.y,
1405 ev->xexpose.width, ev->xexpose.height, False); 1410 ev.xexpose.width, ev.xexpose.height, False);
1406#else 1411#else
1407 // don't understand this, so commented it out 1412 // don't understand this, so commented it out
1408 scr_expose (ev->xexpose.x, ev->xexpose.y, 1413 scr_expose (ev.xexpose.x, ev.xexpose.y,
1409 ev->xexpose.width, ev->xexpose.height, False); 1414 ev.xexpose.width, ev.xexpose.height, False);
1410 //scr_expose (ev->xexpose.x, 0, 1415 //scr_expose (ev.xexpose.x, 0,
1411 // ev->xexpose.width, TermWin.height, False); 1416 // ev.xexpose.width, TermWin.height, False);
1412#endif 1417#endif
1413 want_refresh = 1; 1418 want_refresh = 1;
1414 } else { 1419 }
1415 XEvent unused_xevent; 1420 else
1421 {
1422 XEvent unused_event;
1416 1423
1417 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1424 while (XCheckTypedWindowEvent(display->display, ev.xany.window,
1418 Expose, 1425 Expose,
1419 &unused_xevent)) ; 1426 &unused_event)) ;
1420 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1427 while (XCheckTypedWindowEvent(display->display, ev.xany.window,
1421 GraphicsExpose, 1428 GraphicsExpose,
1422 &unused_xevent)) ; 1429 &unused_event)) ;
1423 if (isScrollbarWindow(ev->xany.window)) { 1430 if (isScrollbarWindow(ev.xany.window))
1424 scrollBar.setIdle(); 1431 {
1425 scrollbar_show (0); 1432 scrollBar.setIdle();
1426 } 1433 scrollbar_show (0);
1434 }
1427#ifdef MENUBAR 1435#ifdef MENUBAR
1428 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1436 if (menubar_visible () && isMenuBarWindow(ev.xany.window))
1429 menubar_expose (); 1437 menubar_expose ();
1430#endif 1438#endif
1431#ifdef RXVT_GRAPHICS 1439#ifdef RXVT_GRAPHICS
1432 Gr_expose (ev->xany.window); 1440 Gr_expose (ev.xany.window);
1433#endif 1441#endif
1434 }
1435 break;
1436 1442
1443 }
1444 break;
1445
1437 case MotionNotify: 1446 case MotionNotify:
1438#ifdef POINTER_BLANK 1447#ifdef POINTER_BLANK
1439 if (hidden_pointer) 1448 if (hidden_pointer)
1440 pointer_unblank (); 1449 pointer_unblank ();
1441#endif 1450#endif
1442#if MENUBAR 1451#if MENUBAR
1443 if (isMenuBarWindow(ev->xany.window)) { 1452 if (isMenuBarWindow(ev.xany.window))
1453 {
1444 menubar_control (&(ev->xbutton)); 1454 menubar_control (&(ev.xbutton));
1445 break; 1455 break;
1446 } 1456 }
1447#endif 1457#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1458 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate))
1449 break; 1459 break;
1450 1460
1451 if (ev->xany.window == TermWin.vt) { 1461 if (ev.xany.window == TermWin.vt)
1462 {
1452 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1463 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1453 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1464 {
1454 MotionNotify, ev)) ; 1465 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1455 XQueryPointer(Xdisplay, TermWin.vt, 1466 ;
1456 &unused_root, &unused_child, 1467
1457 &unused_root_x, &unused_root_y, 1468 XQueryPointer(display->display, TermWin.vt,
1458 &(ev->xbutton.x), &(ev->xbutton.y), 1469 &unused_root, &unused_child,
1459 &unused_mask); 1470 &unused_root_x, &unused_root_y,
1471 &(ev.xbutton.x), &(ev.xbutton.y),
1472 &unused_mask);
1460#ifdef MOUSE_THRESHOLD 1473#ifdef MOUSE_THRESHOLD
1461 /* deal with a `jumpy' mouse */ 1474 /* deal with a `jumpy' mouse */
1462 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) { 1475 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1476 {
1463#endif 1477#endif
1464 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1478 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1465 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1479 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1466#ifdef SELECTION_SCROLLING 1480#ifdef SELECTION_SCROLLING
1467 if (ev->xbutton.y < TermWin.int_bwidth 1481 if (ev.xbutton.y < TermWin.int_bwidth
1468 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) { 1482 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1))
1469 int dist;
1470
1471 pending_scroll_selection=1;
1472
1473 /* don't clobber the current delay if we are
1474 * already in the middle of scrolling.
1475 */
1476 if (scroll_selection_delay<=0)
1477 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1478
1479 /* save the event params so we can highlight
1480 * the selection in the pending-scroll loop
1481 */
1482 selection_save_x=ev->xbutton.x;
1483 selection_save_y=ev->xbutton.y;
1484 selection_save_state=
1485 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1486
1487 /* calc number of lines to scroll */
1488 if (ev->xbutton.y<TermWin.int_bwidth) {
1489 scroll_selection_dir = UP;
1490 dist = TermWin.int_bwidth - ev->xbutton.y;
1491 }
1492 else {
1493 scroll_selection_dir = DN;
1494 dist = ev->xbutton.y -
1495 (TermWin.int_bwidth + TermWin.height);
1496 }
1497 scroll_selection_lines=(Pixel2Height(dist)/
1498 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1499 MIN_IT(scroll_selection_lines,
1500 SELECTION_SCROLL_MAX_LINES);
1501 }
1502 else {
1503 /* we are within the text window, so we
1504 * shouldn't be scrolling
1505 */
1506 pending_scroll_selection = 0;
1507 }
1508#endif
1509#ifdef MOUSE_THRESHOLD
1510 }
1511#endif
1512 }
1513 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1514 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win,
1515 MotionNotify, ev)) ;
1516 XQueryPointer(Xdisplay, scrollBar.win,
1517 &unused_root, &unused_child,
1518 &unused_root_x, &unused_root_y,
1519 &(ev->xbutton.x), &(ev->xbutton.y),
1520 &unused_mask);
1521 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO,
1522 scrollbar_size());
1523 scr_refresh (refresh_type);
1524 refresh_limit = 0;
1525 scrollbar_show (1);
1526 }
1527 break;
1528 }
1529}
1530
1531void
1532rxvt_term::button_press (XButtonEvent *ev)
1533{
1534 int reportmode = 0, clickintime;
1535
1536 bypass_keystate = ev->state & (ModMetaMask | ShiftMask);
1537 if (!bypass_keystate)
1538 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1539/*
1540 * VT window processing of button press
1541 */
1542 if (ev->window == TermWin.vt)
1543 {
1544#if RXVT_GRAPHICS
1545 if (ev->subwindow != None)
1546 rxvt_Gr_ButtonPress (ev->x, ev->y);
1547 else
1548#endif
1549 {
1550 clickintime = ev->time - MEvent.time < MULTICLICK_TIME;
1551 if (reportmode)
1552 {
1553 /* mouse report from vt window */
1554 /* save the xbutton state (for ButtonRelease) */
1555 MEvent.state = ev->state;
1556#ifdef MOUSE_REPORT_DOUBLECLICK
1557 if (ev->button == MEvent.button && clickintime)
1558 {
1559 /* same button, within alloted time */
1560 MEvent.clicks++;
1561 if (MEvent.clicks > 1)
1562 { 1483 {
1563 /* only report double clicks */ 1484 int dist;
1564 MEvent.clicks = 2;
1565 mouse_report (ev);
1566 1485
1567 /* don't report the release */ 1486 pending_scroll_selection=1;
1568 MEvent.clicks = 0; 1487
1569 MEvent.button = AnyButton; 1488 /* don't clobber the current delay if we are
1570 } 1489 * already in the middle of scrolling.
1571 }
1572 else
1573 { 1490 */
1574 /* different button, or time expired */ 1491 if (scroll_selection_delay<=0)
1575 MEvent.clicks = 1; 1492 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1576 MEvent.button = ev->button; 1493
1577 mouse_report (ev); 1494 /* save the event params so we can highlight
1578 } 1495 * the selection in the pending-scroll loop
1579#else
1580 MEvent.button = ev->button;
1581 mouse_report (ev);
1582#endif /* MOUSE_REPORT_DOUBLECLICK */
1583 }
1584 else
1585 {
1586 if (ev->button != MEvent.button)
1587 MEvent.clicks = 0;
1588 switch (ev->button)
1589 { 1496 */
1590 case Button1: 1497 selection_save_x=ev.xbutton.x;
1591 /* allow shift+left click to extend selection */ 1498 selection_save_y=ev.xbutton.y;
1592 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1499 selection_save_state=
1500 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1501
1502 /* calc number of lines to scroll */
1503 if (ev.xbutton.y<TermWin.int_bwidth)
1593 { 1504 {
1594 if (MEvent.button == Button1 && clickintime) 1505 scroll_selection_dir = UP;
1595 selection_rotate (ev->x, ev->y); 1506 dist = TermWin.int_bwidth - ev.xbutton.y;
1596 else
1597 selection_extend (ev->x, ev->y, 1);
1598 } 1507 }
1599 else 1508 else
1600 { 1509 {
1601 if (MEvent.button == Button1 && clickintime) 1510 scroll_selection_dir = DN;
1602 MEvent.clicks++; 1511 dist = ev.xbutton.y -
1603 else 1512 (TermWin.int_bwidth + TermWin.height);
1604 MEvent.clicks = 1;
1605
1606 selection_click (MEvent.clicks, ev->x, ev->y);
1607 } 1513 }
1514 scroll_selection_lines=(Pixel2Height(dist)/
1515 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1516 MIN_IT(scroll_selection_lines,
1517 SELECTION_SCROLL_MAX_LINES);
1518 }
1519 else
1520 {
1521 /* we are within the text window, so we
1522 * shouldn't be scrolling
1523 */
1524 pending_scroll_selection = 0;
1525 }
1526#endif
1527#ifdef MOUSE_THRESHOLD
1608 1528
1529 }
1530#endif
1531
1532 }
1533 }
1534 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion())
1535 {
1536 while (XCheckTypedWindowEvent(display->display, scrollBar.win,
1537 MotionNotify, &ev)) ;
1538 XQueryPointer(display->display, scrollBar.win,
1539 &unused_root, &unused_child,
1540 &unused_root_x, &unused_root_y,
1541 &(ev.xbutton.x), &(ev.xbutton.y),
1542 &unused_mask);
1543 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO,
1544 scrollbar_size());
1545 scr_refresh (refresh_type);
1546 refresh_limit = 0;
1547 scrollbar_show (1);
1548 }
1549 break;
1550 }
1551}
1552
1553void
1554rxvt_term::rootwin_cb (XEvent &ev)
1555{
1556 SET_R (this);
1557 SET_LOCALE (locale);
1558
1559 if (ev.type == PropertyNotify)
1560 {
1561 /*
1562 * if user used some Esetroot compatible prog to set the root bg,
1563 * use the property to determine the pixmap. We use it later on.
1564 */
1565 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False);
1567
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return;
1570 }
1571
1572 if ((Options & Opt_transparent) && check_our_parents ())
1573 {
1574 if (am_transparent)
1575 want_full_refresh = 1;
1576 }
1577}
1578
1579void
1580rxvt_term::button_press (const XButtonEvent &ev)
1581{
1582 int reportmode = 0, clickintime;
1583
1584 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1585 if (!bypass_keystate)
1586 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1587 /*
1588 * VT window processing of button press
1589 */
1590 if (ev.window == TermWin.vt)
1591 {
1592#if RXVT_GRAPHICS
1593 if (ev.subwindow != None)
1594 rxvt_Gr_ButtonPress (ev.x, ev.y);
1595 else
1596#endif
1597
1598 {
1599 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1600 if (reportmode)
1601 {
1602 /* mouse report from vt window */
1603 /* save the xbutton state (for ButtonRelease) */
1604 MEvent.state = ev.state;
1605#ifdef MOUSE_REPORT_DOUBLECLICK
1606 if (ev.button == MEvent.button && clickintime)
1607 {
1608 /* same button, within alloted time */
1609 MEvent.clicks++;
1610 if (MEvent.clicks > 1)
1611 {
1612 /* only report double clicks */
1613 MEvent.clicks = 2;
1614 mouse_report (ev);
1615
1616 /* don't report the release */
1617 MEvent.clicks = 0;
1618 MEvent.button = AnyButton;
1619 }
1620 }
1621 else
1622 {
1623 /* different button, or time expired */
1624 MEvent.clicks = 1;
1625 MEvent.button = ev.button;
1626 mouse_report (ev);
1627 }
1628#else
1629 MEvent.button = ev.button;
1630 mouse_report (ev);
1631#endif /* MOUSE_REPORT_DOUBLECLICK */
1632
1633 }
1634 else
1635 {
1636 if (ev.button != MEvent.button)
1637 MEvent.clicks = 0;
1638 switch (ev.button)
1639 {
1640 case Button1:
1641 /* allow shift+left click to extend selection */
1642 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report))
1643 {
1644 if (MEvent.button == Button1 && clickintime)
1645 selection_rotate (ev.x, ev.y);
1646 else
1647 selection_extend (ev.x, ev.y, 1);
1648 }
1649 else
1650 {
1651 if (MEvent.button == Button1 && clickintime)
1652 MEvent.clicks++;
1653 else
1654 MEvent.clicks = 1;
1655
1656 selection_click (MEvent.clicks, ev.x, ev.y);
1657 }
1658
1609 MEvent.button = Button1; 1659 MEvent.button = Button1;
1660 break;
1661
1662 case Button3:
1663 if (MEvent.button == Button3 && clickintime)
1664 selection_rotate (ev.x, ev.y);
1665 else
1666 selection_extend (ev.x, ev.y, 1);
1667 MEvent.button = Button3;
1668 break;
1669 }
1670 }
1671 MEvent.time = ev.time;
1672 return;
1673 }
1674 }
1675
1676 /*
1677 * Scrollbar window processing of button press
1678 */
1679 if (isScrollbarWindow(ev.window))
1680 {
1681 scrollBar.setIdle ();
1682 /*
1683 * Rxvt-style scrollbar:
1684 * move up if mouse is above slider
1685 * move dn if mouse is below slider
1686 *
1687 * XTerm-style scrollbar:
1688 * Move display proportional to pointer location
1689 * pointer near top -> scroll one line
1690 * pointer near bot -> scroll full page
1691 */
1692#ifndef NO_SCROLLBAR_REPORT
1693 if (reportmode)
1694 {
1695 /*
1696 * Mouse report disabled scrollbar:
1697 * arrow buttons - send up/down
1698 * click on scrollbar - send pageup/down
1699 */
1700 if ((scrollBar.style == R_SB_NEXT
1701 && scrollbarnext_upButton(ev.y))
1702 || (scrollBar.style == R_SB_RXVT
1703 && scrollbarrxvt_upButton(ev.y)))
1704 tt_printf("\033[A");
1705 else if ((scrollBar.style == R_SB_NEXT
1706 && scrollbarnext_dnButton(ev.y))
1707 || (scrollBar.style == R_SB_RXVT
1708 && scrollbarrxvt_dnButton(ev.y)))
1709 tt_printf("\033[B");
1710 else
1711 switch (ev.button)
1712 {
1713 case Button2:
1714 tt_printf("\014");
1715 break;
1716 case Button1:
1717 tt_printf("\033[6~");
1718 break;
1719 case Button3:
1720 tt_printf("\033[5~");
1721 break;
1722 }
1723 }
1724 else
1725#endif /* NO_SCROLLBAR_REPORT */
1726
1727 {
1728 char upordown = 0;
1729
1730 if (scrollBar.style == R_SB_NEXT)
1731 {
1732 if (scrollbarnext_upButton(ev.y))
1733 upordown = -1; /* up */
1734 else if (scrollbarnext_dnButton(ev.y))
1735 upordown = 1; /* down */
1736 }
1737 else if (scrollBar.style == R_SB_RXVT)
1738 {
1739 if (scrollbarrxvt_upButton(ev.y))
1740 upordown = -1; /* up */
1741 else if (scrollbarrxvt_dnButton(ev.y))
1742 upordown = 1; /* down */
1743 }
1744 if (upordown)
1745 {
1746#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1747 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1748#endif
1749 if (scr_page (upordown < 0 ? UP : DN, 1))
1750 {
1751 if (upordown < 0)
1752 scrollBar.setUp ();
1753 else
1754 scrollBar.setDn ();
1755 }
1756 }
1757 else
1758 switch (ev.button)
1759 {
1760 case Button2:
1761 switch (scrollbar_align)
1762 {
1763 case R_SB_ALIGN_TOP:
1764 csrO = 0;
1610 break; 1765 break;
1611 1766 case R_SB_ALIGN_CENTRE:
1612 case Button3: 1767 csrO = (scrollBar.bot - scrollBar.top) / 2;
1613 if (MEvent.button == Button3 && clickintime)
1614 selection_rotate (ev->x, ev->y);
1615 else
1616 selection_extend (ev->x, ev->y, 1);
1617 MEvent.button = Button3;
1618 break; 1768 break;
1769 case R_SB_ALIGN_BOTTOM:
1770 csrO = scrollBar.bot - scrollBar.top;
1771 break;
1772 }
1773 if (scrollBar.style == R_SB_XTERM
1774 || scrollbar_above_slider(ev.y)
1775 || scrollbar_below_slider(ev.y))
1776 scr_move_to ( scrollbar_position(ev.y) - csrO,
1777 scrollbar_size());
1778 scrollBar.setMotion ();
1779 break;
1780
1781 case Button1:
1782 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1783 csrO = ev.y - scrollBar.top;
1784 /* FALLTHROUGH */
1785
1786 case Button3:
1787 if (scrollBar.style != R_SB_XTERM)
1788 {
1789 if (scrollbar_above_slider(ev.y))
1790# ifdef RXVT_SCROLL_FULL
1791 scr_page (UP, TermWin.nrow - 1);
1792# else
1793 scr_page (UP, TermWin.nrow / 4);
1794# endif
1795 else if (scrollbar_below_slider(ev.y))
1796# ifdef RXVT_SCROLL_FULL
1797 scr_page (DN, TermWin.nrow - 1);
1798# else
1799 scr_page (DN, TermWin.nrow / 4);
1800# endif
1801 else
1802 scrollBar.setMotion ();
1803 }
1804 else
1805 {
1806 scr_page ((ev.button == Button1 ? DN : UP),
1807 (TermWin.nrow
1808 * scrollbar_position(ev.y)
1809 / scrollbar_size()));
1810 }
1811 break;
1812 }
1619 } 1813 }
1620 }
1621 MEvent.time = ev->time;
1622 return; 1814 return;
1623 }
1624 }
1625
1626/*
1627 * Scrollbar window processing of button press
1628 */
1629 if (isScrollbarWindow(ev->window))
1630 {
1631 scrollBar.setIdle ();
1632 /*
1633 * Rxvt-style scrollbar:
1634 * move up if mouse is above slider
1635 * move dn if mouse is below slider
1636 *
1637 * XTerm-style scrollbar:
1638 * Move display proportional to pointer location
1639 * pointer near top -> scroll one line
1640 * pointer near bot -> scroll full page
1641 */
1642#ifndef NO_SCROLLBAR_REPORT
1643 if (reportmode) {
1644 /*
1645 * Mouse report disabled scrollbar:
1646 * arrow buttons - send up/down
1647 * click on scrollbar - send pageup/down
1648 */
1649 if ((scrollBar.style == R_SB_NEXT
1650 && scrollbarnext_upButton(ev->y))
1651 || (scrollBar.style == R_SB_RXVT
1652 && scrollbarrxvt_upButton(ev->y)))
1653 tt_printf("\033[A");
1654 else if ((scrollBar.style == R_SB_NEXT
1655 && scrollbarnext_dnButton(ev->y))
1656 || (scrollBar.style == R_SB_RXVT
1657 && scrollbarrxvt_dnButton(ev->y)))
1658 tt_printf("\033[B");
1659 else
1660 switch (ev->button) {
1661 case Button2:
1662 tt_printf("\014");
1663 break;
1664 case Button1:
1665 tt_printf("\033[6~");
1666 break;
1667 case Button3:
1668 tt_printf("\033[5~");
1669 break;
1670 }
1671 }
1672 else
1673#endif /* NO_SCROLLBAR_REPORT */
1674 {
1675 char upordown = 0;
1676
1677 if (scrollBar.style == R_SB_NEXT) {
1678 if (scrollbarnext_upButton(ev->y))
1679 upordown = -1; /* up */
1680 else if (scrollbarnext_dnButton(ev->y))
1681 upordown = 1; /* down */
1682 } else if (scrollBar.style == R_SB_RXVT) {
1683 if (scrollbarrxvt_upButton(ev->y))
1684 upordown = -1; /* up */
1685 else if (scrollbarrxvt_dnButton(ev->y))
1686 upordown = 1; /* down */
1687 } 1815 }
1688 if (upordown) { 1816#if MENUBAR
1817 /*
1818 * Menubar window processing of button press
1819 */
1820 if (isMenuBarWindow(ev.window))
1821 menubar_control (ev);
1822#endif
1823}
1824
1825void
1826rxvt_term::button_release (const XButtonEvent &ev)
1827{
1828 int reportmode = 0;
1829
1830 csrO = 0; /* reset csr Offset */
1831 if (!bypass_keystate)
1832 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1833
1834 if (scrollbar_isUpDn())
1835 {
1836 scrollBar.setIdle ();
1837 scrollbar_show (0);
1689#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1838#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1690 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1839 refresh_type &= ~SMOOTH_REFRESH;
1691#endif
1692 if (scr_page (upordown < 0 ? UP : DN, 1)) {
1693 if (upordown < 0)
1694 scrollBar.setUp ();
1695 else
1696 scrollBar.setDn ();
1697 }
1698 } else
1699 switch (ev->button) {
1700 case Button2:
1701 switch (scrollbar_align) {
1702 case R_SB_ALIGN_TOP:
1703 csrO = 0;
1704 break;
1705 case R_SB_ALIGN_CENTRE:
1706 csrO = (scrollBar.bot - scrollBar.top) / 2;
1707 break;
1708 case R_SB_ALIGN_BOTTOM:
1709 csrO = scrollBar.bot - scrollBar.top;
1710 break;
1711 }
1712 if (scrollBar.style == R_SB_XTERM
1713 || scrollbar_above_slider(ev->y)
1714 || scrollbar_below_slider(ev->y))
1715 scr_move_to ( scrollbar_position(ev->y) - csrO,
1716 scrollbar_size());
1717 scrollBar.setMotion ();
1718 break;
1719
1720 case Button1:
1721 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1722 csrO = ev->y - scrollBar.top;
1723 /* FALLTHROUGH */
1724
1725 case Button3:
1726 if (scrollBar.style != R_SB_XTERM) {
1727 if (scrollbar_above_slider(ev->y))
1728# ifdef RXVT_SCROLL_FULL
1729 scr_page (UP, TermWin.nrow - 1);
1730# else
1731 scr_page (UP, TermWin.nrow / 4);
1732# endif 1840#endif
1733 else if (scrollbar_below_slider(ev->y))
1734# ifdef RXVT_SCROLL_FULL
1735 scr_page (DN, TermWin.nrow - 1);
1736# else
1737 scr_page (DN, TermWin.nrow / 4);
1738# endif
1739 else
1740 scrollBar.setMotion ();
1741 } else {
1742 scr_page ((ev->button == Button1 ? DN : UP),
1743 (TermWin.nrow
1744 * scrollbar_position(ev->y)
1745 / scrollbar_size()));
1746 }
1747 break;
1748 }
1749 }
1750 return;
1751 }
1752#if MENUBAR
1753 /*
1754 * Menubar window processing of button press
1755 */
1756 if (isMenuBarWindow(ev->window))
1757 menubar_control (ev);
1758#endif
1759}
1760 1841
1761void
1762rxvt_term::button_release (XButtonEvent *ev)
1763{
1764 int reportmode = 0;
1765
1766 csrO = 0; /* reset csr Offset */
1767 if (!bypass_keystate)
1768 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1769
1770 if (scrollbar_isUpDn()) {
1771 scrollBar.setIdle ();
1772 scrollbar_show (0);
1773#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1774 refresh_type &= ~SMOOTH_REFRESH;
1775#endif
1776 } 1842 }
1777#ifdef SELECTION_SCROLLING 1843#ifdef SELECTION_SCROLLING
1778 pending_scroll_selection=0; 1844 pending_scroll_selection=0;
1779#endif 1845#endif
1780 if (ev->window == TermWin.vt) 1846 if (ev.window == TermWin.vt)
1781 { 1847 {
1782#ifdef RXVT_GRAPHICS 1848#ifdef RXVT_GRAPHICS
1783 if (ev->subwindow != None) 1849 if (ev.subwindow != None)
1784 rxvt_Gr_ButtonRelease(ev->x, ev->y); 1850 rxvt_Gr_ButtonRelease(ev.x, ev.y);
1785 else 1851 else
1786#endif 1852#endif
1853
1787 { 1854 {
1788 if (reportmode) 1855 if (reportmode)
1789 { 1856 {
1790 /* mouse report from vt window */ 1857 /* mouse report from vt window */
1791 /* don't report release of wheel "buttons" */ 1858 /* don't report release of wheel "buttons" */
1792 if (ev->button >= 4) 1859 if (ev.button >= 4)
1793 return; 1860 return;
1794#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1795 /* only report the release of 'slow' single clicks */ 1862 /* only report the release of 'slow' single clicks */
1796 if (MEvent.button != AnyButton 1863 if (MEvent.button != AnyButton
1797 && (ev->button != MEvent.button 1864 && (ev.button != MEvent.button
1798 || (ev->time - MEvent.time 1865 || (ev.time - MEvent.time
1799 > MULTICLICK_TIME / 2))) 1866 > MULTICLICK_TIME / 2)))
1800 { 1867 {
1801 MEvent.clicks = 0; 1868 MEvent.clicks = 0;
1802 MEvent.button = AnyButton; 1869 MEvent.button = AnyButton;
1803 mouse_report (ev); 1870 mouse_report (ev);
1804 } 1871 }
1805#else /* MOUSE_REPORT_DOUBLECLICK */ 1872#else /* MOUSE_REPORT_DOUBLECLICK */
1806 MEvent.button = AnyButton; 1873 MEvent.button = AnyButton;
1807 mouse_report (ev); 1874 mouse_report (ev);
1808#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1809 return; 1876 return;
1810 } 1877 }
1811 /* 1878 /*
1812 * dumb hack to compensate for the failure of click-and-drag 1879 * dumb hack to compensate for the failure of click-and-drag
1813 * when overriding mouse reporting 1880 * when overriding mouse reporting
1814 */ 1881 */
1815 if (PrivateModes & PrivMode_mouse_report 1882 if (PrivateModes & PrivMode_mouse_report
1816 && bypass_keystate 1883 && bypass_keystate
1817 && ev->button == Button1 && MEvent.clicks <= 1) 1884 && ev.button == Button1 && MEvent.clicks <= 1)
1818 selection_extend (ev->x, ev->y, 0); 1885 selection_extend (ev.x, ev.y, 0);
1819 1886
1820 switch (ev->button) { 1887 switch (ev.button)
1888 {
1821 case Button1: 1889 case Button1:
1822 case Button3: 1890 case Button3:
1823 selection_make (ev->time); 1891 selection_make (ev.time);
1824 break; 1892 break;
1825 case Button2: 1893 case Button2:
1826 selection_request (ev->time, ev->x, ev->y); 1894 selection_request (ev.time, ev.x, ev.y);
1827 break; 1895 break;
1828#ifdef MOUSE_WHEEL 1896#ifdef MOUSE_WHEEL
1829 case Button4: 1897 case Button4:
1830 case Button5: 1898 case Button5:
1831 { 1899 {
1832 int i; 1900 int i;
1833 page_dirn v; 1901 page_dirn v;
1834 1902
1835 v = (ev->button == Button4) ? UP : DN; 1903 v = (ev.button == Button4) ? UP : DN;
1836 if (ev->state & ShiftMask) 1904 if (ev.state & ShiftMask)
1837 i = 1; 1905 i = 1;
1838 else if ((Options & Opt_mouseWheelScrollPage)) 1906 else if ((Options & Opt_mouseWheelScrollPage))
1839 i = TermWin.nrow - 1; 1907 i = TermWin.nrow - 1;
1840 else 1908 else
1841 i = 5; 1909 i = 5;
1842# ifdef MOUSE_SLIP_WHEELING 1910# ifdef MOUSE_SLIP_WHEELING
1843 if (ev->state & ControlMask) 1911 if (ev.state & ControlMask)
1844 { 1912 {
1845 mouse_slip_wheel_speed += (v ? -1 : 1); 1913 mouse_slip_wheel_speed += (v ? -1 : 1);
1846 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1914 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1847 } 1915 }
1848# endif 1916# endif
1849# ifdef JUMP_MOUSE_WHEEL 1917# ifdef JUMP_MOUSE_WHEEL
1850 scr_page (v, i); 1918 scr_page (v, i);
1851 scr_refresh (SMOOTH_REFRESH); 1919 scr_refresh (SMOOTH_REFRESH);
1852 scrollbar_show (1); 1920 scrollbar_show (1);
1853# else 1921# else
1854 while (i--) 1922 while (i--)
1855 { 1923 {
1856 scr_page (v, 1); 1924 scr_page (v, 1);
1857 scr_refresh (SMOOTH_REFRESH); 1925 scr_refresh (SMOOTH_REFRESH);
1858 scrollbar_show (1); 1926 scrollbar_show (1);
1859 } 1927 }
1860# endif 1928# endif
1861 } 1929
1862 break; 1930 }
1931 break;
1863#endif 1932#endif
1864 } 1933
1865 } 1934 }
1866 } 1935 }
1936 }
1867#ifdef MENUBAR 1937#ifdef MENUBAR
1868 else if (isMenuBarWindow(ev->window)) 1938 else if (isMenuBarWindow(ev.window))
1869 menubar_control (ev); 1939 menubar_control (ev);
1870#endif 1940#endif
1871} 1941}
1872 1942
1873 1943
1874#ifdef TRANSPARENT 1944#ifdef TRANSPARENT
… …
1877 * Do transparency updates if required 1947 * Do transparency updates if required
1878 */ 1948 */
1879int 1949int
1880rxvt_term::check_our_parents () 1950rxvt_term::check_our_parents ()
1881{ 1951{
1882 int i, pchanged, aformat, have_pixmap, rootdepth; 1952 int i, pchanged, aformat, have_pixmap, rootdepth;
1883 unsigned long nitems, bytes_after; 1953 unsigned long nitems, bytes_after;
1884 Atom atype; 1954 Atom atype;
1885 unsigned char *prop = NULL; 1955 unsigned char *prop = NULL;
1886 Window root, oldp, *list; 1956 Window root, oldp, *list;
1887 Pixmap rootpixmap = None; 1957 Pixmap rootpixmap = None;
1888 XWindowAttributes wattr, wrootattr; 1958 XWindowAttributes wattr, wrootattr;
1889 1959
1890 pchanged = 0; 1960 pchanged = 0;
1891 1961
1892 if (!(Options & Opt_transparent)) 1962 if (!(Options & Opt_transparent))
1893 return pchanged; /* Don't try any more */ 1963 return pchanged; /* Don't try any more */
1894 1964
1895 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1965 XGetWindowAttributes(display->display, display->root, &wrootattr);
1896 rootdepth = wrootattr.depth; 1966 rootdepth = wrootattr.depth;
1897 1967
1898 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1968 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
1899 if (rootdepth != wattr.depth) { 1969 if (rootdepth != wattr.depth)
1970 {
1900 if (am_transparent) { 1971 if (am_transparent)
1972 {
1901 pchanged = 1; 1973 pchanged = 1;
1902 XSetWindowBackground(Xdisplay, TermWin.vt, 1974 XSetWindowBackground(display->display, TermWin.vt,
1903 PixColors[Color_bg]); 1975 PixColors[Color_bg]);
1904 am_transparent = am_pixmap_trans = 0; 1976 am_transparent = am_pixmap_trans = 0;
1905 } 1977 }
1906 return pchanged; /* Don't try any more */ 1978 return pchanged; /* Don't try any more */
1907 } 1979 }
1908 1980
1909/* Get all X ops out of the queue so that our information is up-to-date. */ 1981 /* Get all X ops out of the queue so that our information is up-to-date. */
1910 XSync(Xdisplay, False); 1982 XSync(display->display, False);
1911 1983
1912/* 1984 /*
1913 * Make the frame window set by the window manager have 1985 * Make the frame window set by the window manager have
1914 * the root background. Some window managers put multiple nested frame 1986 * the root background. Some window managers put multiple nested frame
1915 * windows for each client, so we have to take care about that. 1987 * windows for each client, so we have to take care about that.
1916 */ 1988 */
1917 i = (xa[XA_XROOTPMAPID] != 0 1989 i = (xa[XA_XROOTPMAPID] != 0
1918 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1990 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID],
1919 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1991 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1920 &nitems, &bytes_after, &prop) == Success)); 1992 &nitems, &bytes_after, &prop) == Success));
1921 if (!i || prop == NULL) 1993 if (!i || prop == NULL)
1922 have_pixmap = 0; 1994 have_pixmap = 0;
1923 else { 1995 else
1996 {
1924 have_pixmap = 1; 1997 have_pixmap = 1;
1925 rootpixmap = *((Pixmap *)prop); 1998 rootpixmap = *((Pixmap *)prop);
1926 XFree(prop); 1999 XFree(prop);
1927 } 2000 }
1928 if (have_pixmap) { 2001 if (have_pixmap)
1929/* 2002 {
2003 /*
1930 * Copy Xroot pixmap transparency 2004 * Copy display->root pixmap transparency
1931 */ 2005 */
1932 int sx, sy, nx, ny; 2006 int sx, sy, nx, ny;
1933 unsigned int nw, nh; 2007 unsigned int nw, nh;
1934 Window cr; 2008 Window cr;
1935 XImage *image; 2009 XImage *image;
1936 GC gc; 2010 GC gc;
1937 XGCValues gcvalue; 2011 XGCValues gcvalue;
1938 2012
1939 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 2013 XTranslateCoordinates(display->display, TermWin.parent[0], display->root,
1940 0, 0, &sx, &sy, &cr); 2014 0, 0, &sx, &sy, &cr);
1941 nw = (unsigned int)szHint.width; 2015 nw = (unsigned int)szHint.width;
1942 nh = (unsigned int)szHint.height; 2016 nh = (unsigned int)szHint.height;
1943 nx = ny = 0; 2017 nx = ny = 0;
1944 if (sx < 0) { 2018 if (sx < 0)
2019 {
1945 nw += sx; 2020 nw += sx;
1946 nx = -sx; 2021 nx = -sx;
1947 sx = 0; 2022 sx = 0;
1948 } 2023 }
1949 if (sy < 0) { 2024 if (sy < 0)
2025 {
1950 nh += sy; 2026 nh += sy;
1951 ny = -sy; 2027 ny = -sy;
1952 sy = 0; 2028 sy = 0;
1953 } 2029 }
1954 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2030 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
1955 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2031 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
1956 allowedxerror = -1; 2032 allowedxerror = -1;
1957 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2033 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1958 ZPixmap); 2034 ZPixmap);
1959 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1960 /* XXX: may need a delay here? */ 2036 /* XXX: may need a delay here? */
1961 allowedxerror = 0; 2037 allowedxerror = 0;
1962 if (image == NULL) { 2038 if (image == NULL)
2039 {
1963 if (am_transparent && am_pixmap_trans) { 2040 if (am_transparent && am_pixmap_trans)
1964 pchanged = 1; 2041 {
2042 pchanged = 1;
1965 if (TermWin.pixmap != None) { 2043 if (TermWin.pixmap != None)
2044 {
1966 XFreePixmap(Xdisplay, TermWin.pixmap); 2045 XFreePixmap(display->display, TermWin.pixmap);
1967 TermWin.pixmap = None; 2046 TermWin.pixmap = None;
1968 } 2047 }
1969 } 2048 }
1970 am_pixmap_trans = 0; 2049 am_pixmap_trans = 0;
1971 } else { 2050 }
2051 else
2052 {
1972 if (TermWin.pixmap != None) 2053 if (TermWin.pixmap != None)
1973 XFreePixmap(Xdisplay, TermWin.pixmap); 2054 XFreePixmap(display->display, TermWin.pixmap);
1974 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2055 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt,
1975 (unsigned int)szHint.width, 2056 (unsigned int)szHint.width,
1976 (unsigned int)szHint.height, 2057 (unsigned int)szHint.height,
1977 (unsigned int)image->depth); 2058 (unsigned int)image->depth);
1978 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2059 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue);
1979 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2060 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0,
1980 nx, ny, (unsigned int)image->width, 2061 nx, ny, (unsigned int)image->width,
1981 (unsigned int)image->height); 2062 (unsigned int)image->height);
1982 XFreeGC(Xdisplay, gc); 2063 XFreeGC(display->display, gc);
1983 XDestroyImage(image); 2064 XDestroyImage(image);
1984 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2065 XSetWindowBackgroundPixmap(display->display, TermWin.vt,
1985 TermWin.pixmap); 2066 TermWin.pixmap);
1986 if (!am_transparent || !am_pixmap_trans) 2067 if (!am_transparent || !am_pixmap_trans)
1987 pchanged = 1; 2068 pchanged = 1;
1988 am_transparent = am_pixmap_trans = 1; 2069 am_transparent = am_pixmap_trans = 1;
1989 } 2070 }
1990 } 2071 }
1991 if (!am_pixmap_trans) { 2072 if (!am_pixmap_trans)
2073 {
1992 unsigned int n; 2074 unsigned int n;
1993/* 2075 /*
1994 * InheritPixmap transparency 2076 * InheritPixmap transparency
1995 */ 2077 */
1996 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2078 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root));
1997 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2079 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window));
1998 i++) { 2080 i++)
2081 {
1999 oldp = TermWin.parent[i]; 2082 oldp = TermWin.parent[i];
2000 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2083 XQueryTree(display->display, TermWin.parent[i - 1], &root,
2001 &TermWin.parent[i], &list, &n); 2084 &TermWin.parent[i], &list, &n);
2002 XFree(list); 2085 XFree(list);
2003 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2086 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2004 if (TermWin.parent[i] == Xroot) { 2087 if (TermWin.parent[i] == display->root)
2005 if (oldp != None) 2088 {
2006 pchanged = 1; 2089 if (oldp != None)
2007 break; 2090 pchanged = 1;
2008 } 2091 break;
2092 }
2009 if (oldp != TermWin.parent[i]) 2093 if (oldp != TermWin.parent[i])
2010 pchanged = 1; 2094 pchanged = 1;
2011 } 2095 }
2012 n = 0; 2096 n = 0;
2013 if (pchanged) { 2097 if (pchanged)
2098 {
2014 for (; n < (unsigned int)i; n++) { 2099 for (; n < (unsigned int)i; n++)
2100 {
2015 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2101 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr);
2016 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2102 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2017 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2103 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2104 {
2018 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2105 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1;
2019 break; 2106 break;
2020 } 2107 }
2021 } 2108 }
2022 } 2109 }
2023 if (n > (int)(sizeof(TermWin.parent) 2110 if (n > (int)(sizeof(TermWin.parent)
2024 / sizeof(TermWin.parent[0]))) { 2111 / sizeof(TermWin.parent[0])))
2112 {
2025 D_X((stderr, "InheritPixmap Turning off")); 2113 D_X((stderr, "InheritPixmap Turning off"));
2026 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2114 XSetWindowBackground(display->display, TermWin.parent[0],
2027 PixColors[Color_fg]); 2115 PixColors[Color_fg]);
2028 XSetWindowBackground(Xdisplay, TermWin.vt, 2116 XSetWindowBackground(display->display, TermWin.vt,
2029 PixColors[Color_bg]); 2117 PixColors[Color_bg]);
2030 am_transparent = 0; 2118 am_transparent = 0;
2031 /* XXX: also turn off Opt_transparent? */ 2119 /* XXX: also turn off Opt_transparent? */
2032 } else { 2120 }
2121 else
2122 {
2033 /* wait (an arbitrary period) for the WM to do its thing 2123 /* wait (an arbitrary period) for the WM to do its thing
2034 * needed for fvwm2.2.2 (and before?) */ 2124 * needed for fvwm2.2.2 (and before?) */
2035# ifdef HAVE_NANOSLEEP 2125# ifdef HAVE_NANOSLEEP
2036 struct timespec rqt; 2126 struct timespec rqt;
2037 2127
2038 rqt.tv_sec = 1; 2128 rqt.tv_sec = 1;
2039 rqt.tv_nsec = 0; 2129 rqt.tv_nsec = 0;
2040 nanosleep(&rqt, NULL); 2130 nanosleep(&rqt, NULL);
2041# else 2131# else
2042 sleep(1); 2132 sleep(1);
2043# endif 2133# endif
2044 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2134 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2045 for (n = 0; n < (unsigned int)i; n++) 2135 for (n = 0; n < (unsigned int)i; n++)
2046 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2136 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n],
2047 ParentRelative); 2137 ParentRelative);
2048 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2138 XSetWindowBackgroundPixmap(display->display, TermWin.vt,
2049 ParentRelative); 2139 ParentRelative);
2050 am_transparent = 1; 2140 am_transparent = 1;
2051 } 2141 }
2052 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2142 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++)
2053 TermWin.parent[i] = None; 2143 TermWin.parent[i] = None;
2054 } 2144 }
2055 return pchanged; 2145 return pchanged;
2056} 2146}
2057#endif 2147#endif
2058 2148
2059/*}}} */ 2149/*}}} */
2060 2150
… …
2062/*----------------------------------------------------------------------*/ 2152/*----------------------------------------------------------------------*/
2063#ifdef PRINTPIPE 2153#ifdef PRINTPIPE
2064FILE * 2154FILE *
2065rxvt_term::popen_printer () 2155rxvt_term::popen_printer ()
2066{ 2156{
2067 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2157 FILE *stream = popen(rs[Rs_print_pipe], "w");
2068 2158
2069 if (stream == NULL) 2159 if (stream == NULL)
2070 rxvt_print_error("can't open printer pipe"); 2160 rxvt_print_error("can't open printer pipe");
2071 return stream; 2161 return stream;
2072} 2162}
2073 2163
2074int 2164int
2075rxvt_term::pclose_printer (FILE *stream) 2165rxvt_term::pclose_printer (FILE *stream)
2076{ 2166{
2077 fflush (stream); 2167 fflush (stream);
2078/* pclose() reported not to work on SunOS 4.1.3 */ 2168 /* pclose() reported not to work on SunOS 4.1.3 */
2079# if defined (__sun__) /* TODO: RESOLVE THIS */ 2169# if defined (__sun__) /* TODO: RESOLVE THIS */
2080/* pclose works provided SIGCHLD handler uses waitpid */ 2170 /* pclose works provided SIGCHLD handler uses waitpid */
2081 return pclose (stream); /* return fclose (stream); */ 2171 return pclose (stream); /* return fclose (stream); */
2082# else 2172# else
2083 return pclose (stream); 2173 return pclose (stream);
2084# endif 2174# endif
2085} 2175}
… …
2088 * simulate attached vt100 printer 2178 * simulate attached vt100 printer
2089 */ 2179 */
2090void 2180void
2091rxvt_term::process_print_pipe () 2181rxvt_term::process_print_pipe ()
2092{ 2182{
2093 int done; 2183 int done;
2094 FILE *fd; 2184 FILE *fd;
2095 2185
2096 if ((fd = popen_printer ()) == NULL) 2186 if ((fd = popen_printer ()) == NULL)
2097 return; 2187 return;
2098 2188
2099/* 2189 /*
2100 * Send all input to the printer until either ESC[4i or ESC[?4i 2190 * Send all input to the printer until either ESC[4i or ESC[?4i
2101 * is received. 2191 * is received.
2102 */ 2192 */
2103 for (done = 0; !done;) { 2193 for (done = 0; !done;)
2194 {
2104 unsigned char buf[8]; 2195 unsigned char buf[8];
2105 unsigned char ch; 2196 unsigned char ch;
2106 unsigned int i, len; 2197 unsigned int i, len;
2107 2198
2108 if ((ch = cmd_getc ()) != C0_ESC) { 2199 if ((ch = cmd_getc ()) != C0_ESC)
2200 {
2109 if (putc(ch, fd) == EOF) 2201 if (putc(ch, fd) == EOF)
2110 break; /* done = 1 */ 2202 break; /* done = 1 */
2111 } else { 2203 }
2204 else
2205 {
2112 len = 0; 2206 len = 0;
2113 buf[len++] = ch; 2207 buf[len++] = ch;
2114 2208
2115 if ((buf[len++] = cmd_getc ()) == '[') { 2209 if ((buf[len++] = cmd_getc ()) == '[')
2210 {
2116 if ((ch = cmd_getc ()) == '?') { 2211 if ((ch = cmd_getc ()) == '?')
2117 buf[len++] = '?'; 2212 {
2118 ch = cmd_getc (); 2213 buf[len++] = '?';
2119 } 2214 ch = cmd_getc ();
2215 }
2120 if ((buf[len++] = ch) == '4') { 2216 if ((buf[len++] = ch) == '4')
2217 {
2121 if ((buf[len++] = cmd_getc ()) == 'i') 2218 if ((buf[len++] = cmd_getc ()) == 'i')
2122 break; /* done = 1 */ 2219 break; /* done = 1 */
2123 } 2220 }
2221 }
2222 for (i = 0; i < len; i++)
2223 if (putc(buf[i], fd) == EOF)
2224 {
2225 done = 1;
2226 break;
2227 }
2228 }
2124 } 2229 }
2125 for (i = 0; i < len; i++)
2126 if (putc(buf[i], fd) == EOF) {
2127 done = 1;
2128 break;
2129 }
2130 }
2131 }
2132 pclose_printer (fd); 2230 pclose_printer (fd);
2133} 2231}
2134#endif /* PRINTPIPE */ 2232#endif /* PRINTPIPE */
2135/*}}} */ 2233/*}}} */
2136 2234
2137/* *INDENT-OFF* */ 2235/* *INDENT-OFF* */
2138enum { 2236enum {
2139 C1_40 = 0x40, 2237 C1_40 = 0x40,
2140 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2238 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2141 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2239 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2142 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2240 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2143 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2241 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2144}; 2242};
2145/* *INDENT-ON* */ 2243/* *INDENT-ON* */
2146 2244
2147/*{{{ process non-printing single characters */ 2245/*{{{ process non-printing single characters */
2148void 2246void
2149rxvt_term::process_nonprinting (unsigned char ch) 2247rxvt_term::process_nonprinting (unsigned char ch)
2150{ 2248{
2151 switch (ch) { 2249 switch (ch)
2250 {
2152 case C0_ENQ: /* terminal Status */ 2251 case C0_ENQ: /* terminal Status */
2153 if (rs[Rs_answerbackstring]) 2252 if (rs[Rs_answerbackstring])
2154 tt_write( 2253 tt_write(
2155 (const unsigned char *)rs[Rs_answerbackstring], 2254 (const unsigned char *)rs[Rs_answerbackstring],
2156 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2255 (unsigned int)STRLEN(rs[Rs_answerbackstring]));
2157 else 2256 else
2158 tt_write((unsigned char *)VT100_ANS, 2257 tt_write((unsigned char *)VT100_ANS,
2159 (unsigned int)STRLEN(VT100_ANS)); 2258 (unsigned int)STRLEN(VT100_ANS));
2160 break; 2259 break;
2161 case C0_BEL: /* bell */ 2260 case C0_BEL: /* bell */
2162 scr_bell (); 2261 scr_bell ();
2163 break; 2262 break;
2164 case C0_BS: /* backspace */ 2263 case C0_BS: /* backspace */
2165 scr_backspace (); 2264 scr_backspace ();
2166 break; 2265 break;
2167 case C0_HT: /* tab */ 2266 case C0_HT: /* tab */
2168 scr_tab (1); 2267 scr_tab (1);
2169 break; 2268 break;
2170 case C0_CR: /* carriage return */ 2269 case C0_CR: /* carriage return */
2171 scr_gotorc (0, 0, R_RELATIVE); 2270 scr_gotorc (0, 0, R_RELATIVE);
2172 break; 2271 break;
2173 case C0_VT: /* vertical tab, form feed */ 2272 case C0_VT: /* vertical tab, form feed */
2174 case C0_FF: 2273 case C0_FF:
2175 case C0_LF: /* line feed */ 2274 case C0_LF: /* line feed */
2176 scr_index (UP); 2275 scr_index (UP);
2177 break; 2276 break;
2178 case C0_SO: /* shift out - acs */ 2277 case C0_SO: /* shift out - acs */
2179 scr_charset_choose (1); 2278 scr_charset_choose (1);
2180 break; 2279 break;
2181 case C0_SI: /* shift in - acs */ 2280 case C0_SI: /* shift in - acs */
2182 scr_charset_choose (0); 2281 scr_charset_choose (0);
2183 break; 2282 break;
2184 } 2283 }
2185} 2284}
2186/*}}} */ 2285/*}}} */
2187 2286
2188 2287
2189/*{{{ process VT52 escape sequences */ 2288/*{{{ process VT52 escape sequences */
2190void 2289void
2191rxvt_term::process_escape_vt52 (unsigned char ch) 2290rxvt_term::process_escape_vt52 (unsigned char ch)
2192{ 2291{
2193 int row, col; 2292 int row, col;
2293
2294 switch (ch)
2194 2295 {
2195 switch (ch) {
2196 case 'A': /* cursor up */ 2296 case 'A': /* cursor up */
2197 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE); 2297 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2198 break; 2298 break;
2199 case 'B': /* cursor down */ 2299 case 'B': /* cursor down */
2200 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE); 2300 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2201 break; 2301 break;
2202 case 'C': /* cursor right */ 2302 case 'C': /* cursor right */
2203 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 2303 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2204 break; 2304 break;
2205 case 'D': /* cursor left */ 2305 case 'D': /* cursor left */
2206 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 2306 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2207 break; 2307 break;
2208 case 'H': /* cursor home */ 2308 case 'H': /* cursor home */
2209 scr_gotorc (0, 0, 0); 2309 scr_gotorc (0, 0, 0);
2210 break; 2310 break;
2211 case 'I': /* cursor up and scroll down if needed */ 2311 case 'I': /* cursor up and scroll down if needed */
2212 scr_index (DN); 2312 scr_index (DN);
2213 break; 2313 break;
2214 case 'J': /* erase to end of screen */ 2314 case 'J': /* erase to end of screen */
2215 scr_erase_screen (0); 2315 scr_erase_screen (0);
2216 break; 2316 break;
2217 case 'K': /* erase to end of line */ 2317 case 'K': /* erase to end of line */
2218 scr_erase_line (0); 2318 scr_erase_line (0);
2219 break; 2319 break;
2220 case 'Y': /* move to specified row and col */ 2320 case 'Y': /* move to specified row and col */
2221 /* full command is 'ESC Y row col' where row and col 2321 /* full command is 'ESC Y row col' where row and col
2222 * are encoded by adding 32 and sending the ascii 2322 * are encoded by adding 32 and sending the ascii
2223 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2323 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2224 * etc. */ 2324 * etc. */
2225 row = cmd_getc () - ' '; 2325 row = cmd_getc () - ' ';
2226 col = cmd_getc () - ' '; 2326 col = cmd_getc () - ' ';
2227 scr_gotorc (row, col, 0); 2327 scr_gotorc (row, col, 0);
2228 break; 2328 break;
2229 case 'Z': /* identify the terminal type */ 2329 case 'Z': /* identify the terminal type */
2230 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2330 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2231 break; 2331 break;
2232 case '<': /* turn off VT52 mode */ 2332 case '<': /* turn off VT52 mode */
2233 PrivMode(0, PrivMode_vt52); 2333 PrivMode(0, PrivMode_vt52);
2234 break; 2334 break;
2235 case 'F': /* use special graphics character set */ 2335 case 'F': /* use special graphics character set */
2236 case 'G': /* use regular character set */ 2336 case 'G': /* use regular character set */
2237 /* unimplemented */ 2337 /* unimplemented */
2238 break; 2338 break;
2239 case '=': /* use alternate keypad mode */ 2339 case '=': /* use alternate keypad mode */
2240 case '>': /* use regular keypad mode */ 2340 case '>': /* use regular keypad mode */
2241 /* unimplemented */ 2341 /* unimplemented */
2242 break; 2342 break;
2243 } 2343 }
2244} 2344}
2245/*}}} */ 2345/*}}} */
2246 2346
2247 2347
2248/*{{{ process escape sequences */ 2348/*{{{ process escape sequences */
2249void 2349void
2250rxvt_term::process_escape_seq () 2350rxvt_term::process_escape_seq ()
2251{ 2351{
2252 unsigned char ch = cmd_getc (); 2352 unsigned char ch = cmd_getc ();
2253 2353
2254 if (PrivateModes & PrivMode_vt52) { 2354 if (PrivateModes & PrivMode_vt52)
2255 process_escape_vt52 (ch);
2256 return;
2257 }
2258 2355 {
2356 process_escape_vt52 (ch);
2357 return;
2358 }
2359
2259 switch (ch) { 2360 switch (ch)
2361 {
2260 /* case 1: do_tek_mode (); break; */ 2362 /* case 1: do_tek_mode (); break; */
2261 case '#': 2363 case '#':
2262 if (cmd_getc () == '8') 2364 if (cmd_getc () == '8')
2263 scr_E (); 2365 scr_E ();
2264 break; 2366 break;
2265 case '(': 2367 case '(':
2266 scr_charset_set (0, (unsigned int)cmd_getc ()); 2368 scr_charset_set (0, (unsigned int)cmd_getc ());
2267 break; 2369 break;
2268 case ')': 2370 case ')':
2269 scr_charset_set (1, (unsigned int)cmd_getc ()); 2371 scr_charset_set (1, (unsigned int)cmd_getc ());
2270 break; 2372 break;
2271 case '*': 2373 case '*':
2272 scr_charset_set (2, (unsigned int)cmd_getc ()); 2374 scr_charset_set (2, (unsigned int)cmd_getc ());
2273 break; 2375 break;
2274 case '+': 2376 case '+':
2275 scr_charset_set (3, (unsigned int)cmd_getc ()); 2377 scr_charset_set (3, (unsigned int)cmd_getc ());
2276 break; 2378 break;
2277#ifdef MULTICHAR_SET 2379#ifdef MULTICHAR_SET
2278 case '$': 2380 case '$':
2279 scr_charset_set (-2, (unsigned int)cmd_getc ()); 2381 scr_charset_set (-2, (unsigned int)cmd_getc ());
2280 break; 2382 break;
2281#endif 2383#endif
2282#ifndef NO_FRILLS 2384#ifndef NO_FRILLS
2283 case '6': 2385 case '6':
2284 scr_backindex (); 2386 scr_backindex ();
2285 break; 2387 break;
2286#endif 2388#endif
2287 case '7': 2389 case '7':
2288 scr_cursor (SAVE); 2390 scr_cursor (SAVE);
2289 break; 2391 break;
2290 case '8': 2392 case '8':
2291 scr_cursor (RESTORE); 2393 scr_cursor (RESTORE);
2292 break; 2394 break;
2293#ifndef NO_FRILLS 2395#ifndef NO_FRILLS
2294 case '9': 2396 case '9':
2295 scr_forwardindex (); 2397 scr_forwardindex ();
2296 break; 2398 break;
2297#endif 2399#endif
2298 case '=': 2400 case '=':
2299 case '>': 2401 case '>':
2300 PrivMode((ch == '='), PrivMode_aplKP); 2402 PrivMode((ch == '='), PrivMode_aplKP);
2301 break; 2403 break;
2302 2404
2303 case C1_40: 2405 case C1_40:
2304 cmd_getc (); 2406 cmd_getc ();
2305 break; 2407 break;
2306 case C1_44: 2408 case C1_44:
2307 scr_index (UP); 2409 scr_index (UP);
2308 break; 2410 break;
2309 2411
2310 /* 8.3.87: NEXT LINE */ 2412 /* 8.3.87: NEXT LINE */
2311 case C1_NEL: /* ESC E */ 2413 case C1_NEL: /* ESC E */
2312 { 2414 {
2313 uint32_t nlcr[] = { '\n', '\r' }; 2415 uint32_t nlcr[] = { '\n', '\r' };
2314 scr_add_lines (nlcr, 1, 2); 2416 scr_add_lines (nlcr, 1, 2);
2315 } 2417 }
2316 break; 2418 break;
2317 2419
2318 /* kidnapped escape sequence: Should be 8.3.48 */ 2420 /* kidnapped escape sequence: Should be 8.3.48 */
2319 case C1_ESA: /* ESC G */ 2421 case C1_ESA: /* ESC G */
2320 process_graphics (); 2422 process_graphics ();
2321 break; 2423 break;
2322 2424
2323 /* 8.3.63: CHARACTER TABULATION SET */ 2425 /* 8.3.63: CHARACTER TABULATION SET */
2324 case C1_HTS: /* ESC H */ 2426 case C1_HTS: /* ESC H */
2325 scr_set_tab (1); 2427 scr_set_tab (1);
2326 break; 2428 break;
2327 2429
2328 /* 8.3.105: REVERSE LINE FEED */ 2430 /* 8.3.105: REVERSE LINE FEED */
2329 case C1_RI: /* ESC M */ 2431 case C1_RI: /* ESC M */
2330 scr_index (DN); 2432 scr_index (DN);
2331 break; 2433 break;
2332 2434
2333 /* 8.3.142: SINGLE-SHIFT TWO */ 2435 /* 8.3.142: SINGLE-SHIFT TWO */
2334 /*case C1_SS2: scr_single_shift (2); break; */ 2436 /*case C1_SS2: scr_single_shift (2); break; */
2335 2437
2336 /* 8.3.143: SINGLE-SHIFT THREE */ 2438 /* 8.3.143: SINGLE-SHIFT THREE */
2337 /*case C1_SS3: scr_single_shift (3); break; */ 2439 /*case C1_SS3: scr_single_shift (3); break; */
2338 2440
2339 /* 8.3.27: DEVICE CONTROL STRING */ 2441 /* 8.3.27: DEVICE CONTROL STRING */
2340 case C1_DCS: /* ESC P */ 2442 case C1_DCS: /* ESC P */
2341 process_dcs_seq (); 2443 process_dcs_seq ();
2342 break; 2444 break;
2343 2445
2344 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2446 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2345 case C1_SCI: /* ESC Z */ 2447 case C1_SCI: /* ESC Z */
2346 tt_write((const unsigned char *)ESCZ_ANSWER, 2448 tt_write((const unsigned char *)ESCZ_ANSWER,
2347 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2449 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2348 break; /* steal obsolete ESC [ c */ 2450 break; /* steal obsolete ESC [ c */
2349 2451
2350 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2452 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2351 case C1_CSI: /* ESC [ */ 2453 case C1_CSI: /* ESC [ */
2352 process_csi_seq (); 2454 process_csi_seq ();
2353 break; 2455 break;
2354 2456
2355 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2457 /* 8.3.90: OPERATING SYSTEM COMMAND */
2356 case C1_OSC: /* ESC ] */ 2458 case C1_OSC: /* ESC ] */
2357 process_osc_seq (); 2459 process_osc_seq ();
2358 break; 2460 break;
2359 2461
2360 /* 8.3.106: RESET TO INITIAL STATE */ 2462 /* 8.3.106: RESET TO INITIAL STATE */
2361 case 'c': 2463 case 'c':
2362 scr_poweron (); 2464 scr_poweron ();
2363 scrollbar_show (1); 2465 scrollbar_show (1);
2364 break; 2466 break;
2365 2467
2366 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2468 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2367 case 'n': 2469 case 'n':
2368 scr_charset_choose (2); 2470 scr_charset_choose (2);
2369 break; 2471 break;
2370 2472
2371 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2473 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2372 case 'o': 2474 case 'o':
2373 scr_charset_choose (3); 2475 scr_charset_choose (3);
2374 break; 2476 break;
2375 } 2477 }
2376} 2478}
2377/*}}} */ 2479/*}}} */
2378 2480
2379/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2481/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2380/* *INDENT-OFF* */ 2482/* *INDENT-OFF* */
2381enum { 2483enum {
2382 CSI_ICH = 0x40, 2484 CSI_ICH = 0x40,
2383 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2485 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2384 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2486 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2385 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2487 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2386 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2488 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2387 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2489 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2388 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2490 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2389 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2491 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2390 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2492 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2391}; 2493};
2392 2494
2393#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2495#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2394 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2496 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2395 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2497 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2396#define get_byte_array_bit(array, bit) \ 2498#define get_byte_array_bit(array, bit) \
2397 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2499 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7))))
2398 2500
2399const unsigned char csi_defaults[] = { 2501const unsigned char csi_defaults[] =
2502 {
2400 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2503 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2401 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2504 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2402 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2505 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2403 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2506 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2404 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2507 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2405 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2508 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2406 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2509 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2407 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2510 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2408}; 2511 };
2409/* *INDENT-ON* */ 2512/* *INDENT-ON* */
2410 2513
2411void 2514void
2412rxvt_term::process_csi_seq () 2515rxvt_term::process_csi_seq ()
2413{ 2516{
2414 unsigned char ch, priv, i; 2517 unsigned char ch, priv, i;
2415 unsigned int nargs, p; 2518 unsigned int nargs, p;
2416 int n, ndef; 2519 int n, ndef;
2417 int arg[ESC_ARGS]; 2520 int arg[ESC_ARGS];
2418 2521
2419 for (nargs = ESC_ARGS; nargs > 0;) 2522 for (nargs = ESC_ARGS; nargs > 0;)
2420 arg[--nargs] = 0; 2523 arg[--nargs] = 0;
2421 2524
2422 priv = 0; 2525 priv = 0;
2526 ch = cmd_getc ();
2527 if (ch >= '<' && ch <= '?')
2528 { /* '<' '=' '>' '?' */
2529 priv = ch;
2423 ch = cmd_getc (); 2530 ch = cmd_getc ();
2424 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2425 priv = ch;
2426 ch = cmd_getc ();
2427 } 2531 }
2428/* read any numerical arguments */ 2532 /* read any numerical arguments */
2429 for (n = -1; ch < CSI_ICH; ) { 2533 for (n = -1; ch < CSI_ICH; )
2534 {
2430 if (isdigit(ch)) { 2535 if (isdigit(ch))
2536 {
2431 if (n < 0) 2537 if (n < 0)
2432 n = ch - '0'; 2538 n = ch - '0';
2433 else 2539 else
2434 n = n * 10 + ch - '0'; 2540 n = n * 10 + ch - '0';
2541 }
2435 } else if (ch == ';') { 2542 else if (ch == ';')
2543 {
2436 if (nargs < ESC_ARGS) 2544 if (nargs < ESC_ARGS)
2437 arg[nargs++] = n; 2545 arg[nargs++] = n;
2438 n = -1; 2546 n = -1;
2547 }
2439 } else if (ch == '\b') { 2548 else if (ch == '\b')
2549 {
2440 scr_backspace (); 2550 scr_backspace ();
2551 }
2441 } else if (ch == C0_ESC) { 2552 else if (ch == C0_ESC)
2553 {
2442 process_escape_seq (); 2554 process_escape_seq ();
2555 return;
2556 }
2557 else if (ch < ' ')
2558 {
2559 process_nonprinting (ch);
2560 }
2561 ch = cmd_getc ();
2562 }
2563
2564 if (ch > CSI_7F)
2443 return; 2565 return;
2444 } else if (ch < ' ') {
2445 process_nonprinting (ch);
2446 }
2447 ch = cmd_getc ();
2448 }
2449 2566
2450 if (ch > CSI_7F)
2451 return;
2452
2453 if (nargs < ESC_ARGS) 2567 if (nargs < ESC_ARGS)
2454 arg[nargs++] = n; 2568 arg[nargs++] = n;
2455 2569
2456 i = ch - CSI_ICH; 2570 i = ch - CSI_ICH;
2457 ndef = get_byte_array_bit(csi_defaults, i); 2571 ndef = get_byte_array_bit(csi_defaults, i);
2458 for (p = 0; p < nargs; p++) 2572 for (p = 0; p < nargs; p++)
2459 if (arg[p] == -1) 2573 if (arg[p] == -1)
2460 arg[p] = ndef; 2574 arg[p] = ndef;
2461 2575
2462#ifdef DEBUG_CMD 2576#ifdef DEBUG_CMD
2463 fprintf(stderr, "CSI "); 2577 fprintf(stderr, "CSI ");
2464 for (p = 0; p < nargs; p++) 2578 for (p = 0; p < nargs; p++)
2465 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2579 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2466 fprintf(stderr, "%c\n", ch); 2580 fprintf(stderr, "%c\n", ch);
2467#endif 2581#endif
2468 2582
2469/* 2583 /*
2470 * private mode handling 2584 * private mode handling
2471 */ 2585 */
2472 if (priv) { 2586 if (priv)
2473 switch (priv) { 2587 {
2474 case '>': 2588 switch (priv)
2589 {
2590 case '>':
2475 if (ch == CSI_DA) /* secondary device attributes */ 2591 if (ch == CSI_DA) /* secondary device attributes */
2476 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2592 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2477 break; 2593 break;
2478 case '?': 2594 case '?':
2479 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2595 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2480 process_terminal_mode (ch, priv, nargs, arg); 2596 process_terminal_mode (ch, priv, nargs, arg);
2481 break; 2597 break;
2482 } 2598 }
2483 return; 2599 return;
2484 } 2600 }
2485 2601
2486 switch (ch) { 2602 switch (ch)
2487/* 2603 {
2604 /*
2488 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2605 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses)
2489 */ 2606 */
2490#ifdef PRINTPIPE 2607#ifdef PRINTPIPE
2491 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2608 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2492 switch (arg[0]) { 2609 switch (arg[0])
2610 {
2493 case 0: /* initiate transfer to primary aux device */ 2611 case 0: /* initiate transfer to primary aux device */
2494 scr_printscreen (0); 2612 scr_printscreen (0);
2495 break; 2613 break;
2496 case 5: /* start relay to primary aux device */ 2614 case 5: /* start relay to primary aux device */
2497 process_print_pipe (); 2615 process_print_pipe ();
2616 break;
2617 }
2498 break; 2618 break;
2499 }
2500 break;
2501#endif 2619#endif
2502 2620
2503 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2621 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2504 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2622 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2505 arg[0] = -arg[0]; 2623 arg[0] = -arg[0];
2506 /* FALLTHROUGH */ 2624 /* FALLTHROUGH */
2507 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2625 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2508 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2626 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2509 scr_gotorc (arg[0], 0, RELATIVE); 2627 scr_gotorc (arg[0], 0, RELATIVE);
2510 break; 2628 break;
2511 2629
2512 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2630 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2513 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2631 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2514#ifdef ISO6429 2632#ifdef ISO6429
2515 arg[0] = -arg[0]; 2633 arg[0] = -arg[0];
2516#else /* emulate common DEC VTs */ 2634#else /* emulate common DEC VTs */
2517 arg[0] = arg[0] ? -arg[0] : -1; 2635 arg[0] = arg[0] ? -arg[0] : -1;
2518#endif 2636#endif
2519 /* FALLTHROUGH */ 2637 /* FALLTHROUGH */
2520 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2638 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2521 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2639 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2522#ifdef ISO6429 2640#ifdef ISO6429
2523 scr_gotorc (0, arg[0], RELATIVE); 2641 scr_gotorc (0, arg[0], RELATIVE);
2524#else /* emulate common DEC VTs */ 2642#else /* emulate common DEC VTs */
2525 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE); 2643 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2526#endif 2644#endif
2527 break; 2645 break;
2528 2646
2529 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2647 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2530 arg[0] = -arg[0]; 2648 arg[0] = -arg[0];
2531 /* FALLTHROUGH */ 2649 /* FALLTHROUGH */
2532 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2650 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2533 scr_gotorc (arg[0], 0, R_RELATIVE); 2651 scr_gotorc (arg[0], 0, R_RELATIVE);
2534 break; 2652 break;
2535 2653
2536 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2654 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2537 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2655 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2538 scr_gotorc (0, arg[0] - 1, R_RELATIVE); 2656 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2539 break; 2657 break;
2540 2658
2541 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2659 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2542 scr_gotorc (arg[0] - 1, 0, C_RELATIVE); 2660 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2543 break; 2661 break;
2544 2662
2545 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2663 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2546 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2664 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2547 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2665 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2548 break; 2666 break;
2549 2667
2550 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2668 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2551 arg[0] = -arg[0]; 2669 arg[0] = -arg[0];
2552 /* FALLTHROUGH */ 2670 /* FALLTHROUGH */
2553 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2671 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2554 scr_tab (arg[0]); 2672 scr_tab (arg[0]);
2555 break; 2673 break;
2556 2674
2557 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2675 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2558 scr_erase_screen (arg[0]); 2676 scr_erase_screen (arg[0]);
2559 break; 2677 break;
2560 2678
2561 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2679 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2562 scr_erase_line (arg[0]); 2680 scr_erase_line (arg[0]);
2563 break; 2681 break;
2564 2682
2565 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2683 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2566 scr_insdel_chars (arg[0], INSERT); 2684 scr_insdel_chars (arg[0], INSERT);
2567 break; 2685 break;
2568 2686
2569 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2687 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2570 scr_insdel_lines (arg[0], INSERT); 2688 scr_insdel_lines (arg[0], INSERT);
2571 break; 2689 break;
2572 2690
2573 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2691 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2574 scr_insdel_lines (arg[0], DELETE); 2692 scr_insdel_lines (arg[0], DELETE);
2575 break; 2693 break;
2576 2694
2577 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2695 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2578 scr_insdel_chars (arg[0], ERASE); 2696 scr_insdel_chars (arg[0], ERASE);
2579 break; 2697 break;
2580 2698
2581 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2699 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2582 scr_insdel_chars (arg[0], DELETE); 2700 scr_insdel_chars (arg[0], DELETE);
2583 break; 2701 break;
2584 2702
2585 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2703 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2586 arg[0] = -arg[0]; 2704 arg[0] = -arg[0];
2587 /* FALLTHROUGH */ 2705 /* FALLTHROUGH */
2588 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2706 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2589 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2707 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2590 break; 2708 break;
2591 2709
2592 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2710 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2593 tt_write((const unsigned char *)VT100_ANS, 2711 tt_write((const unsigned char *)VT100_ANS,
2594 (unsigned int)(sizeof(VT100_ANS) - 1)); 2712 (unsigned int)(sizeof(VT100_ANS) - 1));
2595 break; 2713 break;
2596 2714
2597 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2715 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2598 process_sgr_mode (nargs, arg); 2716 process_sgr_mode (nargs, arg);
2599 break; 2717 break;
2600 2718
2601 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2719 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2602 switch (arg[0]) { 2720 switch (arg[0])
2721 {
2603 case 5: /* DSR requested */ 2722 case 5: /* DSR requested */
2604 tt_printf("\033[0n"); 2723 tt_printf("\033[0n");
2605 break; 2724 break;
2606 case 6: /* CPR requested */ 2725 case 6: /* CPR requested */
2607 scr_report_position (); 2726 scr_report_position ();
2608 break; 2727 break;
2609#if defined (ENABLE_DISPLAY_ANSWER) 2728#if defined (ENABLE_DISPLAY_ANSWER)
2610 case 7: /* unofficial extension */ 2729 case 7: /* unofficial extension */
2611 tt_printf("%-.250s\n", rs[Rs_display_name]); 2730 tt_printf("%-.250s\n", rs[Rs_display_name]);
2612 break; 2731 break;
2613#endif 2732#endif
2614 case 8: /* unofficial extension */ 2733 case 8: /* unofficial extension */
2615 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2734 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2735 break;
2736 }
2616 break; 2737 break;
2617 }
2618 break;
2619 2738
2620 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2739 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2621 switch (arg[0]) { 2740 switch (arg[0])
2741 {
2622 case 0: /* char tab stop cleared at active position */ 2742 case 0: /* char tab stop cleared at active position */
2623 scr_set_tab (0); 2743 scr_set_tab (0);
2624 break; 2744 break;
2625 /* case 1: */ /* line tab stop cleared in active line */ 2745 /* case 1: */ /* line tab stop cleared in active line */
2626 /* case 2: */ /* char tab stops cleared in active line */ 2746 /* case 2: */ /* char tab stops cleared in active line */
2627 case 3: /* all char tab stops are cleared */ 2747 case 3: /* all char tab stops are cleared */
2628 /* case 4: */ /* all line tab stops are cleared */ 2748 /* case 4: */ /* all line tab stops are cleared */
2629 case 5: /* all tab stops are cleared */ 2749 case 5: /* all tab stops are cleared */
2630 scr_set_tab (-1); 2750 scr_set_tab (-1);
2751 break;
2752 }
2631 break; 2753 break;
2632 }
2633 break;
2634 2754
2635 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2755 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2636 switch (arg[0]) { 2756 switch (arg[0])
2757 {
2637 case 0: /* char tab stop set at active position */ 2758 case 0: /* char tab stop set at active position */
2638 scr_set_tab (1); 2759 scr_set_tab (1);
2639 break; /* = ESC H */ 2760 break; /* = ESC H */
2640 /* case 1: */ /* line tab stop set at active line */ 2761 /* case 1: */ /* line tab stop set at active line */
2641 case 2: /* char tab stop cleared at active position */ 2762 case 2: /* char tab stop cleared at active position */
2642 scr_set_tab (0); 2763 scr_set_tab (0);
2643 break; /* = ESC [ 0 g */ 2764 break; /* = ESC [ 0 g */
2644 /* case 3: */ /* line tab stop cleared at active line */ 2765 /* case 3: */ /* line tab stop cleared at active line */
2645 /* case 4: */ /* char tab stops cleared at active line */ 2766 /* case 4: */ /* char tab stops cleared at active line */
2646 case 5: /* all char tab stops are cleared */ 2767 case 5: /* all char tab stops are cleared */
2647 scr_set_tab (-1); 2768 scr_set_tab (-1);
2648 break; /* = ESC [ 3 g */ 2769 break; /* = ESC [ 3 g */
2649 /* case 6: */ /* all line tab stops are cleared */ 2770 /* case 6: */ /* all line tab stops are cleared */
2650 } 2771 }
2651 break; 2772 break;
2652 2773
2653 case CSI_RM: /* 8.3.107: RESET MODE */ 2774 case CSI_RM: /* 8.3.107: RESET MODE */
2654 if (arg[0] == 4) 2775 if (arg[0] == 4)
2655 scr_insert_mode (0); 2776 scr_insert_mode (0);
2656 break; 2777 break;
2657 2778
2658 case CSI_SM: /* 8.3.126: SET MODE */ 2779 case CSI_SM: /* 8.3.126: SET MODE */
2659 if (arg[0] == 4) 2780 if (arg[0] == 4)
2660 scr_insert_mode (1); 2781 scr_insert_mode (1);
2661 break; 2782 break;
2662 2783
2663/* 2784 /*
2664 * PRIVATE USE beyond this point. All CSI_7? sequences here 2785 * PRIVATE USE beyond this point. All CSI_7? sequences here
2665 */ 2786 */
2666 case CSI_72: /* DECSTBM: set top and bottom margins */ 2787 case CSI_72: /* DECSTBM: set top and bottom margins */
2667 if (nargs == 1) 2788 if (nargs == 1)
2668 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1); 2789 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2669 else if (nargs == 0 || arg[0] >= arg[1]) 2790 else if (nargs == 0 || arg[0] >= arg[1])
2670 scr_scroll_region (0, MAX_ROWS - 1); 2791 scr_scroll_region (0, MAX_ROWS - 1);
2671 else 2792 else
2672 scr_scroll_region (arg[0] - 1, arg[1] - 1); 2793 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2673 break; 2794 break;
2674 2795
2675 case CSI_73: 2796 case CSI_73:
2676 scr_cursor (SAVE); 2797 scr_cursor (SAVE);
2677 break; 2798 break;
2678 case CSI_75: 2799 case CSI_75:
2679 scr_cursor (RESTORE); 2800 scr_cursor (RESTORE);
2680 break; 2801 break;
2681 2802
2682#ifndef NO_FRILLS 2803#ifndef NO_FRILLS
2683 case CSI_74: 2804 case CSI_74:
2684 process_window_ops (arg, nargs); 2805 process_window_ops (arg, nargs);
2685 break; 2806 break;
2686#endif 2807#endif
2687 2808
2688 case CSI_78: /* DECREQTPARM */ 2809 case CSI_78: /* DECREQTPARM */
2689 if (arg[0] == 0 || arg[0] == 1) 2810 if (arg[0] == 0 || arg[0] == 1)
2690 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2811 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2691 /* FALLTHROUGH */ 2812 /* FALLTHROUGH */
2692 2813
2693 default: 2814 default:
2694 break; 2815 break;
2695 } 2816 }
2696} 2817}
2697/*}}} */ 2818/*}}} */
2698 2819
2699#ifndef NO_FRILLS 2820#ifndef NO_FRILLS
2700/* ARGSUSED */ 2821/* ARGSUSED */
2701void 2822void
2702rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2823rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2703{ 2824{
2704 int x, y; 2825 int x, y;
2705#if 0 2826#if 0
2706 char *s; 2827 char *s;
2707#endif 2828#endif
2708 XWindowAttributes wattr; 2829 XWindowAttributes wattr;
2709 Window wdummy; 2830 Window wdummy;
2710 2831
2711 if (nargs == 0) 2832 if (nargs == 0)
2712 return; 2833 return;
2713 switch (args[0]) { 2834 switch (args[0])
2835 {
2714 /* 2836 /*
2715 * commands 2837 * commands
2716 */ 2838 */
2717 case 1: /* deiconify window */ 2839 case 1: /* deiconify window */
2718 XMapWindow(Xdisplay, TermWin.parent[0]); 2840 XMapWindow(display->display, TermWin.parent[0]);
2719 break; 2841 break;
2720 case 2: /* iconify window */ 2842 case 2: /* iconify window */
2721 XIconifyWindow(Xdisplay, TermWin.parent[0], 2843 XIconifyWindow(display->display, TermWin.parent[0],
2722 DefaultScreen(Xdisplay)); 2844 DefaultScreen(display->display));
2723 break; 2845 break;
2724 case 3: /* set position (pixels) */ 2846 case 3: /* set position (pixels) */
2725 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2847 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]);
2726 break; 2848 break;
2727 case 4: /* set size (pixels) */ 2849 case 4: /* set size (pixels) */
2728 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2850 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2729 break; 2851 break;
2730 case 5: /* raise window */ 2852 case 5: /* raise window */
2731 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2853 XRaiseWindow(display->display, TermWin.parent[0]);
2732 break; 2854 break;
2733 case 6: /* lower window */ 2855 case 6: /* lower window */
2734 XLowerWindow(Xdisplay, TermWin.parent[0]); 2856 XLowerWindow(display->display, TermWin.parent[0]);
2735 break; 2857 break;
2736 case 7: /* refresh window */ 2858 case 7: /* refresh window */
2737 scr_touch (true); 2859 scr_touch (true);
2738 break; 2860 break;
2739 case 8: /* set size (chars) */ 2861 case 8: /* set size (chars) */
2740 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2862 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth),
2741 (unsigned int)(args[1] * TermWin.fheight)); 2863 (unsigned int)(args[1] * TermWin.fheight));
2742 break; 2864 break;
2743 default: 2865 default:
2744 if (args[0] >= 24) /* set height (chars) */ 2866 if (args[0] >= 24) /* set height (chars) */
2745 set_widthheight ((unsigned int)TermWin.width, 2867 set_widthheight ((unsigned int)TermWin.width,
2746 (unsigned int)(args[1] * TermWin.fheight)); 2868 (unsigned int)(args[1] * TermWin.fheight));
2747 break; 2869 break;
2748 /* 2870 /*
2749 * reports - some output format copied from XTerm 2871 * reports - some output format copied from XTerm
2750 */ 2872 */
2751 case 11: /* report window state */ 2873 case 11: /* report window state */
2752 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2874 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
2753 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2875 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2754 break; 2876 break;
2755 case 13: /* report window position */ 2877 case 13: /* report window position */
2756 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2878 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
2757 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2879 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root,
2758 -wattr.border_width, -wattr.border_width, 2880 -wattr.border_width, -wattr.border_width,
2759 &x, &y, &wdummy); 2881 &x, &y, &wdummy);
2760 tt_printf("\033[3;%d;%dt", x, y); 2882 tt_printf("\033[3;%d;%dt", x, y);
2761 break; 2883 break;
2762 case 14: /* report window size (pixels) */ 2884 case 14: /* report window size (pixels) */
2763 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2885 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
2764 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2886 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2765 break; 2887 break;
2766 case 18: /* report window size (chars) */ 2888 case 18: /* report window size (chars) */
2767 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2889 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2768 break; 2890 break;
2769#if 0 /* XXX: currently disabled due to security concerns */ 2891#if 0 /* XXX: currently disabled due to security concerns */
2770 case 20: /* report icon label */ 2892 case 20: /* report icon label */
2771 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2893 XGetIconName(display->display, TermWin.parent[0], &s);
2772 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2894 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2773 break; 2895 break;
2774 case 21: /* report window title */ 2896 case 21: /* report window title */
2775 XFetchName(Xdisplay, TermWin.parent[0], &s); 2897 XFetchName(display->display, TermWin.parent[0], &s);
2776 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2898 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2777 break; 2899 break;
2778#endif 2900#endif
2901
2779 } 2902 }
2780} 2903}
2781#endif 2904#endif
2782 2905
2783/*----------------------------------------------------------------------*/ 2906/*----------------------------------------------------------------------*/
… …
2786 * ends_how is terminator used. returned input must be free()d 2909 * ends_how is terminator used. returned input must be free()d
2787 */ 2910 */
2788unsigned char * 2911unsigned char *
2789rxvt_term::get_to_st (unsigned char *ends_how) 2912rxvt_term::get_to_st (unsigned char *ends_how)
2790{ 2913{
2791 int seen_esc = 0; /* seen escape? */ 2914 int seen_esc = 0; /* seen escape? */
2792 unsigned int n = 0; 2915 unsigned int n = 0;
2793 unsigned char *s; 2916 unsigned char *s;
2794 unsigned char ch, string[STRING_MAX]; 2917 unsigned char ch, string[STRING_MAX];
2795 2918
2796 for (; (ch = cmd_getc ());) { 2919 for (; (ch = cmd_getc ());)
2920 {
2797 if (ch == C0_BEL 2921 if (ch == C0_BEL
2798 || ch == CHAR_ST 2922 || ch == CHAR_ST
2799 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2923 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2800 break; 2924 break;
2801 if (ch == C0_ESC) { 2925 if (ch == C0_ESC)
2926 {
2802 seen_esc = 1; 2927 seen_esc = 1;
2803 continue; 2928 continue;
2929 }
2804 } else if (ch == '\t') 2930 else if (ch == '\t')
2805 ch = ' '; /* translate '\t' to space */ 2931 ch = ' '; /* translate '\t' to space */
2806 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2932 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2807 return NULL; /* other control character - exit */ 2933 return NULL; /* other control character - exit */
2808 if (n < sizeof(string) - 1) 2934 if (n < sizeof(string) - 1)
2809 string[n++] = ch; 2935 string[n++] = ch;
2810 seen_esc = 0; 2936 seen_esc = 0;
2811 } 2937 }
2812 string[n++] = '\0'; 2938 string[n++] = '\0';
2813 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2939 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL)
2814 return NULL; 2940 return NULL;
2815 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2941 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2816 STRNCPY(s, string, n); 2942 STRNCPY(s, string, n);
2817 return s; 2943 return s;
2818} 2944}
2819 2945
2820/*----------------------------------------------------------------------*/ 2946/*----------------------------------------------------------------------*/
2821/* 2947/*
2822 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2948 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2823 */ 2949 */
2824void 2950void
2825rxvt_term::process_dcs_seq () 2951rxvt_term::process_dcs_seq ()
2826{ 2952{
2827 unsigned char eh, *s; 2953 unsigned char eh, *s;
2828/* 2954 /*
2829 * Not handled yet 2955 * Not handled yet
2830 */ 2956 */
2831 s = get_to_st (&eh); 2957 s = get_to_st (&eh);
2832 if (s) 2958 if (s)
2833 free(s); 2959 free(s);
2834 return; 2960 return;
2835} 2961}
2836 2962
2837/*----------------------------------------------------------------------*/ 2963/*----------------------------------------------------------------------*/
2838/* 2964/*
2839 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2965 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2840 */ 2966 */
2841void 2967void
2842rxvt_term::process_osc_seq () 2968rxvt_term::process_osc_seq ()
2843{ 2969{
2844 unsigned char ch, eh, *s; 2970 unsigned char ch, eh, *s;
2845 int arg; 2971 int arg;
2846 2972
2847 ch = cmd_getc (); 2973 ch = cmd_getc ();
2848 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2974 for (arg = 0; isdigit(ch); ch = cmd_getc ())
2849 arg = arg * 10 + (ch - '0'); 2975 arg = arg * 10 + (ch - '0');
2850 2976
2851 if (ch == ';') { 2977 if (ch == ';')
2978 {
2852 s = get_to_st (&eh); 2979 s = get_to_st (&eh);
2853 if (s) { 2980 if (s)
2854 /* 2981 {
2982 /*
2855 * rxvt_menubar_dispatch() violates the constness of the string, 2983 * rxvt_menubar_dispatch() violates the constness of the string,
2856 * so do it here 2984 * so do it here
2857 */ 2985 */
2858 if (arg == XTerm_Menu) 2986 if (arg == XTerm_Menu)
2859#if 0 /* XXX: currently disabled due to security concerns */ 2987#if 0 /* XXX: currently disabled due to security concerns */
2860 menubar_dispatch ((char *)s); 2988 menubar_dispatch ((char *)s);
2861#else 2989#else
2862 (void)0; 2990 (void)0;
2863#endif 2991#endif
2864 else 2992 else
2865 xterm_seq (arg, (char *)s, eh); 2993 xterm_seq (arg, (char *)s, eh);
2866 free(s); 2994 free(s);
2867 } 2995 }
2868 } 2996 }
2869} 2997}
2870/* 2998/*
2871 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2999 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2872 * 0 = change iconName/title 3000 * 0 = change iconName/title
… …
2889 * 55 = dump scrollback buffer and all of screen 3017 * 55 = dump scrollback buffer and all of screen
2890 */ 3018 */
2891void 3019void
2892rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3020rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused)))
2893{ 3021{
2894 int changed = 0; 3022 int changed = 0;
2895 int color; 3023 int color;
2896 char *buf, *name; 3024 char *buf, *name;
2897 3025
2898 assert(str != NULL); 3026 assert(str != NULL);
2899 switch (op) { 3027 switch (op)
3028 {
2900 case XTerm_name: 3029 case XTerm_name:
2901 set_title (str); 3030 set_title (str);
2902 /* FALLTHROUGH */ 3031 /* FALLTHROUGH */
2903 case XTerm_iconName: 3032 case XTerm_iconName:
2904 set_iconName (str); 3033 set_iconName (str);
2905 break; 3034 break;
2906 case XTerm_title: 3035 case XTerm_title:
2907 set_title (str); 3036 set_title (str);
2908 break; 3037 break;
2909 case XTerm_Color: 3038 case XTerm_Color:
2910 for (buf = (char *)str; buf && *buf;) { 3039 for (buf = (char *)str; buf && *buf;)
3040 {
2911 if ((name = STRCHR(buf, ';')) == NULL) 3041 if ((name = STRCHR(buf, ';')) == NULL)
2912 break; 3042 break;
2913 *name++ = '\0'; 3043 *name++ = '\0';
2914 color = atoi(buf); 3044 color = atoi(buf);
2915 if (color < 0 || color >= TOTAL_COLORS) 3045 if (color < 0 || color >= TOTAL_COLORS)
2916 break; 3046 break;
2917 if ((buf = STRCHR(name, ';')) != NULL) 3047 if ((buf = STRCHR(name, ';')) != NULL)
2918 *buf++ = '\0'; 3048 *buf++ = '\0';
2919 set_window_color (color + minCOLOR, name); 3049 set_window_color (color + minCOLOR, name);
2920 } 3050 }
2921 break; 3051 break;
2922#ifndef NO_CURSORCOLOR 3052#ifndef NO_CURSORCOLOR
2923 case XTerm_Color_cursor: 3053 case XTerm_Color_cursor:
2924 set_window_color (Color_cursor, str); 3054 set_window_color (Color_cursor, str);
2925 break; 3055 break;
2926#endif 3056#endif
2927 case XTerm_Color_pointer: 3057 case XTerm_Color_pointer:
2928 set_window_color (Color_pointer, str); 3058 set_window_color (Color_pointer, str);
2929 break; 3059 break;
2930#ifndef NO_BOLD_UNDERLINE_REVERSE 3060#ifndef NO_BOLD_UNDERLINE_REVERSE
2931 case XTerm_Color_BD: 3061 case XTerm_Color_BD:
2932 set_window_color (Color_BD, str); 3062 set_window_color (Color_BD, str);
2933 break; 3063 break;
2934 case XTerm_Color_UL: 3064 case XTerm_Color_UL:
2935 set_window_color (Color_UL, str); 3065 set_window_color (Color_UL, str);
2936 break; 3066 break;
2937 case XTerm_Color_RV: 3067 case XTerm_Color_RV:
2938 set_window_color (Color_RV, str); 3068 set_window_color (Color_RV, str);
2939 break; 3069 break;
2940#endif 3070#endif
2941 3071
2942 case XTerm_Menu: 3072 case XTerm_Menu:
2943 /* 3073 /*
2944 * rxvt_menubar_dispatch() violates the constness of the string, 3074 * rxvt_menubar_dispatch() violates the constness of the string,
2945 * so DON'T do it here 3075 * so DON'T do it here
2946 */ 3076 */
2947 break; 3077 break;
2948 case XTerm_Pixmap: 3078 case XTerm_Pixmap:
2949 if (*str != ';') { 3079 if (*str != ';')
3080 {
2950#if XPM_BACKGROUND 3081#if XPM_BACKGROUND
2951 scale_pixmap (""); /* reset to default scaling */ 3082 scale_pixmap (""); /* reset to default scaling */
2952 set_bgPixmap (str); /* change pixmap */ 3083 set_bgPixmap (str); /* change pixmap */
2953#endif 3084#endif
2954 scr_touch (true); 3085 scr_touch (true);
2955 } 3086 }
2956 while ((str = STRCHR(str, ';')) != NULL) { 3087 while ((str = STRCHR(str, ';')) != NULL)
2957 str++; 3088 {
3089 str++;
2958#if XPM_BACKGROUND 3090#if XPM_BACKGROUND
2959 changed += scale_pixmap (str); 3091 changed += scale_pixmap (str);
2960#endif 3092#endif
2961 } 3093
2962 if (changed) { 3094 }
3095 if (changed)
3096 {
2963#ifdef XPM_BACKGROUND 3097#ifdef XPM_BACKGROUND
2964 resize_pixmap (); 3098 resize_pixmap ();
2965#endif 3099#endif
2966 scr_touch (true); 3100 scr_touch (true);
2967 } 3101 }
2968 break; 3102 break;
2969 3103
2970 case XTerm_restoreFG: 3104 case XTerm_restoreFG:
2971 set_window_color (Color_fg, str); 3105 set_window_color (Color_fg, str);
2972 break; 3106 break;
2973 case XTerm_restoreBG: 3107 case XTerm_restoreBG:
2974 set_window_color (Color_bg, str); 3108 set_window_color (Color_bg, str);
2975 break; 3109 break;
2976 case XTerm_logfile: 3110 case XTerm_logfile:
2977 break; 3111 break;
2978 case XTerm_font: 3112 case XTerm_font:
2979 change_font (0, str); 3113 change_font (0, str);
2980 break; 3114 break;
2981#if 0 3115#if 0
2982 case XTerm_dumpscreen: /* no error notices */ 3116 case XTerm_dumpscreen: /* no error notices */
2983 { 3117 {
2984 int fd; 3118 int fd;
2985 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3119 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
2986 scr_dump (fd); 3120 {
2987 close(fd); 3121 scr_dump (fd);
2988 } 3122 close(fd);
2989 } 3123 }
2990 break; 3124 }
3125 break;
2991#endif 3126#endif
3127
2992 } 3128 }
2993} 3129}
2994/*----------------------------------------------------------------------*/ 3130/*----------------------------------------------------------------------*/
2995 3131
2996/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3132/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3004 * so no need for fancy checking 3140 * so no need for fancy checking
3005 */ 3141 */
3006int 3142int
3007rxvt_term::privcases (int mode, unsigned long bit) 3143rxvt_term::privcases (int mode, unsigned long bit)
3008{ 3144{
3009 int state; 3145 int state;
3010 3146
3011 if (mode == 's') { 3147 if (mode == 's')
3148 {
3012 SavedModes |= (PrivateModes & bit); 3149 SavedModes |= (PrivateModes & bit);
3013 return -1; 3150 return -1;
3014 } else { 3151 }
3152 else
3153 {
3015 if (mode == 'r') 3154 if (mode == 'r')
3016 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3155 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3017 else 3156 else
3018 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3157 state = (mode == 't') ? !(PrivateModes & bit) : mode;
3019 PrivMode(state, bit); 3158 PrivMode(state, bit);
3020 } 3159 }
3021 return state; 3160 return state;
3022} 3161}
3023 3162
3024/* we're not using priv _yet_ */ 3163/* we're not using priv _yet_ */
3025void 3164void
3026rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3165rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg)
3027{ 3166{
3028 unsigned int i, j; 3167 unsigned int i, j;
3029 int state; 3168 int state;
3030 static const struct { 3169 static const struct
3170 {
3031 const int argval; 3171 const int argval;
3032 const unsigned long bit; 3172 const unsigned long bit;
3173 }
3033 } argtopriv[] = { 3174 argtopriv[] = {
3034 { 1, PrivMode_aplCUR }, 3175 { 1, PrivMode_aplCUR },
3035 { 2, PrivMode_vt52 }, 3176 { 2, PrivMode_vt52 },
3036 { 3, PrivMode_132 }, 3177 { 3, PrivMode_132 },
3037 { 4, PrivMode_smoothScroll }, 3178 { 4, PrivMode_smoothScroll },
3038 { 5, PrivMode_rVideo }, 3179 { 5, PrivMode_rVideo },
3039 { 6, PrivMode_relOrigin }, 3180 { 6, PrivMode_relOrigin },
3040 { 7, PrivMode_Autowrap }, 3181 { 7, PrivMode_Autowrap },
3041 { 9, PrivMode_MouseX10 }, 3182 { 9, PrivMode_MouseX10 },
3042#ifdef menuBar_esc 3183#ifdef menuBar_esc
3043 { menuBar_esc, PrivMode_menuBar }, 3184 { menuBar_esc, PrivMode_menuBar },
3044#endif 3185#endif
3045#ifdef scrollBar_esc 3186#ifdef scrollBar_esc
3046 { scrollBar_esc, PrivMode_scrollBar }, 3187 { scrollBar_esc, PrivMode_scrollBar },
3047#endif 3188#endif
3048 { 25, PrivMode_VisibleCursor }, 3189 { 25, PrivMode_VisibleCursor },
3049 { 35, PrivMode_ShiftKeys }, 3190 { 35, PrivMode_ShiftKeys },
3050 { 40, PrivMode_132OK }, 3191 { 40, PrivMode_132OK },
3051 { 47, PrivMode_Screen }, 3192 { 47, PrivMode_Screen },
3052 { 66, PrivMode_aplKP }, 3193 { 66, PrivMode_aplKP },
3053#ifndef NO_BACKSPACE_KEY 3194#ifndef NO_BACKSPACE_KEY
3054 { 67, PrivMode_BackSpace }, 3195 { 67, PrivMode_BackSpace },
3055#endif 3196#endif
3056 { 1000, PrivMode_MouseX11 }, 3197 { 1000, PrivMode_MouseX11 },
3057 { 1010, PrivMode_TtyOutputInh }, 3198 { 1010, PrivMode_TtyOutputInh },
3058 { 1011, PrivMode_Keypress }, 3199 { 1011, PrivMode_Keypress },
3059 { 1047, PrivMode_Screen }, 3200 { 1047, PrivMode_Screen },
3060 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3201 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3061 }; 3202 };
3062 3203
3063 if (nargs == 0) 3204 if (nargs == 0)
3064 return; 3205 return;
3065 3206
3066/* make lo/hi boolean */ 3207 /* make lo/hi boolean */
3067 if (mode == 'l') 3208 if (mode == 'l')
3068 mode = 0; /* reset */ 3209 mode = 0; /* reset */
3069 else if (mode == 'h') 3210 else if (mode == 'h')
3070 mode = 1; /* set */ 3211 mode = 1; /* set */
3071 3212
3072 for (i = 0; i < nargs; i++) { 3213 for (i = 0; i < nargs; i++)
3214 {
3073 state = -1; 3215 state = -1;
3074 3216
3075 /* basic handling */ 3217 /* basic handling */
3076 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3218 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++)
3077 if (argtopriv[j].argval == arg[i]) { 3219 if (argtopriv[j].argval == arg[i])
3220 {
3078 state = privcases (mode, argtopriv[j].bit); 3221 state = privcases (mode, argtopriv[j].bit);
3079 break; 3222 break;
3080 } 3223 }
3081 3224
3082 /* extra handling for values with state unkept */ 3225 /* extra handling for values with state unkept */
3083 if (state == -1) 3226 if (state == -1)
3084 switch (arg[i]) { 3227 switch (arg[i])
3228 {
3085 case 1048: /* alternative cursor save */ 3229 case 1048: /* alternative cursor save */
3086 if (mode == 0) 3230 if (mode == 0)
3087 scr_cursor (RESTORE); 3231 scr_cursor (RESTORE);
3088 else if (mode == 1) 3232 else if (mode == 1)
3089 scr_cursor (SAVE); 3233 scr_cursor (SAVE);
3090 /* FALLTHROUGH */ 3234 /* FALLTHROUGH */
3091 default: 3235 default:
3092 continue; /* for(;i;) */ 3236 continue; /* for(;i;) */
3093 } 3237 }
3094 3238
3095 /* extra handling for values with valid 0 or 1 state */ 3239 /* extra handling for values with valid 0 or 1 state */
3096 switch (arg[i]) { 3240 switch (arg[i])
3241 {
3097 /* case 1: - application cursor keys */ 3242 /* case 1: - application cursor keys */
3098 case 2: /* VT52 mode */ 3243 case 2: /* VT52 mode */
3099 /* oddball mode. should be set regardless of set/reset 3244 /* oddball mode. should be set regardless of set/reset
3100 * parameter. Return from VT52 mode with an ESC < from 3245 * parameter. Return from VT52 mode with an ESC < from
3101 * within VT52 mode 3246 * within VT52 mode
3102 */ 3247 */
3103 PrivMode(1, PrivMode_vt52); 3248 PrivMode(1, PrivMode_vt52);
3104 break; 3249 break;
3105 case 3: /* 80/132 */ 3250 case 3: /* 80/132 */
3106 if (PrivateModes & PrivMode_132OK) 3251 if (PrivateModes & PrivMode_132OK)
3107 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3252 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth),
3108 (unsigned int)TermWin.height); 3253 (unsigned int)TermWin.height);
3109 break; 3254 break;
3110 case 4: /* smooth scrolling */ 3255 case 4: /* smooth scrolling */
3111 if (state) 3256 if (state)
3112 Options &= ~Opt_jumpScroll; 3257 Options &= ~Opt_jumpScroll;
3113 else 3258 else
3114 Options |= Opt_jumpScroll; 3259 Options |= Opt_jumpScroll;
3115 break; 3260 break;
3116 case 5: /* reverse video */ 3261 case 5: /* reverse video */
3117 scr_rvideo_mode (state); 3262 scr_rvideo_mode (state);
3118 break; 3263 break;
3119 case 6: /* relative/absolute origins */ 3264 case 6: /* relative/absolute origins */
3120 scr_relative_origin (state); 3265 scr_relative_origin (state);
3121 break; 3266 break;
3122 case 7: /* autowrap */ 3267 case 7: /* autowrap */
3123 scr_autowrap (state); 3268 scr_autowrap (state);
3124 break; 3269 break;
3125 /* case 8: - auto repeat, can't do on a per window basis */ 3270 /* case 8: - auto repeat, can't do on a per window basis */
3126 case 9: /* X10 mouse reporting */ 3271 case 9: /* X10 mouse reporting */
3127 if (state) /* orthogonal */ 3272 if (state) /* orthogonal */
3128 PrivateModes &= ~(PrivMode_MouseX11); 3273 PrivateModes &= ~(PrivMode_MouseX11);
3129 break; 3274 break;
3130#ifdef menuBar_esc 3275#ifdef menuBar_esc
3131 case menuBar_esc: 3276 case menuBar_esc:
3132#ifdef MENUBAR 3277#ifdef MENUBAR
3133 map_menuBar (state); 3278 map_menuBar (state);
3134#endif 3279#endif
3135 break; 3280 break;
3136#endif 3281#endif
3137#ifdef scrollBar_esc 3282#ifdef scrollBar_esc
3138 case scrollBar_esc: 3283 case scrollBar_esc:
3139 if (scrollbar_mapping (state)) { 3284 if (scrollbar_mapping (state))
3285 {
3140 resize_all_windows (0, 0, 0); 3286 resize_all_windows (0, 0, 0);
3141 scr_touch (true); 3287 scr_touch (true);
3142 } 3288 }
3143 break; 3289 break;
3144#endif 3290#endif
3145 case 25: /* visible/invisible cursor */ 3291 case 25: /* visible/invisible cursor */
3146 scr_cursor_visible (state); 3292 scr_cursor_visible (state);
3147 break; 3293 break;
3148 /* case 35: - shift keys */ 3294 /* case 35: - shift keys */
3149 /* case 40: - 80 <--> 132 mode */ 3295 /* case 40: - 80 <--> 132 mode */
3150 case 47: /* secondary screen */ 3296 case 47: /* secondary screen */
3151 scr_change_screen (state); 3297 scr_change_screen (state);
3152 break; 3298 break;
3153 /* case 66: - application key pad */ 3299 /* case 66: - application key pad */
3154 /* case 67: - backspace key */ 3300 /* case 67: - backspace key */
3155 case 1000: /* X11 mouse reporting */ 3301 case 1000: /* X11 mouse reporting */
3156 if (state) /* orthogonal */ 3302 if (state) /* orthogonal */
3157 PrivateModes &= ~(PrivMode_MouseX10); 3303 PrivateModes &= ~(PrivMode_MouseX10);
3158 break; 3304 break;
3159#if 0 3305#if 0
3160 case 1001: 3306 case 1001:
3161 break; /* X11 mouse highlighting */ 3307 break; /* X11 mouse highlighting */
3162#endif 3308#endif
3163 case 1010: /* scroll to bottom on TTY output inhibit */ 3309 case 1010: /* scroll to bottom on TTY output inhibit */
3164 if (state) 3310 if (state)
3165 Options &= ~Opt_scrollTtyOutput; 3311 Options &= ~Opt_scrollTtyOutput;
3166 else 3312 else
3167 Options |= Opt_scrollTtyOutput; 3313 Options |= Opt_scrollTtyOutput;
3168 break; 3314 break;
3169 case 1011: /* scroll to bottom on key press */ 3315 case 1011: /* scroll to bottom on key press */
3170 if (state) 3316 if (state)
3171 Options |= Opt_scrollTtyKeypress; 3317 Options |= Opt_scrollTtyKeypress;
3172 else 3318 else
3173 Options &= ~Opt_scrollTtyKeypress; 3319 Options &= ~Opt_scrollTtyKeypress;
3174 break; 3320 break;
3175 case 1047: /* secondary screen w/ clearing */ 3321 case 1047: /* secondary screen w/ clearing */
3176 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3322 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3177 if (current_screen != PRIMARY) 3323 if (current_screen != PRIMARY)
3178 scr_erase_screen (2); 3324 scr_erase_screen (2);
3179 scr_change_screen (state); 3325 scr_change_screen (state);
3180 /* FALLTHROUGH */ 3326 /* FALLTHROUGH */
3181 default: 3327 default:
3182 break; 3328 break;
3183 } 3329 }
3184 } 3330 }
3185} 3331}
3186/*}}} */ 3332/*}}} */
3187 3333
3188/*{{{ process sgr sequences */ 3334/*{{{ process sgr sequences */
3189void 3335void
3190rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3336rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3191{ 3337{
3192 unsigned int i; 3338 unsigned int i;
3193 short rendset; 3339 short rendset;
3194 int rendstyle; 3340 int rendstyle;
3195 3341
3196 if (nargs == 0) { 3342 if (nargs == 0)
3343 {
3197 scr_rendition (0, ~RS_None); 3344 scr_rendition (0, ~RS_None);
3198 return; 3345 return;
3199 } 3346 }
3200 for (i = 0; i < nargs; i++) { 3347 for (i = 0; i < nargs; i++)
3348 {
3201 rendset = -1; 3349 rendset = -1;
3202 switch (arg[i]) { 3350 switch (arg[i])
3203 case 0: 3351 {
3352 case 0:
3204 rendset = 0, rendstyle = ~RS_None; 3353 rendset = 0, rendstyle = ~RS_None;
3205 break; 3354 break;
3206 case 1: 3355 case 1:
3207 rendset = 1, rendstyle = RS_Bold; 3356 rendset = 1, rendstyle = RS_Bold;
3208 break; 3357 break;
3209 case 4: 3358 case 4:
3210 rendset = 1, rendstyle = RS_Uline; 3359 rendset = 1, rendstyle = RS_Uline;
3211 break; 3360 break;
3212 case 5: 3361 case 5:
3213 rendset = 1, rendstyle = RS_Blink; 3362 rendset = 1, rendstyle = RS_Blink;
3214 break; 3363 break;
3215 case 7: 3364 case 7:
3216 rendset = 1, rendstyle = RS_RVid; 3365 rendset = 1, rendstyle = RS_RVid;
3217 break; 3366 break;
3218 case 22: 3367 case 22:
3219 rendset = 0, rendstyle = RS_Bold; 3368 rendset = 0, rendstyle = RS_Bold;
3220 break; 3369 break;
3221 case 24: 3370 case 24:
3222 rendset = 0, rendstyle = RS_Uline; 3371 rendset = 0, rendstyle = RS_Uline;
3223 break; 3372 break;
3224 case 25: 3373 case 25:
3225 rendset = 0, rendstyle = RS_Blink; 3374 rendset = 0, rendstyle = RS_Blink;
3226 break; 3375 break;
3227 case 27: 3376 case 27:
3228 rendset = 0, rendstyle = RS_RVid; 3377 rendset = 0, rendstyle = RS_RVid;
3229 break; 3378 break;
3230 } 3379 }
3231 if (rendset != -1) { 3380 if (rendset != -1)
3381 {
3232 scr_rendition (rendset, rendstyle); 3382 scr_rendition (rendset, rendstyle);
3233 continue; /* for(;i;) */ 3383 continue; /* for(;i;) */
3234 } 3384 }
3235 3385
3236 switch (arg[i]) { 3386 switch (arg[i])
3237 case 30: 3387 {
3388 case 30:
3238 case 31: /* set fg color */ 3389 case 31: /* set fg color */
3239 case 32: 3390 case 32:
3240 case 33: 3391 case 33:
3241 case 34: 3392 case 34:
3242 case 35: 3393 case 35:
3243 case 36: 3394 case 36:
3244 case 37: 3395 case 37:
3245 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3396 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)),
3246 Color_fg); 3397 Color_fg);
3247 break; 3398 break;
3248#ifdef TTY_256COLOR 3399#ifdef TTY_256COLOR
3249 case 38: 3400 case 38:
3250 if (nargs > i + 2 && arg[i + 1] == 5) { 3401 if (nargs > i + 2 && arg[i + 1] == 5)
3402 {
3251 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3403 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3252 Color_fg); 3404 Color_fg);
3253 i += 2; 3405 i += 2;
3254 } 3406 }
3255 break; 3407 break;
3256#endif 3408#endif
3257 case 39: /* default fg */ 3409 case 39: /* default fg */
3258 scr_color (Color_fg, Color_fg); 3410 scr_color (Color_fg, Color_fg);
3259 break; 3411 break;
3260 3412
3261 case 40: 3413 case 40:
3262 case 41: /* set bg color */ 3414 case 41: /* set bg color */
3263 case 42: 3415 case 42:
3264 case 43: 3416 case 43:
3265 case 44: 3417 case 44:
3266 case 45: 3418 case 45:
3267 case 46: 3419 case 46:
3268 case 47: 3420 case 47:
3269 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3421 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)),
3270 Color_bg); 3422 Color_bg);
3271 break; 3423 break;
3272#ifdef TTY_256COLOR 3424#ifdef TTY_256COLOR
3273 case 48: 3425 case 48:
3274 if (nargs > i + 2 && arg[i + 1] == 5) { 3426 if (nargs > i + 2 && arg[i + 1] == 5)
3427 {
3275 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3428 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3276 Color_bg); 3429 Color_bg);
3277 i += 2; 3430 i += 2;
3278 } 3431 }
3279 break; 3432 break;
3280#endif 3433#endif
3281 case 49: /* default bg */ 3434 case 49: /* default bg */
3282 scr_color (Color_bg, Color_bg); 3435 scr_color (Color_bg, Color_bg);
3283 break; 3436 break;
3284 3437
3285#ifndef NO_BRIGHTCOLOR 3438#ifndef NO_BRIGHTCOLOR
3286 case 90: 3439 case 90:
3287 case 91: /* set bright fg color */ 3440 case 91: /* set bright fg color */
3288 case 92: 3441 case 92:
3289 case 93: 3442 case 93:
3290 case 94: 3443 case 94:
3291 case 95: 3444 case 95:
3292 case 96: 3445 case 96:
3293 case 97: 3446 case 97:
3294 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3447 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)),
3295 Color_fg); 3448 Color_fg);
3296 break; 3449 break;
3297 case 100: 3450 case 100:
3298 case 101: /* set bright bg color */ 3451 case 101: /* set bright bg color */
3299 case 102: 3452 case 102:
3300 case 103: 3453 case 103:
3301 case 104: 3454 case 104:
3302 case 105: 3455 case 105:
3303 case 106: 3456 case 106:
3304 case 107: 3457 case 107:
3305 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3458 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)),
3306 Color_bg); 3459 Color_bg);
3307 break; 3460 break;
3308#endif 3461#endif
3309 } 3462
3463 }
3310 } 3464 }
3311} 3465}
3312/*}}} */ 3466/*}}} */
3313 3467
3314/*{{{ process Rob Nation's own graphics mode sequences */ 3468/*{{{ process Rob Nation's own graphics mode sequences */
3315void 3469void
3316rxvt_term::process_graphics () 3470rxvt_term::process_graphics ()
3317{ 3471{
3318 unsigned char ch, cmd = cmd_getc (); 3472 unsigned char ch, cmd = cmd_getc ();
3319 3473
3320#ifndef RXVT_GRAPHICS 3474#ifndef RXVT_GRAPHICS
3475 if (cmd == 'Q')
3321 if (cmd == 'Q') { /* query graphics */ 3476 { /* query graphics */
3322 tt_printf("\033G0\n"); /* no graphics */ 3477 tt_printf("\033G0\n"); /* no graphics */
3323 return; 3478 return;
3324 } 3479 }
3325/* swallow other graphics sequences until terminating ':' */ 3480 /* swallow other graphics sequences until terminating ':' */
3326 do 3481 do
3327 ch = cmd_getc (); 3482 ch = cmd_getc ();
3328 while (ch != ':'); 3483 while (ch != ':');
3329#else 3484#else
3330 unsigned int nargs; 3485 unsigned int nargs;
3331 int args[NGRX_PTS]; 3486 int args[NGRX_PTS];
3332 unsigned char *text = NULL; 3487 unsigned char *text = NULL;
3333 3488
3489 if (cmd == 'Q')
3334 if (cmd == 'Q') { /* query graphics */ 3490 { /* query graphics */
3335 tt_printf("\033G1\n"); /* yes, graphics (color) */ 3491 tt_printf("\033G1\n"); /* yes, graphics (color) */
3336 return; 3492 return;
3337 } 3493 }
3338 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3494 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3495 {
3339 int neg; 3496 int neg;
3340 3497
3341 ch = cmd_getc ();
3342 neg = (ch == '-');
3343 if (neg || ch == '+')
3344 ch = cmd_getc (); 3498 ch = cmd_getc ();
3499 neg = (ch == '-');
3500 if (neg || ch == '+')
3501 ch = cmd_getc ();
3345 3502
3346 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ()) 3503 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3347 args[nargs] = args[nargs] * 10 + (ch - '0'); 3504 args[nargs] = args[nargs] * 10 + (ch - '0');
3348 if (neg) 3505 if (neg)
3349 args[nargs] = -args[nargs]; 3506 args[nargs] = -args[nargs];
3350 3507
3351 nargs++; 3508 nargs++;
3352 args[nargs] = 0; 3509 args[nargs] = 0;
3353 if (ch != ';') 3510 if (ch != ';')
3354 break; 3511 break;
3355 } 3512 }
3356 3513
3357 if ((cmd == 'T') && (nargs >= 5)) { 3514 if ((cmd == 'T') && (nargs >= 5))
3515 {
3358 int i, len = args[4]; 3516 int i, len = args[4];
3359 3517
3360 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); 3518 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3361 3519
3362 if (text != NULL) { 3520 if (text != NULL)
3521 {
3363 for (i = 0; i < len; i++) 3522 for (i = 0; i < len; i++)
3364 text[i] = cmd_getc (); 3523 text[i] = cmd_getc ();
3365 text[len] = '\0'; 3524 text[len] = '\0';
3366 } 3525 }
3367 } 3526 }
3368 Gr_do_graphics (cmd, nargs, args, text); 3527 Gr_do_graphics (cmd, nargs, args, text);
3369#endif 3528#endif
3370} 3529}
3371/*}}} */ 3530/*}}} */
3372 3531
3373/* ------------------------------------------------------------------------- */ 3532/* ------------------------------------------------------------------------- */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines