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.38 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.116 by root, Wed Aug 4 03:29:28 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * 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>
7 * - original version 7 * - original version
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
51 52
52#include <wchar.h> 53#include <wchar.h>
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61
56/*{{{ Convert the keypress event into a string */ 62/*{{{ Convert the keypress event into a string */
57void 63void
58rxvt_term::lookup_key (XKeyEvent &ev) 64rxvt_term::lookup_key (XKeyEvent &ev)
59{ 65{
60 int ctrl, meta, shft, len; 66 int ctrl, meta, shft, len;
61 unsigned int newlen; 67 unsigned int newlen;
62 KeySym keysym; 68 KeySym keysym;
63#ifdef DEBUG_CMD 69#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 70 static int debug_key = 1; /* accessible by a debugger only */
65#endif 71#endif
66 int valid_keysym; 72 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 73 unsigned char kbuf[KBUFSZ];
68 74
69 /* 75 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 77 * escape sequence to toggle the Keypad.
… …
77 meta = (ev.state & ModMetaMask); 83 meta = (ev.state & ModMetaMask);
78 84
79 if (numlock_state || (ev.state & ModNumLockMask)) 85 if (numlock_state || (ev.state & ModNumLockMask))
80 { 86 {
81 numlock_state = (ev.state & ModNumLockMask); 87 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 88 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 89 }
84 90
85 kbuf[0] = 0; 91 kbuf[0] = 0;
86 92
87#ifdef USE_XIM 93#ifdef USE_XIM
88 if (Input_Context) 94 if (Input_Context)
89 { 95 {
90 Status status_return; 96 Status status_return;
91 97
98#if 0
92#ifdef X_HAVE_UTF8_STRING 99#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 102 KBUFSZ, &keysym, &status_return);
96 else 103 else
97#endif 104#endif
98 105#endif
99 { 106 {
100 wchar_t wkbuf[KBUFSZ + 1]; 107 wchar_t wkbuf[KBUFSZ + 1];
101 108
102 // the XOpenIM manpage lies about hardcoding the locale 109 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 110 // at the point of XOpenIM, so temporarily switch locales
… …
108 KBUFSZ, &keysym, &status_return); 115 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 116 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 117 SET_LOCALE (locale);
111 118
112 if (status_return == XLookupChars 119 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 120 || status_return == XLookupBoth)
114 { 121 {
122 /* make sure the user can type ctrl-@, i.e. NUL */
123 if (len == 1 && *wkbuf == 0)
124 {
125 kbuf[0] = 0;
126 len = 1;
127 }
128 else
129 {
115 wkbuf[len] = 0; 130 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 131 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 132 if (len < 0)
118 len = 0; 133 len = 0;
134 }
119 } 135 }
120 else 136 else
121 len = 0; 137 len = 0;
122 } 138 }
123 139
124 valid_keysym = status_return == XLookupKeySym 140 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 141 || status_return == XLookupBoth;
126 } 142 }
127 else 143 else
128#endif 144#endif
129
130 { 145 {
131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 147 valid_keysym = keysym != NoSymbol;
133 } 148 }
134 149
135 if (valid_keysym) 150 if (valid_keysym)
136 { 151 {
137 /* for some backwards compatibility */
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
139# ifdef HOTKEY_CTRL
140 if (ctrl)
141# else
142 if (meta)
143# endif
144 {
145 if (keysym == ks_bigfont)
146 {
147 change_font (0, FONT_UP);
148 return;
149 }
150 else if (keysym == ks_smallfont)
151 {
152 change_font (0, FONT_DN);
153 return;
154 }
155 }
156#endif
157
158 if (TermWin.saveLines) 152 if (TermWin.saveLines)
159 { 153 {
160#ifdef UNSHIFTED_SCROLLKEYS 154#ifdef UNSHIFTED_SCROLLKEYS
161 if (!ctrl && !meta) 155 if (!ctrl && !meta)
162 { 156 {
163#else 157#else
164 if (IS_SCROLL_MOD) 158 if (IS_SCROLL_MOD)
165 { 159 {
166#endif 160#endif
167 int lnsppg; 161 int lnsppg;
168 162
169#ifdef PAGING_CONTEXT_LINES 163#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 165#else
172 lnsppg = TermWin.nrow * 4 / 5; 166 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 204 scr_move_to (1, 0);
211 return; 205 return;
212 } 206 }
213 } 207 }
214#endif 208#endif
215
216 } 209 }
217 210
218 if (shft) 211 if (shft)
219 { 212 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 213 /* Shift + F1 - F10 generates F11 - F20 */
… …
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 224 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev.time, 0, 0); 225 selection_request (ev.time, 0, 0);
233 return; 226 return;
234 /* rxvt extras */ 227 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 228 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 229 change_font (FONT_UP);
237 return; 230 return;
238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
239 change_font (0, FONT_DN); 232 change_font (FONT_DN);
240 return; 233 return;
241 } 234 }
242 } 235 }
243 } 236 }
244#ifdef PRINTPIPE 237#ifdef PRINTPIPE
… …
246 { 239 {
247 scr_printscreen (ctrl | shft); 240 scr_printscreen (ctrl | shft);
248 return; 241 return;
249 } 242 }
250#endif 243#endif
251#ifdef GREEK_SUPPORT
252 if (keysym == ks_greekmodeswith)
253 {
254 greek_mode = !greek_mode;
255 if (greek_mode)
256 {
257 xterm_seq (XTerm_title,
258 (greek_getmode() == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset();
261 }
262 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return;
265 }
266#endif
267 244
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 245 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 { 246 {
270#ifdef KEYSYM_RESOURCE 247#ifdef KEYSYM_RESOURCE
271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 249 {
273 unsigned int l; 250 unsigned int l;
274 const unsigned char *kbuf0; 251 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC;
276 252
277 kbuf0 = (Keysym_map[keysym & 0xFF]); 253 kbuf0 = (Keysym_map[keysym & 0xFF]);
278 l = (unsigned int)*kbuf0++; 254 l = (unsigned int)*kbuf0++;
279 255
280 /* escape prefix */ 256 /* escape prefix */
281 if (meta) 257 if (meta
282# ifdef META8_OPTION 258# ifdef META8_OPTION
283 if (meta_char == C0_ESC) 259 && meta_char == C0_ESC
284# endif 260# endif
261 )
262 {
263 const unsigned char ch = C0_ESC;
285 tt_write (&ch, 1); 264 tt_write (&ch, 1);
265 }
266
286 tt_write (kbuf0, l); 267 tt_write (kbuf0, l);
287 return; 268 return;
288 } 269 }
289 else 270 else
290#endif 271#endif
291
292 { 272 {
293 newlen = 1; 273 newlen = 1;
294 switch (keysym) 274 switch (keysym)
295 { 275 {
296#ifndef NO_BACKSPACE_KEY 276#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 277 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 278 if (PrivateModes & PrivMode_HaveBackSpace)
299 { 279 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 281 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 282 kbuf[1] = '\0';
303 } 283 }
304 else 284 else
305 STRCPY(kbuf, key_backspace); 285 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 {
309 int col, row;
310
311 newlen = STRLEN(kbuf);
312 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2(screen.rend[row][col]))
315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
316 }
317# endif
318 break; 286 break;
319#endif 287#endif
320#ifndef NO_DELETE_KEY 288#ifndef NO_DELETE_KEY
321 case XK_Delete: 289 case XK_Delete:
322 STRCPY(kbuf, key_delete); 290 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack)
325 {
326 int col, row;
327
328 newlen = STRLEN(kbuf);
329 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col]))
332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
333 }
334# endif
335 break; 291 break;
336#endif 292#endif
337 case XK_Tab: 293 case XK_Tab:
338 if (shft) 294 if (shft)
339 STRCPY(kbuf, "\033[Z"); 295 STRCPY (kbuf, "\033[Z");
340 else 296 else
341 { 297 {
342#ifdef CTRL_TAB_MAKES_META 298#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 299 if (ctrl)
344 meta = 1; 300 meta = 1;
… …
348 meta = 1; 304 meta = 1;
349#endif 305#endif
350 newlen = 0; 306 newlen = 0;
351 } 307 }
352 break; 308 break;
353
354 309
355#ifdef XK_KP_Left 310#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 311 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 312 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 313 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 314 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 316 {
362 STRCPY(kbuf, "\033OZ"); 317 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 318 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 319 break;
365 } 320 }
366 else 321 else
367 /* translate to std. cursor key */ 322 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 323 keysym = XK_Left + (keysym - XK_KP_Left);
… …
370#endif 325#endif
371 case XK_Up: /* "\033[A" */ 326 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 327 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 328 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 329 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 330 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 331 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 332 /* do Shift first */
378 if (shft) 333 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 334 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 335 else if (ctrl)
381 { 336 {
382 kbuf[1] = 'O'; 337 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 338 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 339 }
385 else if (PrivateModes & PrivMode_aplCUR) 340 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 341 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET
388 //TODO: ??
389 if (Options & Opt_mc_hack)
390 {
391 int col, row, m;
392
393 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines;
395 m = 0;
396 if (keysym == XK_Right
397 && IS_MULTI1(screen.rend[row][col]))
398 m = 1;
399 else if (keysym == XK_Left)
400 {
401 if (col > 0)
402 {
403 if (IS_MULTI2(screen.rend[row][col - 1]))
404 m = 1;
405 }
406 else if (screen.cur.row > 0)
407 {
408 col = screen.tlen[--row];
409 if (col == -1)
410 col = TermWin.ncol - 1;
411 else
412 col--;
413 if (col > 0
414 && IS_MULTI2(screen.rend[row][col]))
415 m = 1;
416 }
417 }
418 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
420 }
421#endif
422 break; 342 break;
423 343
424#ifndef UNSHIFTED_SCROLLKEYS 344#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 345# ifdef XK_KP_Prior
426 case XK_KP_Prior: 346 case XK_KP_Prior:
427 /* allow shift to override */ 347 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
429 { 349 {
430 STRCPY(kbuf, "\033Oy"); 350 STRCPY (kbuf, "\033Oy");
431 break; 351 break;
432 } 352 }
433 /* FALLTHROUGH */ 353 /* FALLTHROUGH */
434# endif 354# endif
435 case XK_Prior: 355 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 356 STRCPY (kbuf, "\033[5~");
437 break; 357 break;
438# ifdef XK_KP_Next 358# ifdef XK_KP_Next
439 case XK_KP_Next: 359 case XK_KP_Next:
440 /* allow shift to override */ 360 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 { 362 {
443 STRCPY(kbuf, "\033Os"); 363 STRCPY (kbuf, "\033Os");
444 break; 364 break;
445 } 365 }
446 /* FALLTHROUGH */ 366 /* FALLTHROUGH */
447# endif 367# endif
448 case XK_Next: 368 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 369 STRCPY (kbuf, "\033[6~");
450 break; 370 break;
451#endif 371#endif
452 case XK_KP_Enter: 372 case XK_KP_Enter:
453 /* allow shift to override */ 373 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 { 375 {
456 STRCPY(kbuf, "\033OM"); 376 STRCPY (kbuf, "\033OM");
457 } 377 }
458 else 378 else
459 { 379 {
460 kbuf[0] = '\r'; 380 kbuf[0] = '\r';
461 kbuf[1] = '\0'; 381 kbuf[1] = '\0';
462 } 382 }
463 break; 383 break;
464 384
465#ifdef XK_KP_Begin 385#ifdef XK_KP_Begin
466 case XK_KP_Begin: 386 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 387 STRCPY (kbuf, "\033Ou");
468 break; 388 break;
469 389
470 case XK_KP_Insert: 390 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op"); 391 STRCPY (kbuf, "\033Op");
472 break; 392 break;
473 393
474 case XK_KP_Delete: 394 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On"); 395 STRCPY (kbuf, "\033On");
476 break; 396 break;
477#endif 397#endif
478 case XK_KP_F1: /* "\033OP" */ 398 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 399 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 400 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 401 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 402 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 403 kbuf[2] += (keysym - XK_KP_F1);
484 break; 404 break;
485 405
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 406 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 407 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 408 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 409 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 410 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 411 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 412 case XK_KP_0: /* "\033Op" : "0" */
… …
500 case XK_KP_8: /* "\033Ox" : "8" */ 420 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 421 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 422 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
504 { 424 {
505 STRCPY(kbuf, "\033Oj"); 425 STRCPY (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 426 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 427 }
508 else 428 else
509 { 429 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 431 kbuf[1] = '\0';
512 } 432 }
513 break; 433 break;
514 434
515 case XK_Find: 435 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 436 STRCPY (kbuf, "\033[1~");
517 break; 437 break;
518 case XK_Insert: 438 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 439 STRCPY (kbuf, "\033[2~");
520 break; 440 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 441#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 442 case DXK_Remove:
523 /* FALLTHROUGH */ 443 /* FALLTHROUGH */
524#endif 444#endif
525 case XK_Execute: 445 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 446 STRCPY (kbuf, "\033[3~");
527 break; 447 break;
528 case XK_Select: 448 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 449 STRCPY (kbuf, "\033[4~");
530 break; 450 break;
531#ifdef XK_KP_End 451#ifdef XK_KP_End
532 case XK_KP_End: 452 case XK_KP_End:
533 /* allow shift to override */ 453 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
535 { 455 {
536 STRCPY(kbuf, "\033Oq"); 456 STRCPY (kbuf, "\033Oq");
537 break; 457 break;
538 } 458 }
539 /* FALLTHROUGH */ 459 /* FALLTHROUGH */
540#endif 460#endif
541 case XK_End: 461 case XK_End:
542 STRCPY(kbuf, KS_END); 462 STRCPY (kbuf, KS_END);
543 break; 463 break;
544#ifdef XK_KP_Home 464#ifdef XK_KP_Home
545 case XK_KP_Home: 465 case XK_KP_Home:
546 /* allow shift to override */ 466 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
548 { 468 {
549 STRCPY(kbuf, "\033Ow"); 469 STRCPY (kbuf, "\033Ow");
550 break; 470 break;
551 } 471 }
552 /* FALLTHROUGH */ 472 /* FALLTHROUGH */
553#endif 473#endif
554 case XK_Home: 474 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 475 STRCPY (kbuf, KS_HOME);
556 break; 476 break;
557 477
558#define FKEY(n, fkey) \ 478#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 480
561 case XK_F1: /* "\033[11~" */ 481 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 482 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 483 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 484 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 485 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 486 FKEY (11, XK_F1);
567 break; 487 break;
568 case XK_F6: /* "\033[17~" */ 488 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 489 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 490 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 491 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 492 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 493 FKEY (17, XK_F6);
574 break; 494 break;
575 case XK_F11: /* "\033[23~" */ 495 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 496 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 497 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 498 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 499 FKEY (23, XK_F11);
580 break; 500 break;
581 case XK_F15: /* "\033[28~" */ 501 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 502 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 503 FKEY (28, XK_F15);
584 break; 504 break;
585 case XK_Help: /* "\033[28~" */ 505 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 506 FKEY (28, XK_Help);
587 break; 507 break;
588 case XK_Menu: /* "\033[29~" */ 508 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 509 FKEY (29, XK_Menu);
590 break; 510 break;
591 case XK_F17: /* "\033[31~" */ 511 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 512 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 513 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 514 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 525 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 526 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 527 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 528 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 529 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 530 FKEY (31, XK_F17);
611 break; 531 break;
612#undef FKEY 532#undef FKEY
613 default: 533 default:
614 newlen = 0; 534 newlen = 0;
615 break; 535 break;
616 } 536 }
617 if (newlen) 537 if (newlen)
618 len = STRLEN(kbuf); 538 len = STRLEN (kbuf);
619 } 539 }
540
620 /* 541 /*
621 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
622 */ 543 */
623#ifdef META8_OPTION 544#ifdef META8_OPTION
624 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
… …
639 { 560 {
640 unsigned char *ch; 561 unsigned char *ch;
641 562
642 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 564 *ch |= 0x80;
565
644 meta = 0; 566 meta = 0;
645 } 567 }
646#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat(kbuf, len);
650#endif 568#endif
651 /* nil */ ; 569 /* nil */ ;
652 } 570 }
653 } 571 }
654 572
… …
677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 595 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
678 596
679 /* escape prefix */ 597 /* escape prefix */
680 if (meta 598 if (meta
681#ifdef META8_OPTION 599#ifdef META8_OPTION
682 && (meta_char == C0_ESC) 600 && meta_char == C0_ESC
683#endif 601#endif
684 ) 602 )
685 { 603 {
686 const unsigned char ch = C0_ESC; 604 const unsigned char ch = C0_ESC;
687
688 tt_write(&ch, 1); 605 tt_write (&ch, 1);
689 } 606 }
607
690#ifdef DEBUG_CMD 608#if defined(DEBUG_CMD)
691 if (debug_key)
692 { /* Display keyboard buffer contents */ 609 /* Display keyboard buffer contents */
693 char *p; 610 unsigned char *p;
694 int i; 611 int i;
695 612
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 614 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 616 fprintf (stderr, "'\n");
700 }
701#endif /* DEBUG_CMD */ 617#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 618 tt_write (kbuf, (unsigned int)len);
703} 619}
704/*}}} */ 620/*}}} */
705 621
706#if (MENUBAR_MAX) 622#if (MENUBAR_MAX)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
709unsigned int 625unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 627{
712 unsigned int n, s; 628 unsigned int n, s;
713 629
714 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632
716 if (n > 0 && s < count) 633 if (n > 0 && s < count)
717 { 634 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 637 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 638 cmdbuf_endp -= n;
722 s += n; 639 s += n;
723 } 640 }
641
724 if (count > s) 642 if (count > s)
725 { 643 {
726 rxvt_print_error("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
727 count = s; 645 count = s;
728 } 646 }
647
729 for (; count--;) 648 for (; count--;)
730 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
650
651 cmd_parse ();
652
731 return 0; 653 return 0;
732} 654}
733#endif /* MENUBAR_MAX */ 655#endif /* MENUBAR_MAX */
734 656
735void 657void
… …
750 scr_refresh (refresh_type); 672 scr_refresh (refresh_type);
751 scrollbar_show (1); 673 scrollbar_show (1);
752#ifdef USE_XIM 674#ifdef USE_XIM
753 IMSendSpot (); 675 IMSendSpot ();
754#endif 676#endif
755
756 } 677 }
757 678
758 XFlush (display->display); 679 display->flush ();
680
681 flush_ev.stop ();
759} 682}
760 683
761void 684void
762rxvt_term::check_cb (check_watcher &w) 685rxvt_term::check_cb (check_watcher &w)
763{ 686{
764 SET_R (this); 687 SET_R (this);
765 SET_LOCALE (locale); 688 SET_LOCALE (locale);
766 689
690 display->flush ();
691
692 if (!flush_ev.active)
693 flush_ev.start (NOW + 0.01);
694}
695
696void
697rxvt_term::flush_cb (time_watcher &w)
698{
699 SET_R (this);
700 SET_LOCALE (locale);
701
702 refresh_limit = 1;
703 refresh_count = 0;
767 flush (); 704 flush ();
768} 705}
769 706
770#ifdef CURSOR_BLINK 707#ifdef CURSOR_BLINK
771void 708void
… …
789 w.start (w.at + TEXT_BLINK_INTERVAL); 726 w.start (w.at + TEXT_BLINK_INTERVAL);
790 } 727 }
791} 728}
792#endif 729#endif
793 730
731#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
732void
733rxvt_term::cont_scroll_cb (time_watcher &w)
734{
735 if ((scrollbar_isUp() || scrollbar_isDn()) &&
736 scr_page (scrollbar_isUp() ? UP : DN, 1))
737 {
738 refresh_type |= SMOOTH_REFRESH;
739 want_refresh = 1;
740 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
741 }
742}
743#endif
744
745#ifdef SELECTION_SCROLLING
746void
747rxvt_term::sel_scroll_cb (time_watcher &w)
748{
749 if (scr_page (scroll_selection_dir, scroll_selection_lines))
750 {
751 selection_extend (selection_save_x, selection_save_y, selection_save_state);
752 refresh_type |= SMOOTH_REFRESH;
753 want_refresh = 1;
754 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
755 }
756}
757#endif
758
759#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
760void
761rxvt_term::slip_wheel_cb (time_watcher &w)
762{
763 if (mouse_slip_wheel_speed == 0
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed))
766 {
767 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 }
771}
772#endif
773
794bool 774bool
795rxvt_term::pty_fill () 775rxvt_term::pty_fill ()
796{ 776{
797 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 777 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
778
779 if (CBUFSIZ == n)
780 {
781 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
782 n = 0;
783 }
798 784
799 memmove (cmdbuf_base, cmdbuf_ptr, n); 785 memmove (cmdbuf_base, cmdbuf_ptr, n);
800 cmdbuf_ptr = cmdbuf_base; 786 cmdbuf_ptr = cmdbuf_base;
801 cmdbuf_endp = cmdbuf_ptr + n; 787 cmdbuf_endp = cmdbuf_ptr + n;
802 788
803 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
804 790
805 if (n > 0) 791 if (n > 0)
806 { 792 {
807 cmdbuf_endp += n; 793 cmdbuf_endp += n;
808 return true; 794 return true;
809 } 795 }
810 else if (n < 0 && errno != EAGAIN) 796 else if (n < 0 && errno != EAGAIN)
811 destroy (); 797 destroy ();
812 798
813 return false; 799 return false;
814} 800}
815 801
816void 802void
817rxvt_term::pty_cb (io_watcher &w, short revents) 803rxvt_term::pty_cb (io_watcher &w, short revents)
… …
820 SET_LOCALE (locale); 806 SET_LOCALE (locale);
821 807
822 if (revents & EVENT_WRITE) 808 if (revents & EVENT_WRITE)
823 tt_write (0, 0); 809 tt_write (0, 0);
824 else if (revents & EVENT_READ) 810 else if (revents & EVENT_READ)
825 {
826 bool flag = true;
827
828 // loop, but don't allow a single term to monopolize us 811 // loop, but don't allow a single term to monopolize us
829 // the number of loops is fully arbitrary, and thus wrong
830 while (flag && pty_fill ()) 812 while (pty_fill ())
831 { 813 if (cmd_parse ())
832 if (!seen_input)
833 {
834 seen_input = 1;
835 /* once we know the shell is running, send the screen size. Again! */
836 tt_winch ();
837 }
838
839 uint32_t ch = NOCHAR;
840
841 for (;;)
842 {
843 if (ch == NOCHAR)
844 ch = next_char ();
845
846 if (ch == NOCHAR) // TODO: improve
847 break; 814 break;
848
849 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
850 {
851 /* Read a text string from the input buffer */
852 uint32_t buf[BUFSIZ];
853 bool refreshnow = false;
854 int nlines = 0;
855 uint32_t *str = buf;
856
857 *str++ = ch;
858
859 for (;;)
860 {
861 ch = next_char ();
862
863 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
864 break;
865 else
866 {
867 *str++ = ch;
868
869 if (ch == '\n')
870 {
871 nlines++;
872 refresh_count++;
873
874 if (!(Options & Opt_jumpScroll)
875 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
876 {
877 refreshnow = true;
878 flag = false;
879 ch = NOCHAR;
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;
889 }
890 }
891
892 if (str >= buf + BUFSIZ)
893 {
894 ch = NOCHAR;
895 break;
896 }
897 }
898 }
899
900 scr_add_lines (buf, nlines, str - buf);
901
902 /*
903 * If there have been a lot of new lines, then update the screen
904 * What the heck I'll cheat and only refresh less than every page-full.
905 * the number of pages between refreshes is refresh_limit, which
906 * is incremented here because we must be doing flat-out scrolling.
907 *
908 * refreshing should be correct for small scrolls, because of the
909 * time-out
910 */
911 if (refreshnow)
912 {
913 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
914 refresh_limit++;
915
916 scr_refresh (refresh_type);
917 }
918
919 }
920 else
921 {
922 switch (ch)
923 {
924 default:
925 process_nonprinting (ch);
926 break;
927 case C0_ESC: /* escape char */
928 process_escape_seq ();
929 break;
930 /*case 0x9b: */ /* CSI */
931 /* process_csi_seq (); */
932 }
933
934 ch = NOCHAR;
935 }
936 }
937 }
938 }
939} 815}
940 816
941// read the next character, currently handles UTF-8 817void
942// will probably handle all sorts of other stuff in the future 818rxvt_term::pointer_unblank ()
943uint32_t
944rxvt_term::next_char ()
945{ 819{
946 while (cmdbuf_ptr < cmdbuf_endp) 820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
947 { 821 recolour_cursor ();
948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
949 return *cmdbuf_ptr++;
950 822
951 wchar_t wc; 823#ifdef POINTER_BLANK
952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 824 hidden_pointer = 0;
953 825
954 if (len == (size_t)-2) 826 if (Options & Opt_pointerBlank)
955 return NOCHAR; 827 pointer_ev.start (NOW + pointerBlankDelay);
956 828#endif
957 if (len == (size_t)-1)
958 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
959
960 // assume wchar == unicode
961 cmdbuf_ptr += len;
962 return wc;
963 }
964
965 return NOCHAR;
966}
967
968/* rxvt_cmd_getc() - Return next input character */
969/*
970 * Return the next input character after first passing any keyboard input
971 * to the command.
972 */
973uint32_t
974rxvt_term::cmd_getc ()
975{
976 for (;;)
977 {
978 uint32_t c = next_char ();
979 if (c != NOCHAR)
980 return c;
981
982 // incomplete sequences should occur rarely, still, a better solution
983 // would be preferred. either setjmp/longjmp or better design.
984 fcntl (cmd_fd, F_SETFL, 0);
985 pty_fill ();
986 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
987 }
988} 829}
989 830
990#ifdef POINTER_BLANK 831#ifdef POINTER_BLANK
991void 832void
992rxvt_term::pointer_unblank ()
993{
994 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
995 recolour_cursor ();
996
997 hidden_pointer = 0;
998
999 if (Options & Opt_pointerBlank)
1000 pointer_ev.start (NOW + pointerBlankDelay);
1001}
1002
1003void
1004rxvt_term::pointer_blank () 833rxvt_term::pointer_blank ()
1005{ 834{
1006 if (!(Options & Opt_pointerBlank)) 835 if (! (Options & Opt_pointerBlank))
1007 return; 836 return;
1008 837
1009 XDefineCursor (display->display, TermWin.vt, blank_cursor); 838 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1010 XFlush (display->display); 839 XFlush (display->display);
1011 840
… …
1021 pointer_blank (); 850 pointer_blank ();
1022} 851}
1023#endif 852#endif
1024 853
1025void 854void
1026rxvt_term::mouse_report (const XButtonEvent &ev) 855rxvt_term::mouse_report (XButtonEvent &ev)
1027{ 856{
1028 int button_number, key_state = 0; 857 int button_number, key_state = 0;
1029 int x, y; 858 int x, y;
1030 859
1031 x = ev.x; 860 x = ev.x;
1032 y = ev.y; 861 y = ev.y;
1033 pixel_position (&x, &y); 862 pixel_position (&x, &y);
1034 863
… …
1071#endif 900#endif
1072 901
1073 } 902 }
1074 903
1075#ifdef DEBUG_MOUSEREPORT 904#ifdef DEBUG_MOUSEREPORT
1076 fprintf(stderr, "Mouse ["); 905 fprintf (stderr, "Mouse [");
1077 if (key_state & 16) 906 if (key_state & 16)
1078 fputc('C', stderr); 907 fputc ('C', stderr);
1079 if (key_state & 4) 908 if (key_state & 4)
1080 fputc('S', stderr); 909 fputc ('S', stderr);
1081 if (key_state & 8) 910 if (key_state & 8)
1082 fputc('A', stderr); 911 fputc ('A', stderr);
1083 if (key_state & 32) 912 if (key_state & 32)
1084 fputc('2', stderr); 913 fputc ('2', stderr);
1085 fprintf(stderr, "]: <%d>, %d/%d\n", 914 fprintf (stderr, "]: <%d>, %d/%d\n",
1086 button_number, 915 button_number,
1087 x + 1, 916 x + 1,
1088 y + 1); 917 y + 1);
1089#else 918#else
1090 tt_printf("\033[M%c%c%c", 919 tt_printf ("\033[M%c%c%c",
1091 (32 + button_number + key_state), 920 (32 + button_number + key_state),
1092 (32 + x + 1), 921 (32 + x + 1),
1093 (32 + y + 1)); 922 (32 + y + 1));
1094#endif 923#endif
1095} 924}
1096 925
1097#ifdef USING_W11LIB 926#ifdef USING_W11LIB
1098void 927void
1099rxvt_W11_process_x_event(XEvent *ev) 928rxvt_W11_process_x_event (XEvent *ev)
1100{ 929{
1101 rxvt_t *r = rxvt_get_r(); 930 rxvt_t *r = rxvt_get_r ();
1102 931
1103 x_cb (*ev); 932 x_cb (*ev);
1104} 933}
1105#endif 934#endif
1106 935
… …
1189#endif 1018#endif
1190 1019
1191#ifdef DEBUG_X 1020#ifdef DEBUG_X
1192 struct timeval tp; 1021 struct timeval tp;
1193 struct tm *ltt; 1022 struct tm *ltt;
1194 (void)gettimeofday(&tp, NULL); 1023 (void)gettimeofday (&tp, NULL);
1195 ltt = localtime(&(tp.tv_sec)); 1024 ltt = localtime (& (tp.tv_sec));
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)); 1025 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));
1197#endif 1026#endif
1198 1027
1199 switch (ev.type) 1028 switch (ev.type)
1200 { 1029 {
1201 case KeyPress: 1030 case KeyPress:
… …
1204 1033
1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1206 case KeyRelease: 1035 case KeyRelease:
1207 { 1036 {
1208 if (!(ev.xkey.state & ControlMask)) 1037 if (!(ev.xkey.state & ControlMask))
1209 mouse_slip_wheel_speed = 0; 1038 slip_wheel_ev.stop ();
1210 else 1039 else
1211 { 1040 {
1212 KeySym ks; 1041 KeySym ks;
1213 1042
1214 ks = XKeycodeToKeysym(display->display, ev.xkey.keycode, 0); 1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1215 if (ks == XK_Control_L || ks == XK_Control_R) 1044 if (ks == XK_Control_L || ks == XK_Control_R)
1216 mouse_slip_wheel_speed = 0; 1045 mouse_slip_wheel_speed = 0;
1217 } 1046 }
1218 break; 1047 break;
1219 } 1048 }
… …
1237 && (ev.xclient.data.l[0] == DndFile 1066 && (ev.xclient.data.l[0] == DndFile
1238 || ev.xclient.data.l[0] == DndDir 1067 || ev.xclient.data.l[0] == DndDir
1239 || ev.xclient.data.l[0] == DndLink)) 1068 || ev.xclient.data.l[0] == DndLink))
1240 { 1069 {
1241 /* Get Dnd data */ 1070 /* Get Dnd data */
1242 Atom ActualType; 1071 Atom ActualType;
1243 int ActualFormat; 1072 int ActualFormat;
1244 unsigned char *data; 1073 unsigned char *data;
1245 unsigned long Size, RemainingBytes; 1074 unsigned long Size, RemainingBytes;
1246 1075
1247 XGetWindowProperty(display->display, display->root, 1076 XGetWindowProperty (display->display, display->root,
1248 xa[XA_DNDSELECTION], 1077 xa[XA_DNDSELECTION],
1249 0L, 1000000L, 1078 0L, 1000000L,
1250 False, AnyPropertyType, 1079 False, AnyPropertyType,
1251 &ActualType, &ActualFormat, 1080 &ActualType, &ActualFormat,
1252 &Size, &RemainingBytes, 1081 &Size, &RemainingBytes,
1253 &data); 1082 &data);
1254 XChangeProperty(display->display, display->root, 1083 XChangeProperty (display->display, display->root,
1255 XA_CUT_BUFFER0, XA_STRING, 1084 XA_CUT_BUFFER0, XA_STRING,
1256 8, PropModeReplace, 1085 8, PropModeReplace,
1257 data, STRLEN(data)); 1086 data, STRLEN (data));
1087 XFree (data);
1258 selection_paste (display->root, XA_CUT_BUFFER0, True); 1088 selection_paste (display->root, XA_CUT_BUFFER0, True);
1259 XSetInputFocus(display->display, display->root, RevertToNone, CurrentTime); 1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1260 } 1090 }
1261#endif /* OFFIX_DND */ 1091#endif /* OFFIX_DND */
1262 break; 1092 break;
1263 1093
1264 case MappingNotify: 1094 case MappingNotify:
1265 XRefreshKeyboardMapping(&(ev.xmapping)); 1095 XRefreshKeyboardMapping (&ev.xmapping);
1266 break; 1096 break;
1267 1097
1268 /* 1098 /*
1269 * XXX: this is not the _current_ arrangement 1099 * XXX: this is not the _current_ arrangement
1270 * Here's my conclusion: 1100 * Here's my conclusion:
… …
1295 { 1125 {
1296 TermWin.focus = 1; 1126 TermWin.focus = 1;
1297 want_refresh = 1; 1127 want_refresh = 1;
1298#ifdef USE_XIM 1128#ifdef USE_XIM
1299 if (Input_Context != NULL) 1129 if (Input_Context != NULL)
1300 XSetICFocus(Input_Context); 1130 XSetICFocus (Input_Context);
1301#endif 1131#endif
1302#ifdef CURSOR_BLINK 1132#ifdef CURSOR_BLINK
1303 if (Options & Opt_cursorBlink) 1133 if (Options & Opt_cursorBlink)
1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif
1136#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade])
1138 {
1139 PixColors = PixColorsFocused;
1140 set_colorfgbg ();
1141 scr_clear ();
1142 scr_touch (true);
1143 }
1305#endif 1144#endif
1306 1145
1307 } 1146 }
1308 break; 1147 break;
1309 1148
… …
1312 { 1151 {
1313 TermWin.focus = 0; 1152 TermWin.focus = 0;
1314 want_refresh = 1; 1153 want_refresh = 1;
1315#ifdef USE_XIM 1154#ifdef USE_XIM
1316 if (Input_Context != NULL) 1155 if (Input_Context != NULL)
1317 XUnsetICFocus(Input_Context); 1156 XUnsetICFocus (Input_Context);
1318#endif 1157#endif
1319#ifdef CURSOR_BLINK 1158#ifdef CURSOR_BLINK
1320 if (Options & Opt_cursorBlink) 1159 if (Options & Opt_cursorBlink)
1321 cursor_blink_ev.stop (); 1160 cursor_blink_ev.stop ();
1322 hidden_cursor = 0; 1161 hidden_cursor = 0;
1323#endif 1162#endif
1163#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade])
1165 {
1166 PixColors = PixColorsUnFocused;
1167 set_colorfgbg ();
1168 scr_clear ();
1169 scr_touch (true);
1170 }
1171#endif
1324 1172
1325 } 1173 }
1326 break; 1174 break;
1327 1175
1328 case ConfigureNotify: 1176 case ConfigureNotify:
… …
1332 1180
1333 do 1181 do
1334 { /* Wrap lots of configures into one */ 1182 { /* Wrap lots of configures into one */
1335 width = ev.xconfigure.width; 1183 width = ev.xconfigure.width;
1336 height = ev.xconfigure.height; 1184 height = ev.xconfigure.height;
1337 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1338 } 1186 }
1339 while (XCheckTypedWindowEvent(display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1340 1188
1341 if (szHint.width != width || szHint.height != height) 1189 if (szHint.width != width || szHint.height != height)
1342 {
1343 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1344 resize_all_windows (width, height, 1); 1190 resize_all_windows (width, height, 1);
1345 } 1191
1346#ifdef DEBUG_SIZE
1347 else
1348 {
1349 D_SIZE((stderr, "Size: Not resizing"));
1350 }
1351#endif
1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1353 if (Options & Opt_transparent) 1193 if (Options & Opt_transparent)
1354 { 1194 {
1355 check_our_parents (); 1195 check_our_parents ();
1356 if (am_transparent) 1196 if (am_transparent)
1357 want_full_refresh = 1; 1197 want_full_refresh = 1;
1358 } 1198 }
1359#endif 1199#endif
1360
1361 } 1200 }
1362 break; 1201 break;
1363 1202
1364 case SelectionClear: 1203 case SelectionClear:
1365 selection_clear (); 1204 selection_clear ();
… …
1387#ifdef TEXT_BLINK 1226#ifdef TEXT_BLINK
1388 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1227 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1389#endif 1228#endif
1390 break; 1229 break;
1391 1230
1392 case PropertyNotify:
1393 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1394 if (ev.xproperty.state == PropertyNewValue)
1395 selection_property (ev.xproperty.window, ev.xproperty.atom);
1396 break;
1397
1398#ifdef TRANSPARENT 1231#ifdef TRANSPARENT
1399 case ReparentNotify: 1232 case ReparentNotify:
1400 rootwin_cb (ev); 1233 rootwin_cb (ev);
1401 break; 1234 break;
1402#endif /* TRANSPARENT */ 1235#endif /* TRANSPARENT */
1403 1236
1404 case GraphicsExpose: 1237 case GraphicsExpose:
1405 case Expose: 1238 case Expose:
1406 if (ev.xany.window == TermWin.vt) 1239 if (ev.xany.window == TermWin.vt)
1407 { 1240 {
1408#ifdef NO_SLOW_LINK_SUPPORT 1241 do
1409 scr_expose (ev.xexpose.x, ev.xexpose.y, 1242 scr_expose (ev.xexpose.x, ev.xexpose.y,
1410 ev.xexpose.width, ev.xexpose.height, False); 1243 ev.xexpose.width, ev.xexpose.height, False);
1411#else 1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1412 // don't understand this, so commented it out 1245
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1413 scr_expose (ev.xexpose.x, ev.xexpose.y, 1249 scr_expose (ev.xexpose.x, ev.xexpose.y,
1414 ev.xexpose.width, ev.xexpose.height, False); 1250 ev.xexpose.width, ev.xexpose.height, False);
1415 //scr_expose (ev.xexpose.x, 0, 1251
1416 // ev.xexpose.width, TermWin.height, False); 1252 scr_refresh (refresh_type);
1417#endif
1418 want_refresh = 1;
1419 } 1253 }
1420 else 1254 else
1421 { 1255 {
1422 XEvent unused_event; 1256 XEvent unused_event;
1423 1257
1424 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1425 Expose, 1259 ;
1426 &unused_event)) ;
1427 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1428 GraphicsExpose, 1261 ;
1429 &unused_event)) ; 1262
1430 if (isScrollbarWindow(ev.xany.window)) 1263 if (isScrollbarWindow (ev.xany.window))
1431 { 1264 {
1432 scrollBar.setIdle(); 1265 scrollBar.setIdle ();
1433 scrollbar_show (0); 1266 scrollbar_show (0);
1434 } 1267 }
1435#ifdef MENUBAR 1268#ifdef MENUBAR
1436 if (menubar_visible () && isMenuBarWindow(ev.xany.window)) 1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1437 menubar_expose (); 1270 menubar_expose ();
1438#endif 1271#endif
1439#ifdef RXVT_GRAPHICS
1440 Gr_expose (ev.xany.window);
1441#endif
1442 1272
1273#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0])
1275 XClearWindow (display->display, ev.xany.window);
1276#endif
1443 } 1277 }
1444 break; 1278 break;
1445 1279
1446 case MotionNotify: 1280 case MotionNotify:
1447#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1448 if (hidden_pointer) 1282 if (hidden_pointer)
1449 pointer_unblank (); 1283 pointer_unblank ();
1450#endif 1284#endif
1451#if MENUBAR 1285#if MENUBAR
1452 if (isMenuBarWindow(ev.xany.window)) 1286 if (isMenuBarWindow (ev.xany.window))
1453 { 1287 {
1454 menubar_control (&(ev.xbutton)); 1288 menubar_control (ev.xbutton);
1455 break; 1289 break;
1456 } 1290 }
1457#endif 1291#endif
1458 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1459 break; 1293 break;
1460 1294
1461 if (ev.xany.window == TermWin.vt) 1295 if (ev.xany.window == TermWin.vt)
1462 { 1296 {
1463 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1464 { 1298 {
1465 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1466 ; 1300 ;
1467 1301
1468 XQueryPointer(display->display, TermWin.vt, 1302 XQueryPointer (display->display, TermWin.vt,
1469 &unused_root, &unused_child, 1303 &unused_root, &unused_child,
1470 &unused_root_x, &unused_root_y, 1304 &unused_root_x, &unused_root_y,
1471 &(ev.xbutton.x), &(ev.xbutton.y), 1305 & (ev.xbutton.x), & (ev.xbutton.y),
1472 &unused_mask); 1306 &unused_mask);
1473#ifdef MOUSE_THRESHOLD 1307#ifdef MOUSE_THRESHOLD
1474 /* deal with a `jumpy' mouse */ 1308 /* deal with a `jumpy' mouse */
1475 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1476 { 1310 {
1477#endif 1311#endif
1478 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1479 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1313 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1480#ifdef SELECTION_SCROLLING 1314#ifdef SELECTION_SCROLLING
1481 if (ev.xbutton.y < TermWin.int_bwidth 1315 if (ev.xbutton.y < TermWin.int_bwidth
1482 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1)) 1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1483 { 1317 {
1484 int dist; 1318 int dist;
1485
1486 pending_scroll_selection=1;
1487 1319
1488 /* don't clobber the current delay if we are 1320 /* don't clobber the current delay if we are
1489 * already in the middle of scrolling. 1321 * already in the middle of scrolling.
1490 */ 1322 */
1491 if (scroll_selection_delay<=0) 1323 if (!sel_scroll_ev.active)
1492 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1493 1325
1494 /* save the event params so we can highlight 1326 /* save the event params so we can highlight
1495 * the selection in the pending-scroll loop 1327 * the selection in the pending-scroll loop
1496 */ 1328 */
1497 selection_save_x=ev.xbutton.x; 1329 selection_save_x=ev.xbutton.x;
… …
1509 { 1341 {
1510 scroll_selection_dir = DN; 1342 scroll_selection_dir = DN;
1511 dist = ev.xbutton.y - 1343 dist = ev.xbutton.y -
1512 (TermWin.int_bwidth + TermWin.height); 1344 (TermWin.int_bwidth + TermWin.height);
1513 } 1345 }
1514 scroll_selection_lines=(Pixel2Height(dist)/ 1346 scroll_selection_lines= (Pixel2Height (dist)/
1515 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1347 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1516 MIN_IT(scroll_selection_lines, 1348 MIN_IT (scroll_selection_lines,
1517 SELECTION_SCROLL_MAX_LINES); 1349 SELECTION_SCROLL_MAX_LINES);
1518 } 1350 }
1519 else 1351 else
1520 { 1352 {
1521 /* we are within the text window, so we 1353 /* we are within the text window, so we
1522 * shouldn't be scrolling 1354 * shouldn't be scrolling
1523 */ 1355 */
1524 pending_scroll_selection = 0; 1356 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop();
1525 } 1358 }
1526#endif 1359#endif
1527#ifdef MOUSE_THRESHOLD 1360#ifdef MOUSE_THRESHOLD
1528 1361
1529 } 1362 }
1530#endif 1363#endif
1531 1364
1532 } 1365 }
1533 } 1366 }
1534 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion()) 1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1535 { 1368 {
1536 while (XCheckTypedWindowEvent(display->display, scrollBar.win, 1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1537 MotionNotify, &ev)) ; 1370 MotionNotify, &ev)) ;
1538 XQueryPointer(display->display, scrollBar.win, 1371 XQueryPointer (display->display, scrollBar.win,
1539 &unused_root, &unused_child, 1372 &unused_root, &unused_child,
1540 &unused_root_x, &unused_root_y, 1373 &unused_root_x, &unused_root_y,
1541 &(ev.xbutton.x), &(ev.xbutton.y), 1374 & (ev.xbutton.x), & (ev.xbutton.y),
1542 &unused_mask); 1375 &unused_mask);
1543 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO, 1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1544 scrollbar_size()); 1377 scrollbar_size ());
1545 scr_refresh (refresh_type); 1378 scr_refresh (refresh_type);
1546 refresh_limit = 0; 1379 refresh_limit = 0;
1547 scrollbar_show (1); 1380 scrollbar_show (1);
1548 } 1381 }
1549 break; 1382 break;
… …
1554rxvt_term::rootwin_cb (XEvent &ev) 1387rxvt_term::rootwin_cb (XEvent &ev)
1555{ 1388{
1556 SET_R (this); 1389 SET_R (this);
1557 SET_LOCALE (locale); 1390 SET_LOCALE (locale);
1558 1391
1559 if (ev.type == PropertyNotify) 1392 switch (ev.type)
1560 { 1393 {
1561 /* 1394 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /*
1562 * if user used some Esetroot compatible prog to set the root bg, 1405 * 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. 1406 * use the property to determine the pixmap. We use it later on.
1564 */ 1407 */
1565 if (xa[XA_XROOTPMAPID] == 0) 1408 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False); 1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1567 1410
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return; 1412 return;
1570 } 1413 }
1571 1414
1415 /* FALLTHROUGH */
1416 case ReparentNotify:
1572 if ((Options & Opt_transparent) && check_our_parents ()) 1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1573 {
1574 if (am_transparent)
1575 want_full_refresh = 1; 1418 want_full_refresh = 1;
1419 break;
1420#endif
1576 } 1421 }
1577} 1422}
1578 1423
1579void 1424void
1580rxvt_term::button_press (const XButtonEvent &ev) 1425rxvt_term::button_press (XButtonEvent &ev)
1581{ 1426{
1582 int reportmode = 0, clickintime; 1427 int reportmode = 0, clickintime;
1583 1428
1584 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1585 if (!bypass_keystate) 1430 if (!bypass_keystate)
1586 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1431 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1587 /* 1432 /*
1588 * VT window processing of button press 1433 * VT window processing of button press
1589 */ 1434 */
1590 if (ev.window == TermWin.vt) 1435 if (ev.window == TermWin.vt)
1591 { 1436 {
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; 1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1600 if (reportmode) 1438 if (reportmode)
1439 {
1440 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state;
1443#ifdef MOUSE_REPORT_DOUBLECLICK
1444 if (ev.button == MEvent.button && clickintime)
1601 { 1445 {
1602 /* mouse report from vt window */ 1446 /* same button, within alloted time */
1603 /* save the xbutton state (for ButtonRelease) */ 1447 MEvent.clicks++;
1604 MEvent.state = ev.state; 1448 if (MEvent.clicks > 1)
1605#ifdef MOUSE_REPORT_DOUBLECLICK
1606 if (ev.button == MEvent.button && clickintime)
1607 { 1449 {
1608 /* same button, within alloted time */
1609 MEvent.clicks++;
1610 if (MEvent.clicks > 1)
1611 {
1612 /* only report double clicks */ 1450 /* only report double clicks */
1613 MEvent.clicks = 2; 1451 MEvent.clicks = 2;
1614 mouse_report (ev); 1452 mouse_report (ev);
1615 1453
1616 /* don't report the release */ 1454 /* don't report the release */
1617 MEvent.clicks = 0; 1455 MEvent.clicks = 0;
1618 MEvent.button = AnyButton; 1456 MEvent.button = AnyButton;
1619 }
1620 } 1457 }
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 } 1458 }
1634 else 1459 else
1635 { 1460 {
1461 /* different button, or time expired */
1462 MEvent.clicks = 1;
1463 MEvent.button = ev.button;
1464 mouse_report (ev);
1465 }
1466#else
1467 MEvent.button = ev.button;
1468 mouse_report (ev);
1469#endif /* MOUSE_REPORT_DOUBLECLICK */
1470
1471 }
1472 else
1473 {
1636 if (ev.button != MEvent.button) 1474 if (ev.button != MEvent.button)
1637 MEvent.clicks = 0; 1475 MEvent.clicks = 0;
1638 switch (ev.button) 1476 switch (ev.button)
1639 { 1477 {
1640 case Button1: 1478 case Button1:
1641 /* allow shift+left click to extend selection */ 1479 /* allow shift+left click to extend selection */
1642 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1643 { 1481 {
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
1659 MEvent.button = Button1;
1660 break;
1661
1662 case Button3:
1663 if (MEvent.button == Button3 && clickintime) 1482 if (MEvent.button == Button1 && clickintime)
1664 selection_rotate (ev.x, ev.y); 1483 selection_rotate (ev.x, ev.y);
1665 else 1484 else
1666 selection_extend (ev.x, ev.y, 1); 1485 selection_extend (ev.x, ev.y, 1);
1486 }
1487 else
1488 {
1489 if (MEvent.button == Button1 && clickintime)
1490 MEvent.clicks++;
1491 else
1492 MEvent.clicks = 1;
1493
1494 selection_click (MEvent.clicks, ev.x, ev.y);
1495 }
1496
1497 MEvent.button = Button1;
1498 break;
1499
1500 case Button3:
1501 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y);
1503 else
1504 selection_extend (ev.x, ev.y, 1);
1667 MEvent.button = Button3; 1505 MEvent.button = Button3;
1668 break; 1506 break;
1669 }
1670 } 1507 }
1508 }
1671 MEvent.time = ev.time; 1509 MEvent.time = ev.time;
1672 return; 1510 return;
1673 }
1674 } 1511 }
1675 1512
1676 /* 1513 /*
1677 * Scrollbar window processing of button press 1514 * Scrollbar window processing of button press
1678 */ 1515 */
1679 if (isScrollbarWindow(ev.window)) 1516 if (isScrollbarWindow (ev.window))
1680 { 1517 {
1681 scrollBar.setIdle (); 1518 scrollBar.setIdle ();
1682 /* 1519 /*
1683 * Rxvt-style scrollbar: 1520 * Rxvt-style scrollbar:
1684 * move up if mouse is above slider 1521 * move up if mouse is above slider
… …
1696 * Mouse report disabled scrollbar: 1533 * Mouse report disabled scrollbar:
1697 * arrow buttons - send up/down 1534 * arrow buttons - send up/down
1698 * click on scrollbar - send pageup/down 1535 * click on scrollbar - send pageup/down
1699 */ 1536 */
1700 if ((scrollBar.style == R_SB_NEXT 1537 if ((scrollBar.style == R_SB_NEXT
1701 && scrollbarnext_upButton(ev.y)) 1538 && scrollbarnext_upButton (ev.y))
1702 || (scrollBar.style == R_SB_RXVT 1539 || (scrollBar.style == R_SB_RXVT
1703 && scrollbarrxvt_upButton(ev.y))) 1540 && scrollbarrxvt_upButton (ev.y)))
1704 tt_printf("\033[A"); 1541 tt_printf ("\033[A");
1705 else if ((scrollBar.style == R_SB_NEXT 1542 else if ((scrollBar.style == R_SB_NEXT
1706 && scrollbarnext_dnButton(ev.y)) 1543 && scrollbarnext_dnButton (ev.y))
1707 || (scrollBar.style == R_SB_RXVT 1544 || (scrollBar.style == R_SB_RXVT
1708 && scrollbarrxvt_dnButton(ev.y))) 1545 && scrollbarrxvt_dnButton (ev.y)))
1709 tt_printf("\033[B"); 1546 tt_printf ("\033[B");
1710 else 1547 else
1711 switch (ev.button) 1548 switch (ev.button)
1712 { 1549 {
1713 case Button2: 1550 case Button2:
1714 tt_printf("\014"); 1551 tt_printf ("\014");
1715 break; 1552 break;
1716 case Button1: 1553 case Button1:
1717 tt_printf("\033[6~"); 1554 tt_printf ("\033[6~");
1718 break; 1555 break;
1719 case Button3: 1556 case Button3:
1720 tt_printf("\033[5~"); 1557 tt_printf ("\033[5~");
1721 break; 1558 break;
1722 } 1559 }
1723 } 1560 }
1724 else 1561 else
1725#endif /* NO_SCROLLBAR_REPORT */ 1562#endif /* NO_SCROLLBAR_REPORT */
… …
1727 { 1564 {
1728 char upordown = 0; 1565 char upordown = 0;
1729 1566
1730 if (scrollBar.style == R_SB_NEXT) 1567 if (scrollBar.style == R_SB_NEXT)
1731 { 1568 {
1732 if (scrollbarnext_upButton(ev.y)) 1569 if (scrollbarnext_upButton (ev.y))
1733 upordown = -1; /* up */ 1570 upordown = -1; /* up */
1734 else if (scrollbarnext_dnButton(ev.y)) 1571 else if (scrollbarnext_dnButton (ev.y))
1735 upordown = 1; /* down */ 1572 upordown = 1; /* down */
1736 } 1573 }
1737 else if (scrollBar.style == R_SB_RXVT) 1574 else if (scrollBar.style == R_SB_RXVT)
1738 { 1575 {
1739 if (scrollbarrxvt_upButton(ev.y)) 1576 if (scrollbarrxvt_upButton (ev.y))
1740 upordown = -1; /* up */ 1577 upordown = -1; /* up */
1741 else if (scrollbarrxvt_dnButton(ev.y)) 1578 else if (scrollbarrxvt_dnButton (ev.y))
1742 upordown = 1; /* down */ 1579 upordown = 1; /* down */
1743 } 1580 }
1744 if (upordown) 1581 if (upordown)
1745 { 1582 {
1746#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1583#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1747 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1584 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1748#endif 1585#endif
1749 if (scr_page (upordown < 0 ? UP : DN, 1)) 1586 if (scr_page (upordown < 0 ? UP : DN, 1))
1750 { 1587 {
1751 if (upordown < 0) 1588 if (upordown < 0)
1752 scrollBar.setUp (); 1589 scrollBar.setUp ();
… …
1769 case R_SB_ALIGN_BOTTOM: 1606 case R_SB_ALIGN_BOTTOM:
1770 csrO = scrollBar.bot - scrollBar.top; 1607 csrO = scrollBar.bot - scrollBar.top;
1771 break; 1608 break;
1772 } 1609 }
1773 if (scrollBar.style == R_SB_XTERM 1610 if (scrollBar.style == R_SB_XTERM
1774 || scrollbar_above_slider(ev.y) 1611 || scrollbar_above_slider (ev.y)
1775 || scrollbar_below_slider(ev.y)) 1612 || scrollbar_below_slider (ev.y))
1776 scr_move_to ( scrollbar_position(ev.y) - csrO, 1613 scr_move_to ( scrollbar_position (ev.y) - csrO,
1777 scrollbar_size()); 1614 scrollbar_size ());
1778 scrollBar.setMotion (); 1615 scrollBar.setMotion ();
1779 break; 1616 break;
1780 1617
1781 case Button1: 1618 case Button1:
1782 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1619 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1784 /* FALLTHROUGH */ 1621 /* FALLTHROUGH */
1785 1622
1786 case Button3: 1623 case Button3:
1787 if (scrollBar.style != R_SB_XTERM) 1624 if (scrollBar.style != R_SB_XTERM)
1788 { 1625 {
1789 if (scrollbar_above_slider(ev.y)) 1626 if (scrollbar_above_slider (ev.y))
1790# ifdef RXVT_SCROLL_FULL 1627# ifdef RXVT_SCROLL_FULL
1791 scr_page (UP, TermWin.nrow - 1); 1628 scr_page (UP, TermWin.nrow - 1);
1792# else 1629# else
1793 scr_page (UP, TermWin.nrow / 4); 1630 scr_page (UP, TermWin.nrow / 4);
1794# endif 1631# endif
1795 else if (scrollbar_below_slider(ev.y)) 1632 else if (scrollbar_below_slider (ev.y))
1796# ifdef RXVT_SCROLL_FULL 1633# ifdef RXVT_SCROLL_FULL
1797 scr_page (DN, TermWin.nrow - 1); 1634 scr_page (DN, TermWin.nrow - 1);
1798# else 1635# else
1799 scr_page (DN, TermWin.nrow / 4); 1636 scr_page (DN, TermWin.nrow / 4);
1800# endif 1637# endif
… …
1803 } 1640 }
1804 else 1641 else
1805 { 1642 {
1806 scr_page ((ev.button == Button1 ? DN : UP), 1643 scr_page ((ev.button == Button1 ? DN : UP),
1807 (TermWin.nrow 1644 (TermWin.nrow
1808 * scrollbar_position(ev.y) 1645 * scrollbar_position (ev.y)
1809 / scrollbar_size())); 1646 / scrollbar_size ()));
1810 } 1647 }
1811 break; 1648 break;
1812 } 1649 }
1813 } 1650 }
1814 return; 1651 return;
1815 } 1652 }
1816#if MENUBAR 1653#if MENUBAR
1817 /* 1654 /*
1818 * Menubar window processing of button press 1655 * Menubar window processing of button press
1819 */ 1656 */
1820 if (isMenuBarWindow(ev.window)) 1657 if (isMenuBarWindow (ev.window))
1821 menubar_control (ev); 1658 menubar_control (ev);
1822#endif 1659#endif
1823} 1660}
1824 1661
1825void 1662void
1826rxvt_term::button_release (const XButtonEvent &ev) 1663rxvt_term::button_release (XButtonEvent &ev)
1827{ 1664{
1828 int reportmode = 0; 1665 int reportmode = 0;
1829 1666
1830 csrO = 0; /* reset csr Offset */ 1667 csrO = 0; /* reset csr Offset */
1831 if (!bypass_keystate) 1668 if (!bypass_keystate)
1832 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1669 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1833 1670
1834 if (scrollbar_isUpDn()) 1671 if (scrollbar_isUpDn ())
1835 { 1672 {
1836 scrollBar.setIdle (); 1673 scrollBar.setIdle ();
1837 scrollbar_show (0); 1674 scrollbar_show (0);
1838#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1839 refresh_type &= ~SMOOTH_REFRESH; 1676 refresh_type &= ~SMOOTH_REFRESH;
1840#endif 1677#endif
1841 1678
1842 } 1679 }
1843#ifdef SELECTION_SCROLLING 1680#ifdef SELECTION_SCROLLING
1844 pending_scroll_selection=0; 1681 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop();
1845#endif 1683#endif
1846 if (ev.window == TermWin.vt) 1684 if (ev.window == TermWin.vt)
1847 { 1685 {
1848#ifdef RXVT_GRAPHICS
1849 if (ev.subwindow != None)
1850 rxvt_Gr_ButtonRelease(ev.x, ev.y);
1851 else
1852#endif
1853
1854 {
1855 if (reportmode) 1686 if (reportmode)
1687 {
1688 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4)
1691 return;
1692#ifdef MOUSE_REPORT_DOUBLECLICK
1693 /* only report the release of 'slow' single clicks */
1694 if (MEvent.button != AnyButton
1695 && (ev.button != MEvent.button
1696 || (ev.time - MEvent.time
1697 > MULTICLICK_TIME / 2)))
1856 { 1698 {
1857 /* mouse report from vt window */
1858 /* don't report release of wheel "buttons" */
1859 if (ev.button >= 4)
1860 return;
1861#ifdef MOUSE_REPORT_DOUBLECLICK
1862 /* only report the release of 'slow' single clicks */
1863 if (MEvent.button != AnyButton
1864 && (ev.button != MEvent.button
1865 || (ev.time - MEvent.time
1866 > MULTICLICK_TIME / 2)))
1867 {
1868 MEvent.clicks = 0; 1699 MEvent.clicks = 0;
1869 MEvent.button = AnyButton;
1870 mouse_report (ev);
1871 }
1872#else /* MOUSE_REPORT_DOUBLECLICK */
1873 MEvent.button = AnyButton; 1700 MEvent.button = AnyButton;
1874 mouse_report (ev); 1701 mouse_report (ev);
1702 }
1703#else /* MOUSE_REPORT_DOUBLECLICK */
1704 MEvent.button = AnyButton;
1705 mouse_report (ev);
1875#endif /* MOUSE_REPORT_DOUBLECLICK */ 1706#endif /* MOUSE_REPORT_DOUBLECLICK */
1876 return; 1707 return;
1877 } 1708 }
1878 /* 1709 /*
1879 * dumb hack to compensate for the failure of click-and-drag 1710 * dumb hack to compensate for the failure of click-and-drag
1880 * when overriding mouse reporting 1711 * when overriding mouse reporting
1881 */ 1712 */
1882 if (PrivateModes & PrivMode_mouse_report 1713 if (PrivateModes & PrivMode_mouse_report
1883 && bypass_keystate 1714 && bypass_keystate
1884 && ev.button == Button1 && MEvent.clicks <= 1) 1715 && ev.button == Button1 && MEvent.clicks <= 1)
1885 selection_extend (ev.x, ev.y, 0); 1716 selection_extend (ev.x, ev.y, 0);
1886 1717
1887 switch (ev.button) 1718 switch (ev.button)
1719 {
1720 case Button1:
1721 case Button3:
1722 selection_make (ev.time);
1723 break;
1724 case Button2:
1725 selection_request (ev.time, ev.x, ev.y);
1726 break;
1727#ifdef MOUSE_WHEEL
1728 case Button4:
1729 case Button5:
1888 { 1730 {
1889 case Button1: 1731 int i;
1890 case Button3: 1732 page_dirn v;
1891 selection_make (ev.time); 1733
1734 v = ev.button == Button4 ? UP : DN;
1735
1736 if (ev.state & ShiftMask)
1892 break; 1737 i = 1;
1893 case Button2: 1738 else if (Options & Opt_mouseWheelScrollPage)
1894 selection_request (ev.time, ev.x, ev.y); 1739 i = TermWin.nrow - 1;
1740 else
1895 break; 1741 i = 5;
1742
1896#ifdef MOUSE_WHEEL 1743# ifdef MOUSE_SLIP_WHEELING
1897 case Button4: 1744 if (ev.state & ControlMask)
1898 case Button5:
1899 { 1745 {
1900 int i;
1901 page_dirn v;
1902
1903 v = (ev.button == Button4) ? UP : DN;
1904 if (ev.state & ShiftMask)
1905 i = 1;
1906 else if ((Options & Opt_mouseWheelScrollPage))
1907 i = TermWin.nrow - 1;
1908 else
1909 i = 5;
1910# ifdef MOUSE_SLIP_WHEELING
1911 if (ev.state & ControlMask)
1912 {
1913 mouse_slip_wheel_speed += (v ? -1 : 1); 1746 mouse_slip_wheel_speed += v ? -1 : 1;
1747 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
1748 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1749
1750 if (slip_wheel_ev.at < NOW)
1914 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1752
1753 slip_wheel_ev.start ();
1915 } 1754 }
1755 else
1756 {
1916# endif 1757# endif
1917# ifdef JUMP_MOUSE_WHEEL 1758# ifdef JUMP_MOUSE_WHEEL
1918 scr_page (v, i); 1759 scr_page (v, i);
1919 scr_refresh (SMOOTH_REFRESH); 1760 scr_refresh (SMOOTH_REFRESH);
1920 scrollbar_show (1); 1761 scrollbar_show (1);
… …
1924 scr_page (v, 1); 1765 scr_page (v, 1);
1925 scr_refresh (SMOOTH_REFRESH); 1766 scr_refresh (SMOOTH_REFRESH);
1926 scrollbar_show (1); 1767 scrollbar_show (1);
1927 } 1768 }
1928# endif 1769# endif
1929 1770# ifdef MOUSE_SLIP_WHEELING
1930 } 1771 }
1931 break;
1932#endif 1772#endif
1933
1934 } 1773 }
1774 break;
1775#endif
1935 } 1776 }
1936 } 1777 }
1937#ifdef MENUBAR 1778#ifdef MENUBAR
1938 else if (isMenuBarWindow(ev.window)) 1779 else if (isMenuBarWindow (ev.window))
1939 menubar_control (ev); 1780 menubar_control (ev);
1940#endif 1781#endif
1941} 1782}
1942 1783
1943
1944#ifdef TRANSPARENT 1784#ifdef TRANSPARENT
1785#if TINTING
1786/* taken from aterm-0.4.2 */
1787
1788typedef uint32_t RUINT32T;
1789
1790void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1791{
1792 int sh_r, sh_g, sh_b;
1793 RUINT32T mask_r, mask_g, mask_b;
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i;
1798
1799 Visual* visual = display->visual;
1800
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802
1803 /* for convenience */
1804 mask_r = visual->red_mask;
1805 mask_g = visual->green_mask;
1806 mask_b = visual->blue_mask;
1807
1808 /* boring lookup table pre-initialization */
1809 switch (srcImage->bits_per_pixel) {
1810 case 15:
1811 if ((mask_r != 0x7c00) ||
1812 (mask_g != 0x03e0) ||
1813 (mask_b != 0x001f))
1814 return;
1815 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1816 lookup_r = lookup;
1817 lookup_g = lookup+32;
1818 lookup_b = lookup+32+32;
1819 sh_r = 10;
1820 sh_g = 5;
1821 sh_b = 0;
1822 break;
1823 case 16:
1824 if ((mask_r != 0xf800) ||
1825 (mask_g != 0x07e0) ||
1826 (mask_b != 0x001f))
1827 return;
1828 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1829 lookup_r = lookup;
1830 lookup_g = lookup+32;
1831 lookup_b = lookup+32+64;
1832 sh_r = 11;
1833 sh_g = 5;
1834 sh_b = 0;
1835 break;
1836 case 24:
1837 if ((mask_r != 0xff0000) ||
1838 (mask_g != 0x00ff00) ||
1839 (mask_b != 0x0000ff))
1840 return;
1841 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1842 lookup_r = lookup;
1843 lookup_g = lookup+256;
1844 lookup_b = lookup+256+256;
1845 sh_r = 16;
1846 sh_g = 8;
1847 sh_b = 0;
1848 break;
1849 case 32:
1850 if ((mask_r != 0xff0000) ||
1851 (mask_g != 0x00ff00) ||
1852 (mask_b != 0x0000ff))
1853 return;
1854 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1855 lookup_r = lookup;
1856 lookup_g = lookup+256;
1857 lookup_b = lookup+256+256;
1858 sh_r = 16;
1859 sh_g = 8;
1860 sh_b = 0;
1861 break;
1862 default:
1863 return; /* we do not support this color depth */
1864 }
1865
1866 /* prepare limits for color transformation (each channel is handled separately) */
1867 if (shade < 0) {
1868 shade = -shade;
1869 if (shade < 0) shade = 0;
1870 if (shade > 100) shade = 100;
1871
1872 lower_lim_r = 65535-rm;
1873 lower_lim_g = 65535-gm;
1874 lower_lim_b = 65535-bm;
1875
1876 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1877 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1878 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1879
1880 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1881 } else {
1882 if (shade < 0) shade = 0;
1883 if (shade > 100) shade = 100;
1884
1885 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1886
1887 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1888 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1889 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1890 }
1891
1892 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1893 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1894 {
1895 unsigned int tmp;
1896
1897 tmp = lower_lim_r;
1898 lower_lim_r = lower_lim_b;
1899 lower_lim_b = tmp;
1900
1901 tmp = upper_lim_r;
1902 upper_lim_r = upper_lim_b;
1903 upper_lim_b = tmp;
1904 }
1905
1906 /* fill our lookup tables */
1907 for (i = 0; i <= mask_r>>sh_r; i++)
1908 {
1909 RUINT32T tmp;
1910 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1911 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1912 lookup_r[i] = (tmp/65535)<<sh_r;
1913 }
1914 for (i = 0; i <= mask_g>>sh_g; i++)
1915 {
1916 RUINT32T tmp;
1917 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1918 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1919 lookup_g[i] = (tmp/65535)<<sh_g;
1920 }
1921 for (i = 0; i <= mask_b>>sh_b; i++)
1922 {
1923 RUINT32T tmp;
1924 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1925 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1926 lookup_b[i] = (tmp/65535)<<sh_b;
1927 }
1928
1929 /* apply table to input image (replacing colors by newly calculated ones) */
1930 switch (srcImage->bits_per_pixel)
1931 {
1932 case 15:
1933 {
1934 unsigned short *p1, *pf, *p, *pl;
1935 p1 = (unsigned short *) srcImage->data;
1936 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1937 while (p1 < pf)
1938 {
1939 p = p1;
1940 pl = p1 + srcImage->width;
1941 for (; p < pl; p++)
1942 {
1943 *p = lookup_r[(*p & 0x7c00)>>10] |
1944 lookup_g[(*p & 0x03e0)>> 5] |
1945 lookup_b[(*p & 0x001f)];
1946 }
1947 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1948 }
1949 break;
1950 }
1951 case 16:
1952 {
1953 unsigned short *p1, *pf, *p, *pl;
1954 p1 = (unsigned short *) srcImage->data;
1955 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1956 while (p1 < pf)
1957 {
1958 p = p1;
1959 pl = p1 + srcImage->width;
1960 for (; p < pl; p++)
1961 {
1962 *p = lookup_r[(*p & 0xf800)>>11] |
1963 lookup_g[(*p & 0x07e0)>> 5] |
1964 lookup_b[(*p & 0x001f)];
1965 }
1966 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1967 }
1968 break;
1969 }
1970 case 24:
1971 {
1972 unsigned char *p1, *pf, *p, *pl;
1973 p1 = (unsigned char *) srcImage->data;
1974 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1975 while (p1 < pf)
1976 {
1977 p = p1;
1978 pl = p1 + srcImage->width * 3;
1979 for (; p < pl; p += 3)
1980 {
1981 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1982 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1983 p[2] = lookup_r[(p[2] & 0x0000ff)];
1984 }
1985 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1986 }
1987 break;
1988 }
1989 case 32:
1990 {
1991 RUINT32T *p1, *pf, *p, *pl;
1992 p1 = (RUINT32T *) srcImage->data;
1993 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1994
1995 while (p1 < pf)
1996 {
1997 p = p1;
1998 pl = p1 + srcImage->width;
1999 for (; p < pl; p++)
2000 {
2001 *p = lookup_r[(*p & 0xff0000)>>16] |
2002 lookup_g[(*p & 0x00ff00)>> 8] |
2003 lookup_b[(*p & 0x0000ff)] |
2004 (*p & ~0xffffff);
2005 }
2006 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2007 }
2008 break;
2009 }
2010 }
2011
2012 free (lookup);
2013}
2014#endif
2015
1945/* 2016/*
1946 * Check our parents are still who we think they are. 2017 * Check our parents are still who we think they are.
1947 * Do transparency updates if required 2018 * Do transparency updates if required
1948 */ 2019 */
1949int 2020int
1950rxvt_term::check_our_parents () 2021rxvt_term::check_our_parents ()
1951{ 2022{
1952 int i, pchanged, aformat, have_pixmap, rootdepth; 2023 int i, pchanged, aformat, have_pixmap, rootdepth;
1953 unsigned long nitems, bytes_after; 2024 unsigned long nitems, bytes_after;
1954 Atom atype; 2025 Atom atype;
1955 unsigned char *prop = NULL; 2026 unsigned char *prop = NULL;
1956 Window root, oldp, *list; 2027 Window root, oldp, *list;
1957 Pixmap rootpixmap = None; 2028 Pixmap rootpixmap = None;
1958 XWindowAttributes wattr, wrootattr; 2029 XWindowAttributes wattr, wrootattr;
1959 2030
1960 pchanged = 0; 2031 pchanged = 0;
1961 2032
1962 if (!(Options & Opt_transparent)) 2033 if (!(Options & Opt_transparent))
1963 return pchanged; /* Don't try any more */ 2034 return pchanged; /* Don't try any more */
1964 2035
1965 XGetWindowAttributes(display->display, display->root, &wrootattr); 2036 XGetWindowAttributes (display->display, display->root, &wrootattr);
1966 rootdepth = wrootattr.depth; 2037 rootdepth = wrootattr.depth;
1967 2038
1968 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2040
1969 if (rootdepth != wattr.depth) 2041 if (rootdepth != wattr.depth)
1970 { 2042 {
1971 if (am_transparent) 2043 if (am_transparent)
1972 { 2044 {
1973 pchanged = 1; 2045 pchanged = 1;
1974 XSetWindowBackground(display->display, TermWin.vt, 2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1975 PixColors[Color_bg]);
1976 am_transparent = am_pixmap_trans = 0; 2047 am_transparent = am_pixmap_trans = 0;
1977 } 2048 }
2049
1978 return pchanged; /* Don't try any more */ 2050 return pchanged; /* Don't try any more */
1979 } 2051 }
1980 2052
1981 /* Get all X ops out of the queue so that our information is up-to-date. */ 2053 /* Get all X ops out of the queue so that our information is up-to-date. */
1982 XSync(display->display, False); 2054 XSync (display->display, False);
1983 2055
1984 /* 2056 /*
1985 * Make the frame window set by the window manager have 2057 * Make the frame window set by the window manager have
1986 * the root background. Some window managers put multiple nested frame 2058 * the root background. Some window managers put multiple nested frame
1987 * windows for each client, so we have to take care about that. 2059 * windows for each client, so we have to take care about that.
1988 */ 2060 */
1989 i = (xa[XA_XROOTPMAPID] != 0 2061 i = (xa[XA_XROOTPMAPID]
1990 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID], 2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1991 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1992 &nitems, &bytes_after, &prop) == Success)); 2064 &nitems, &bytes_after, &prop) == Success);
2065
1993 if (!i || prop == NULL) 2066 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success);
2071
2072 if (!i || prop == NULL
2073#if TINTING
2074 || !rs[Rs_color + Color_tint]
2075#endif
2076 )
1994 have_pixmap = 0; 2077 have_pixmap = 0;
1995 else 2078 else
1996 { 2079 {
1997 have_pixmap = 1; 2080 have_pixmap = 1;
1998 rootpixmap = *((Pixmap *)prop); 2081 rootpixmap = *(Pixmap *)prop;
1999 XFree(prop); 2082 XFree (prop);
2000 } 2083 }
2084
2001 if (have_pixmap) 2085 if (have_pixmap)
2002 { 2086 {
2003 /* 2087 /*
2004 * Copy display->root pixmap transparency 2088 * Copy display->root pixmap transparency
2005 */ 2089 */
2006 int sx, sy, nx, ny; 2090 int sx, sy, nx, ny;
2007 unsigned int nw, nh; 2091 unsigned int nw, nh;
2008 Window cr; 2092 Window cr;
2009 XImage *image; 2093 XImage *image;
2010 GC gc; 2094 GC gc;
2011 XGCValues gcvalue; 2095 XGCValues gcvalue;
2012 2096
2013 XTranslateCoordinates(display->display, TermWin.parent[0], display->root, 2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2014 0, 0, &sx, &sy, &cr); 2098 0, 0, &sx, &sy, &cr);
2015 nw = (unsigned int)szHint.width; 2099 nw = (unsigned int)szHint.width;
2016 nh = (unsigned int)szHint.height; 2100 nh = (unsigned int)szHint.height;
2017 nx = ny = 0; 2101 nx = ny = 0;
2102
2018 if (sx < 0) 2103 if (sx < 0)
2019 { 2104 {
2020 nw += sx; 2105 nw += sx;
2021 nx = -sx; 2106 nx = -sx;
2022 sx = 0; 2107 sx = 0;
2023 } 2108 }
2109
2024 if (sy < 0) 2110 if (sy < 0)
2025 { 2111 {
2026 nh += sy; 2112 nh += sy;
2027 ny = -sy; 2113 ny = -sy;
2028 sy = 0; 2114 sy = 0;
2029 } 2115 }
2116
2030 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2032 allowedxerror = -1; 2119 allowedxerror = -1;
2033 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034 ZPixmap); 2121
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */ 2123 /* XXX: may need a delay here? */
2037 allowedxerror = 0; 2124 allowedxerror = 0;
2125
2038 if (image == NULL) 2126 if (image == NULL)
2039 { 2127 {
2040 if (am_transparent && am_pixmap_trans) 2128 if (am_transparent && am_pixmap_trans)
2041 { 2129 {
2042 pchanged = 1; 2130 pchanged = 1;
2043 if (TermWin.pixmap != None) 2131 if (TermWin.pixmap != None)
2044 { 2132 {
2045 XFreePixmap(display->display, TermWin.pixmap); 2133 XFreePixmap (display->display, TermWin.pixmap);
2046 TermWin.pixmap = None; 2134 TermWin.pixmap = None;
2047 } 2135 }
2048 } 2136 }
2137
2049 am_pixmap_trans = 0; 2138 am_pixmap_trans = 0;
2050 } 2139 }
2051 else 2140 else
2052 { 2141 {
2053 if (TermWin.pixmap != None) 2142 if (TermWin.pixmap != None)
2054 XFreePixmap(display->display, TermWin.pixmap); 2143 XFreePixmap (display->display, TermWin.pixmap);
2144
2145#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint))
2147 {
2148 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2152
2153 ShadeXImage (display, image, shade, rm, gm, bm);
2154 }
2155#endif
2156
2055 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt, 2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2056 (unsigned int)szHint.width,
2057 (unsigned int)szHint.height, 2158 szHint.width, szHint.height, image->depth);
2058 (unsigned int)image->depth);
2059 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue); 2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2060 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0, 2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2061 nx, ny, (unsigned int)image->width,
2062 (unsigned int)image->height); 2161 nx, ny, image->width, image->height);
2063 XFreeGC(display->display, gc); 2162 XFreeGC (display->display, gc);
2064 XDestroyImage(image); 2163 XDestroyImage (image);
2065 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2066 TermWin.pixmap); 2165 XClearWindow (display->display, TermWin.parent[0]);
2166
2067 if (!am_transparent || !am_pixmap_trans) 2167 if (!am_transparent || !am_pixmap_trans)
2068 pchanged = 1; 2168 pchanged = 1;
2169
2069 am_transparent = am_pixmap_trans = 1; 2170 am_transparent = am_pixmap_trans = 1;
2070 } 2171 }
2071 } 2172 }
2173
2072 if (!am_pixmap_trans) 2174 if (!am_pixmap_trans)
2073 { 2175 {
2074 unsigned int n; 2176 unsigned int n;
2075 /* 2177 /*
2076 * InheritPixmap transparency 2178 * InheritPixmap transparency
2077 */ 2179 */
2078 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2079 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2080 i++)
2081 { 2182 {
2082 oldp = TermWin.parent[i]; 2183 oldp = TermWin.parent[i];
2083 XQueryTree(display->display, TermWin.parent[i - 1], &root, 2184 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2084 &TermWin.parent[i], &list, &n); 2185 &TermWin.parent[i], &list, &n);
2085 XFree(list); 2186 XFree (list);
2086 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188
2087 if (TermWin.parent[i] == display->root) 2189 if (TermWin.parent[i] == display->root)
2088 { 2190 {
2089 if (oldp != None) 2191 if (oldp != None)
2090 pchanged = 1; 2192 pchanged = 1;
2193
2091 break; 2194 break;
2092 } 2195 }
2196
2093 if (oldp != TermWin.parent[i]) 2197 if (oldp != TermWin.parent[i])
2094 pchanged = 1; 2198 pchanged = 1;
2095 } 2199 }
2200
2096 n = 0; 2201 n = 0;
2202
2097 if (pchanged) 2203 if (pchanged)
2098 { 2204 {
2099 for (; n < (unsigned int)i; n++) 2205 for (; n < (unsigned int)i; n++)
2100 { 2206 {
2101 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr); 2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2102 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2103 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2104 { 2210 {
2105 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2106 break; 2212 break;
2107 } 2213 }
2108 } 2214 }
2109 } 2215 }
2110 if (n > (int)(sizeof(TermWin.parent) 2216
2111 / sizeof(TermWin.parent[0]))) 2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2112 { 2218 {
2113 D_X((stderr, "InheritPixmap Turning off")); 2219 D_X ((stderr, "InheritPixmap Turning off"));
2114 XSetWindowBackground(display->display, TermWin.parent[0], 2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2115 PixColors[Color_fg]);
2116 XSetWindowBackground(display->display, TermWin.vt, 2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2117 PixColors[Color_bg]);
2118 am_transparent = 0; 2222 am_transparent = 0;
2119 /* XXX: also turn off Opt_transparent? */ 2223 /* XXX: also turn off Opt_transparent? */
2120 } 2224 }
2121 else 2225 else
2122 { 2226 {
2227#if WAIT_FOR_WM
2123 /* wait (an arbitrary period) for the WM to do its thing 2228 /* wait (an arbitrary period) for the WM to do its thing
2124 * needed for fvwm2.2.2 (and before?) */ 2229 * needed for fvwm2.2.2 (and before?) */
2125# ifdef HAVE_NANOSLEEP
2126 struct timespec rqt;
2127
2128 rqt.tv_sec = 1;
2129 rqt.tv_nsec = 0;
2130 nanosleep(&rqt, NULL);
2131# else
2132 sleep(1); 2230 sleep (1);
2133# endif 2231#endif
2134 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2135 for (n = 0; n < (unsigned int)i; n++) 2233 for (n = 0; n < (unsigned int)i; n++)
2234 {
2136 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n], 2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2137 ParentRelative); 2236 XClearWindow (display->display, TermWin.parent[n]);
2237 }
2238
2138 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2139 ParentRelative);
2140 am_transparent = 1; 2240 am_transparent = 1;
2141 } 2241 }
2242
2142 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2143 TermWin.parent[i] = None; 2244 TermWin.parent[i] = None;
2144 } 2245 }
2246
2247 // this is experimental
2248 if (scrollBar.win)
2249 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle ();
2253 scrollbar_show (0);
2254 }
2255
2145 return pchanged; 2256 return pchanged;
2146} 2257}
2147#endif 2258#endif
2148 2259
2149/*}}} */ 2260/*}}} */
2261
2262bool
2263rxvt_term::cmd_parse ()
2264{
2265 bool flag = false;
2266 unicode_t ch = NOCHAR;
2267 unsigned char *seq_begin; // remember start of esc-sequence here
2268
2269 for (;;)
2270 {
2271 if (ch == NOCHAR)
2272 {
2273 seq_begin = cmdbuf_ptr;
2274 ch = next_char ();
2275 }
2276
2277 if (ch == NOCHAR) // TODO: improve
2278 break;
2279
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 {
2282 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ];
2284 bool refreshnow = false;
2285 int nlines = 0;
2286 unicode_t *str = buf;
2287
2288 *str++ = ch;
2289
2290 for (;;)
2291 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break;
2297
2298 *str++ = ch;
2299
2300 if (ch == C0_LF)
2301 {
2302 nlines++;
2303 refresh_count++;
2304
2305 if (! (Options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2307 {
2308 refreshnow = true;
2309 ch = NOCHAR;
2310 break;
2311 }
2312
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2314 if (nlines >= TermWin.nrow - 1)
2315 {
2316 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0;
2318 str = buf;
2319 }
2320 }
2321
2322 if (str >= buf + UBUFSIZ)
2323 {
2324 ch = NOCHAR;
2325 break;
2326 }
2327 }
2328
2329 scr_add_lines (buf, nlines, str - buf);
2330
2331 /*
2332 * If there have been a lot of new lines, then update the screen
2333 * What the heck I'll cheat and only refresh less than every page-full.
2334 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling.
2336 */
2337 if (refreshnow)
2338 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++;
2341 else
2342 {
2343 flag = true;
2344 scr_refresh (refresh_type);
2345 }
2346 }
2347
2348 }
2349 else
2350 {
2351 try
2352 {
2353 process_nonprinting (ch);
2354 }
2355 catch (const class out_of_input &o)
2356 {
2357 // we ran out of input, retry later
2358 cmdbuf_ptr = seq_begin;
2359 break;
2360 }
2361
2362 ch = NOCHAR;
2363 }
2364 }
2365
2366 return flag;
2367}
2368
2369// read the next octet
2370unicode_t
2371rxvt_term::next_octet ()
2372{
2373 return cmdbuf_ptr < cmdbuf_endp
2374 ? *cmdbuf_ptr++
2375 : NOCHAR;
2376}
2377
2378// read the next character
2379unicode_t
2380rxvt_term::next_char ()
2381{
2382 while (cmdbuf_ptr < cmdbuf_endp)
2383 {
2384 // assume 7-bit to be ascii ALWAYS
2385 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2386 return *cmdbuf_ptr++;
2387
2388 wchar_t wc;
2389 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390
2391 if (len == (size_t)-2)
2392 {
2393 // the mbstate stores incomplete sequences. didn't know this :/
2394 cmdbuf_ptr = cmdbuf_endp;
2395 break;
2396 }
2397
2398 if (len == (size_t)-1)
2399 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2400
2401 // assume wchar == unicode
2402 cmdbuf_ptr += len;
2403 return wc;
2404 }
2405
2406 return NOCHAR;
2407}
2408
2409/* rxvt_cmd_getc () - Return next input character */
2410/*
2411 * Return the next input character after first passing any keyboard input
2412 * to the command.
2413 */
2414unicode_t
2415rxvt_term::cmd_getc ()
2416{
2417 unicode_t c = next_char ();
2418
2419 if (c == NOCHAR)
2420 throw out_of_input;
2421
2422 return c;
2423}
2424
2425unicode_t
2426rxvt_term::cmd_get8 ()
2427{
2428 unicode_t c = next_octet ();
2429
2430 if (c == NOCHAR)
2431 throw out_of_input;
2432
2433 return c;
2434}
2150 2435
2151/*{{{ print pipe */ 2436/*{{{ print pipe */
2152/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2153#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2154FILE * 2439FILE *
2155rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2156{ 2441{
2157 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe], "w");
2158 2443
2159 if (stream == NULL) 2444 if (stream == NULL)
2160 rxvt_print_error("can't open printer pipe"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2446
2161 return stream; 2447 return stream;
2162} 2448}
2163 2449
2164int 2450int
2165rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2166{ 2452{
2167 fflush (stream); 2453 fflush (stream);
2168 /* pclose() reported not to work on SunOS 4.1.3 */
2169# if defined (__sun__) /* TODO: RESOLVE THIS */
2170 /* pclose works provided SIGCHLD handler uses waitpid */
2171 return pclose (stream); /* return fclose (stream); */
2172# else
2173 return pclose (stream); 2454 return pclose (stream);
2174# endif
2175} 2455}
2176 2456
2177/* 2457/*
2178 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2179 */ 2459 */
2180void 2460void
2181rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2182{ 2462{
2183 int done; 2463 int done;
2184 FILE *fd; 2464 FILE *fd;
2185 2465
2186 if ((fd = popen_printer ()) == NULL) 2466 if ((fd = popen_printer ()) == NULL)
2187 return; 2467 return;
2188 2468
2189 /* 2469 /*
2190 * Send all input to the printer until either ESC[4i or ESC[?4i 2470 * Send all input to the printer until either ESC[4i or ESC[?4i
2191 * is received. 2471 * is received.
2192 */ 2472 */
2193 for (done = 0; !done;) 2473 for (done = 0; !done;)
2194 { 2474 {
2195 unsigned char buf[8]; 2475 unsigned char buf[8];
2196 unsigned char ch; 2476 unicode_t ch;
2197 unsigned int i, len; 2477 unsigned int i, len;
2198 2478
2199 if ((ch = cmd_getc ()) != C0_ESC) 2479 if ((ch = cmd_getc ()) != C0_ESC)
2200 { 2480 {
2201 if (putc(ch, fd) == EOF) 2481 if (putc (ch, fd) == EOF)
2202 break; /* done = 1 */ 2482 break; /* done = 1 */
2203 } 2483 }
2204 else 2484 else
2205 { 2485 {
2206 len = 0; 2486 len = 0;
… …
2217 { 2497 {
2218 if ((buf[len++] = cmd_getc ()) == 'i') 2498 if ((buf[len++] = cmd_getc ()) == 'i')
2219 break; /* done = 1 */ 2499 break; /* done = 1 */
2220 } 2500 }
2221 } 2501 }
2502
2222 for (i = 0; i < len; i++) 2503 for (i = 0; i < len; i++)
2223 if (putc(buf[i], fd) == EOF) 2504 if (putc (buf[i], fd) == EOF)
2224 { 2505 {
2225 done = 1; 2506 done = 1;
2226 break; 2507 break;
2227 } 2508 }
2228 } 2509 }
2229 } 2510 }
2511
2230 pclose_printer (fd); 2512 pclose_printer (fd);
2231} 2513}
2232#endif /* PRINTPIPE */ 2514#endif /* PRINTPIPE */
2233/*}}} */ 2515/*}}} */
2234 2516
2235/* *INDENT-OFF* */ 2517/* *INDENT-OFF* */
2236enum { 2518enum {
2237 C1_40 = 0x40, 2519 C1_40 = 0x40,
2238 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2520 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2239 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2521 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2240 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2522 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2241 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2523 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2242}; 2524};
2243/* *INDENT-ON* */ 2525/* *INDENT-ON* */
2244 2526
2245/*{{{ process non-printing single characters */ 2527/*{{{ process non-printing single characters */
2246void 2528void
2247rxvt_term::process_nonprinting (unsigned char ch) 2529rxvt_term::process_nonprinting (unicode_t ch)
2248{ 2530{
2249 switch (ch) 2531 switch (ch)
2250 { 2532 {
2533 case C0_ESC:
2534 process_escape_seq ();
2535 break;
2251 case C0_ENQ: /* terminal Status */ 2536 case C0_ENQ: /* terminal Status */
2252 if (rs[Rs_answerbackstring]) 2537 if (rs[Rs_answerbackstring])
2253 tt_write(
2254 (const unsigned char *)rs[Rs_answerbackstring], 2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2255 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2539 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2256 else 2540 else
2257 tt_write((unsigned char *)VT100_ANS, 2541 tt_write ((unsigned char *)VT100_ANS,
2258 (unsigned int)STRLEN(VT100_ANS)); 2542 (unsigned int)STRLEN (VT100_ANS));
2259 break; 2543 break;
2260 case C0_BEL: /* bell */ 2544 case C0_BEL: /* bell */
2261 scr_bell (); 2545 scr_bell ();
2262 break; 2546 break;
2263 case C0_BS: /* backspace */ 2547 case C0_BS: /* backspace */
… …
2278 scr_charset_choose (1); 2562 scr_charset_choose (1);
2279 break; 2563 break;
2280 case C0_SI: /* shift in - acs */ 2564 case C0_SI: /* shift in - acs */
2281 scr_charset_choose (0); 2565 scr_charset_choose (0);
2282 break; 2566 break;
2567
2568#ifdef EIGHT_BIT_CONTROLS
2569 // 8-bit controls
2570 case 0x90: /* DCS */
2571 process_dcs_seq ();
2572 break;
2573 case 0x9b: /* CSI */
2574 process_csi_seq ();
2575 break;
2576 case 0x9d: /* CSI */
2577 process_osc_seq ();
2578 break;
2579#endif
2283 } 2580 }
2284} 2581}
2285/*}}} */ 2582/*}}} */
2286 2583
2287 2584
2288/*{{{ process VT52 escape sequences */ 2585/*{{{ process VT52 escape sequences */
2289void 2586void
2290rxvt_term::process_escape_vt52 (unsigned char ch) 2587rxvt_term::process_escape_vt52 (unicode_t ch)
2291{ 2588{
2292 int row, col; 2589 int row, col;
2293 2590
2294 switch (ch) 2591 switch (ch)
2295 { 2592 {
… …
2325 row = cmd_getc () - ' '; 2622 row = cmd_getc () - ' ';
2326 col = cmd_getc () - ' '; 2623 col = cmd_getc () - ' ';
2327 scr_gotorc (row, col, 0); 2624 scr_gotorc (row, col, 0);
2328 break; 2625 break;
2329 case 'Z': /* identify the terminal type */ 2626 case 'Z': /* identify the terminal type */
2330 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2627 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2331 break; 2628 break;
2332 case '<': /* turn off VT52 mode */ 2629 case '<': /* turn off VT52 mode */
2333 PrivMode(0, PrivMode_vt52); 2630 PrivMode (0, PrivMode_vt52);
2334 break; 2631 break;
2335 case 'F': /* use special graphics character set */ 2632 case 'F': /* use special graphics character set */
2336 case 'G': /* use regular character set */ 2633 case 'G': /* use regular character set */
2337 /* unimplemented */ 2634 /* unimplemented */
2338 break; 2635 break;
… …
2347 2644
2348/*{{{ process escape sequences */ 2645/*{{{ process escape sequences */
2349void 2646void
2350rxvt_term::process_escape_seq () 2647rxvt_term::process_escape_seq ()
2351{ 2648{
2352 unsigned char ch = cmd_getc (); 2649 unicode_t ch = cmd_getc ();
2353 2650
2354 if (PrivateModes & PrivMode_vt52) 2651 if (PrivateModes & PrivMode_vt52)
2355 { 2652 {
2356 process_escape_vt52 (ch); 2653 process_escape_vt52 (ch);
2357 return; 2654 return;
… …
2374 scr_charset_set (2, (unsigned int)cmd_getc ()); 2671 scr_charset_set (2, (unsigned int)cmd_getc ());
2375 break; 2672 break;
2376 case '+': 2673 case '+':
2377 scr_charset_set (3, (unsigned int)cmd_getc ()); 2674 scr_charset_set (3, (unsigned int)cmd_getc ());
2378 break; 2675 break;
2379#ifdef MULTICHAR_SET
2380 case '$':
2381 scr_charset_set (-2, (unsigned int)cmd_getc ());
2382 break;
2383#endif
2384#ifndef NO_FRILLS 2676#ifndef NO_FRILLS
2385 case '6': 2677 case '6':
2386 scr_backindex (); 2678 scr_backindex ();
2387 break; 2679 break;
2388#endif 2680#endif
… …
2397 scr_forwardindex (); 2689 scr_forwardindex ();
2398 break; 2690 break;
2399#endif 2691#endif
2400 case '=': 2692 case '=':
2401 case '>': 2693 case '>':
2402 PrivMode((ch == '='), PrivMode_aplKP); 2694 PrivMode ((ch == '='), PrivMode_aplKP);
2403 break; 2695 break;
2404 2696
2405 case C1_40: 2697 case C1_40:
2406 cmd_getc (); 2698 cmd_getc ();
2407 break; 2699 break;
… …
2410 break; 2702 break;
2411 2703
2412 /* 8.3.87: NEXT LINE */ 2704 /* 8.3.87: NEXT LINE */
2413 case C1_NEL: /* ESC E */ 2705 case C1_NEL: /* ESC E */
2414 { 2706 {
2415 uint32_t nlcr[] = { '\n', '\r' }; 2707 unicode_t nlcr[] = { C0_LF, C0_CR };
2416 scr_add_lines (nlcr, 1, 2); 2708 scr_add_lines (nlcr, 1, 2);
2417 } 2709 }
2418 break; 2710 break;
2419 2711
2420 /* kidnapped escape sequence: Should be 8.3.48 */ 2712 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2431 case C1_RI: /* ESC M */ 2723 case C1_RI: /* ESC M */
2432 scr_index (DN); 2724 scr_index (DN);
2433 break; 2725 break;
2434 2726
2435 /* 8.3.142: SINGLE-SHIFT TWO */ 2727 /* 8.3.142: SINGLE-SHIFT TWO */
2436 /*case C1_SS2: scr_single_shift (2); break; */ 2728 /*case C1_SS2: scr_single_shift (2); break; */
2437 2729
2438 /* 8.3.143: SINGLE-SHIFT THREE */ 2730 /* 8.3.143: SINGLE-SHIFT THREE */
2439 /*case C1_SS3: scr_single_shift (3); break; */ 2731 /*case C1_SS3: scr_single_shift (3); break; */
2440 2732
2441 /* 8.3.27: DEVICE CONTROL STRING */ 2733 /* 8.3.27: DEVICE CONTROL STRING */
2442 case C1_DCS: /* ESC P */ 2734 case C1_DCS: /* ESC P */
2443 process_dcs_seq (); 2735 process_dcs_seq ();
2444 break; 2736 break;
2445 2737
2446 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2738 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2447 case C1_SCI: /* ESC Z */ 2739 case C1_SCI: /* ESC Z */
2448 tt_write((const unsigned char *)ESCZ_ANSWER, 2740 tt_write ((const unsigned char *)ESCZ_ANSWER,
2449 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2741 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2450 break; /* steal obsolete ESC [ c */ 2742 break; /* steal obsolete ESC [ c */
2451 2743
2452 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2453 case C1_CSI: /* ESC [ */ 2745 case C1_CSI: /* ESC [ */
2454 process_csi_seq (); 2746 process_csi_seq ();
… …
2459 process_osc_seq (); 2751 process_osc_seq ();
2460 break; 2752 break;
2461 2753
2462 /* 8.3.106: RESET TO INITIAL STATE */ 2754 /* 8.3.106: RESET TO INITIAL STATE */
2463 case 'c': 2755 case 'c':
2756 mbstate.reset ();
2464 scr_poweron (); 2757 scr_poweron ();
2465 scrollbar_show (1); 2758 scrollbar_show (1);
2466 break; 2759 break;
2467 2760
2468 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2480 2773
2481/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2482/* *INDENT-OFF* */ 2775/* *INDENT-OFF* */
2483enum { 2776enum {
2484 CSI_ICH = 0x40, 2777 CSI_ICH = 0x40,
2485 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2778 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2486 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2779 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2487 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2780 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2488 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2781 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2489 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2782 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2490 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2783 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2494 2787
2495#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2788#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2496 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2789 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2497 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2790 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2498#define get_byte_array_bit(array, bit) \ 2791#define get_byte_array_bit(array, bit) \
2499 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2792 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2500 2793
2501const unsigned char csi_defaults[] = 2794const unsigned char csi_defaults[] =
2502 { 2795 {
2503 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2796 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2504 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2797 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2505 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2798 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2506 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2799 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2507 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2800 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2508 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2801 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2509 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2510 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2803 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2511 }; 2804 };
2512/* *INDENT-ON* */ 2805/* *INDENT-ON* */
2513 2806
2514void 2807void
2515rxvt_term::process_csi_seq () 2808rxvt_term::process_csi_seq ()
2516{ 2809{
2517 unsigned char ch, priv, i; 2810 unicode_t ch, priv, i;
2518 unsigned int nargs, p; 2811 unsigned int nargs, p;
2519 int n, ndef; 2812 int n, ndef;
2520 int arg[ESC_ARGS]; 2813 int arg[ESC_ARGS];
2521 2814
2522 for (nargs = ESC_ARGS; nargs > 0;) 2815 for (nargs = ESC_ARGS; nargs > 0;)
2523 arg[--nargs] = 0; 2816 arg[--nargs] = 0;
2524 2817
2525 priv = 0; 2818 priv = 0;
… …
2527 if (ch >= '<' && ch <= '?') 2820 if (ch >= '<' && ch <= '?')
2528 { /* '<' '=' '>' '?' */ 2821 { /* '<' '=' '>' '?' */
2529 priv = ch; 2822 priv = ch;
2530 ch = cmd_getc (); 2823 ch = cmd_getc ();
2531 } 2824 }
2825
2532 /* read any numerical arguments */ 2826 /* read any numerical arguments */
2533 for (n = -1; ch < CSI_ICH; ) 2827 for (n = -1; ch < CSI_ICH; )
2534 { 2828 {
2535 if (isdigit(ch)) 2829 if (isdigit (ch))
2536 { 2830 {
2537 if (n < 0) 2831 if (n < 0)
2538 n = ch - '0'; 2832 n = ch - '0';
2539 else 2833 else
2540 n = n * 10 + ch - '0'; 2834 n = n * 10 + ch - '0';
… …
2543 { 2837 {
2544 if (nargs < ESC_ARGS) 2838 if (nargs < ESC_ARGS)
2545 arg[nargs++] = n; 2839 arg[nargs++] = n;
2546 n = -1; 2840 n = -1;
2547 } 2841 }
2548 else if (ch == '\b') 2842 else if (IS_CONTROL (ch))
2549 {
2550 scr_backspace ();
2551 }
2552 else if (ch == C0_ESC)
2553 {
2554 process_escape_seq ();
2555 return;
2556 }
2557 else if (ch < ' ')
2558 {
2559 process_nonprinting (ch); 2843 process_nonprinting (ch);
2560 } 2844
2561 ch = cmd_getc (); 2845 ch = cmd_getc ();
2562 } 2846 }
2563 2847
2564 if (ch > CSI_7F) 2848 if (ch > CSI_7F)
2565 return; 2849 return;
2566 2850
2567 if (nargs < ESC_ARGS) 2851 if (nargs < ESC_ARGS)
2568 arg[nargs++] = n; 2852 arg[nargs++] = n;
2569 2853
2570 i = ch - CSI_ICH; 2854 i = ch - CSI_ICH;
2571 ndef = get_byte_array_bit(csi_defaults, i); 2855 ndef = get_byte_array_bit (csi_defaults, i);
2572 for (p = 0; p < nargs; p++) 2856 for (p = 0; p < nargs; p++)
2573 if (arg[p] == -1) 2857 if (arg[p] == -1)
2574 arg[p] = ndef; 2858 arg[p] = ndef;
2575 2859
2576#ifdef DEBUG_CMD 2860#ifdef DEBUG_CMD
2577 fprintf(stderr, "CSI "); 2861 fprintf (stderr, "CSI ");
2578 for (p = 0; p < nargs; p++) 2862 for (p = 0; p < nargs; p++)
2579 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2863 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2580 fprintf(stderr, "%c\n", ch); 2864 fprintf (stderr, "%c\n", ch);
2581#endif 2865#endif
2582 2866
2583 /* 2867 /*
2584 * private mode handling 2868 * private mode handling
2585 */ 2869 */
… …
2587 { 2871 {
2588 switch (priv) 2872 switch (priv)
2589 { 2873 {
2590 case '>': 2874 case '>':
2591 if (ch == CSI_DA) /* secondary device attributes */ 2875 if (ch == CSI_DA) /* secondary device attributes */
2592 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2593 break; 2877 break;
2594 case '?': 2878 case '?':
2595 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2596 process_terminal_mode (ch, priv, nargs, arg); 2880 process_terminal_mode (ch, priv, nargs, arg);
2597 break; 2881 break;
… …
2600 } 2884 }
2601 2885
2602 switch (ch) 2886 switch (ch)
2603 { 2887 {
2604 /* 2888 /*
2605 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2889 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2606 */ 2890 */
2607#ifdef PRINTPIPE 2891#ifdef PRINTPIPE
2608 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2892 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2609 switch (arg[0]) 2893 switch (arg[0])
2610 { 2894 {
… …
2706 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2707 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2708 break; 2992 break;
2709 2993
2710 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2711 tt_write((const unsigned char *)VT100_ANS, 2995 tt_write ((const unsigned char *)VT100_ANS,
2712 (unsigned int)(sizeof(VT100_ANS) - 1)); 2996 (unsigned int) (sizeof (VT100_ANS) - 1));
2713 break; 2997 break;
2714 2998
2715 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2716 process_sgr_mode (nargs, arg); 3000 process_sgr_mode (nargs, arg);
2717 break; 3001 break;
2718 3002
2719 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 3003 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2720 switch (arg[0]) 3004 switch (arg[0])
2721 { 3005 {
2722 case 5: /* DSR requested */ 3006 case 5: /* DSR requested */
2723 tt_printf("\033[0n"); 3007 tt_printf ("\033[0n");
2724 break; 3008 break;
2725 case 6: /* CPR requested */ 3009 case 6: /* CPR requested */
2726 scr_report_position (); 3010 scr_report_position ();
2727 break; 3011 break;
2728#if defined (ENABLE_DISPLAY_ANSWER)
2729 case 7: /* unofficial extension */ 3012 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure)
2730 tt_printf("%-.250s\n", rs[Rs_display_name]); 3014 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2731 break; 3015 break;
2732#endif
2733 case 8: /* unofficial extension */ 3016 case 8: /* unofficial extension */
2734 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2735 break; 3018 break;
2736 } 3019 }
2737 break; 3020 break;
2738 3021
2739 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3022 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2806 break; 3089 break;
2807#endif 3090#endif
2808 3091
2809 case CSI_78: /* DECREQTPARM */ 3092 case CSI_78: /* DECREQTPARM */
2810 if (arg[0] == 0 || arg[0] == 1) 3093 if (arg[0] == 0 || arg[0] == 1)
2811 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3094 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2812 /* FALLTHROUGH */ 3095 break;
2813 3096
2814 default: 3097 default:
2815 break; 3098 break;
2816 } 3099 }
2817} 3100}
… …
2820#ifndef NO_FRILLS 3103#ifndef NO_FRILLS
2821/* ARGSUSED */ 3104/* ARGSUSED */
2822void 3105void
2823rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3106rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2824{ 3107{
2825 int x, y; 3108 int x, y;
2826#if 0
2827 char *s;
2828#endif
2829 XWindowAttributes wattr; 3109 XWindowAttributes wattr;
2830 Window wdummy; 3110 Window wdummy;
2831 3111
2832 if (nargs == 0) 3112 if (nargs == 0)
2833 return; 3113 return;
3114
2834 switch (args[0]) 3115 switch (args[0])
2835 { 3116 {
2836 /* 3117 /*
2837 * commands 3118 * commands
2838 */ 3119 */
2839 case 1: /* deiconify window */ 3120 case 1: /* deiconify window */
2840 XMapWindow(display->display, TermWin.parent[0]); 3121 XMapWindow (display->display, TermWin.parent[0]);
2841 break; 3122 break;
2842 case 2: /* iconify window */ 3123 case 2: /* iconify window */
2843 XIconifyWindow(display->display, TermWin.parent[0], 3124 XIconifyWindow (display->display, TermWin.parent[0],
2844 DefaultScreen(display->display)); 3125 DefaultScreen (display->display));
2845 break; 3126 break;
2846 case 3: /* set position (pixels) */ 3127 case 3: /* set position (pixels) */
2847 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]); 3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2848 break; 3129 break;
2849 case 4: /* set size (pixels) */ 3130 case 4: /* set size (pixels) */
2850 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2851 break; 3132 break;
2852 case 5: /* raise window */ 3133 case 5: /* raise window */
2853 XRaiseWindow(display->display, TermWin.parent[0]); 3134 XRaiseWindow (display->display, TermWin.parent[0]);
2854 break; 3135 break;
2855 case 6: /* lower window */ 3136 case 6: /* lower window */
2856 XLowerWindow(display->display, TermWin.parent[0]); 3137 XLowerWindow (display->display, TermWin.parent[0]);
2857 break; 3138 break;
2858 case 7: /* refresh window */ 3139 case 7: /* refresh window */
2859 scr_touch (true); 3140 scr_touch (true);
2860 break; 3141 break;
2861 case 8: /* set size (chars) */ 3142 case 8: /* set size (chars) */
2862 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2863 (unsigned int)(args[1] * TermWin.fheight)); 3144 (unsigned int) (args[1] * TermWin.fheight));
2864 break; 3145 break;
3146
3147 //case 9: NYI, TODO, restore maximized window or maximize window
2865 default: 3148 default:
2866 if (args[0] >= 24) /* set height (chars) */ 3149 if (args[0] >= 24) /* set height (chars) */
2867 set_widthheight ((unsigned int)TermWin.width, 3150 set_widthheight ((unsigned int)TermWin.width,
2868 (unsigned int)(args[1] * TermWin.fheight)); 3151 (unsigned int) (args[1] * TermWin.fheight));
2869 break; 3152 break;
3153
3154
2870 /* 3155 /*
2871 * reports - some output format copied from XTerm 3156 * reports - some output format copied from XTerm
2872 */ 3157 */
2873 case 11: /* report window state */ 3158 case 11: /* report window state */
2874 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2875 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2876 break; 3161 break;
2877 case 13: /* report window position */ 3162 case 13: /* report window position */
2878 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2879 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root, 3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2880 -wattr.border_width, -wattr.border_width, 3165 -wattr.border_width, -wattr.border_width,
2881 &x, &y, &wdummy); 3166 &x, &y, &wdummy);
2882 tt_printf("\033[3;%d;%dt", x, y); 3167 tt_printf ("\033[3;%d;%dt", x, y);
2883 break; 3168 break;
2884 case 14: /* report window size (pixels) */ 3169 case 14: /* report window size (pixels) */
2885 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2886 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2887 break; 3172 break;
2888 case 18: /* report window size (chars) */ 3173 case 18: /* report text area size (chars) */
2889 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2890 break; 3175 break;
2891#if 0 /* XXX: currently disabled due to security concerns */ 3176 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3178 break;
2892 case 20: /* report icon label */ 3179 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 {
3182 char *s;
2893 XGetIconName(display->display, TermWin.parent[0], &s); 3183 XGetIconName (display->display, TermWin.parent[0], &s);
2894 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3185 }
2895 break; 3186 break;
2896 case 21: /* report window title */ 3187 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 {
3190 char *s;
2897 XFetchName(display->display, TermWin.parent[0], &s); 3191 XFetchName (display->display, TermWin.parent[0], &s);
2898 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3193 }
2899 break; 3194 break;
2900#endif
2901
2902 } 3195 }
2903} 3196}
2904#endif 3197#endif
2905 3198
2906/*----------------------------------------------------------------------*/ 3199/*----------------------------------------------------------------------*/
2907/* 3200/*
2908 * get input up until STRING TERMINATOR (or BEL) 3201 * get input up until STRING TERMINATOR (or BEL)
2909 * ends_how is terminator used. returned input must be free()d 3202 * ends_how is terminator used. returned input must be free()'d
2910 */ 3203 */
2911unsigned char * 3204unsigned char *
2912rxvt_term::get_to_st (unsigned char *ends_how) 3205rxvt_term::get_to_st (unicode_t &ends_how)
2913{ 3206{
2914 int seen_esc = 0; /* seen escape? */ 3207 unicode_t prev = 0, ch;
2915 unsigned int n = 0; 3208 unsigned int n = 0;
2916 unsigned char *s; 3209 unsigned char *s;
2917 unsigned char ch, string[STRING_MAX]; 3210 unsigned char string[STRING_MAX];
2918 3211
2919 for (; (ch = cmd_getc ());) 3212 while ((ch = cmd_getc ()) != NOCHAR)
2920 { 3213 {
2921 if (ch == C0_BEL
2922 || ch == CHAR_ST
2923 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2924 break;
2925 if (ch == C0_ESC) 3214 if (prev == C0_ESC)
2926 {
2927 seen_esc = 1;
2928 continue;
2929 } 3215 {
2930 else if (ch == '\t') 3216 if (ch == 0x5c) /* 7bit ST */
2931 ch = ' '; /* translate '\t' to space */ 3217 break;
2932 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3218 else
3219 return NULL;
3220 }
3221 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break;
3223 else if (ch < 0x20)
2933 return NULL; /* other control character - exit */ 3224 return NULL; /* other control character - exit */
3225
2934 if (n < sizeof(string) - 1) 3226 if (n >= sizeof (string) - 1)
3227 // stop at some sane length
3228 return NULL;
3229
3230 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else
2935 string[n++] = ch; 3236 string[n++] = prev = ch;
2936 seen_esc = 0;
2937 } 3237 }
3238
2938 string[n++] = '\0'; 3239 string[n++] = '\0';
3240
2939 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2940 return NULL; 3242 return NULL;
3243
2941 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3244 ends_how = (ch == 0x5c ? C0_ESC : ch);
2942 STRNCPY(s, string, n); 3245 STRNCPY (s, string, n);
2943 return s; 3246 return s;
2944} 3247}
2945 3248
2946/*----------------------------------------------------------------------*/ 3249/*----------------------------------------------------------------------*/
2947/* 3250/*
2948 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2949 */ 3252 */
2950void 3253void
2951rxvt_term::process_dcs_seq () 3254rxvt_term::process_dcs_seq ()
2952{ 3255{
2953 unsigned char eh, *s; 3256 unsigned char *s;
3257 unicode_t eh;
3258
2954 /* 3259 /*
2955 * Not handled yet 3260 * Not handled yet
2956 */ 3261 */
2957 s = get_to_st (&eh); 3262 s = get_to_st (eh);
2958 if (s) 3263 if (s)
2959 free(s); 3264 free (s);
3265
2960 return; 3266 return;
2961} 3267}
2962 3268
2963/*----------------------------------------------------------------------*/ 3269/*----------------------------------------------------------------------*/
2964/* 3270/*
2965 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3271 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2966 */ 3272 */
2967void 3273void
2968rxvt_term::process_osc_seq () 3274rxvt_term::process_osc_seq ()
2969{ 3275{
2970 unsigned char ch, eh, *s; 3276 unicode_t ch, eh;
2971 int arg; 3277 int arg;
2972 3278
2973 ch = cmd_getc (); 3279 ch = cmd_getc ();
2974 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3280 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2975 arg = arg * 10 + (ch - '0'); 3281 arg = arg * 10 + (ch - '0');
2976 3282
2977 if (ch == ';') 3283 if (ch == ';')
2978 { 3284 {
2979 s = get_to_st (&eh); 3285 unsigned char *s = get_to_st (eh);
3286
2980 if (s) 3287 if (s)
2981 { 3288 {
2982 /*
2983 * rxvt_menubar_dispatch() violates the constness of the string,
2984 * so do it here
2985 */
2986 if (arg == XTerm_Menu)
2987#if 0 /* XXX: currently disabled due to security concerns */
2988 menubar_dispatch ((char *)s);
2989#else
2990 (void)0;
2991#endif
2992 else
2993 xterm_seq (arg, (char *)s, eh); 3289 process_xterm_seq (arg, (char *)s, eh);
2994 free(s); 3290 free (s);
3291 }
3292 }
3293}
3294
3295void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3297{
3298 if (str[0] == '?' && !str[1])
3299 {
3300 if (Options & Opt_insecure)
2995 } 3301 {
3302 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b);
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3305 }
2996 } 3306 }
3307 else
3308 set_window_color (color, str);
2997} 3309}
3310
2998/* 3311/*
2999 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3000 * 0 = change iconName/title 3313 * 0 = change iconName/title
3001 * 1 = change iconName 3314 * 1 = change iconName
3002 * 2 = change title 3315 * 2 = change title
3003 * 4 = change color 3316 * 4 = change color
3317 * 10 = change fg color
3318 * 11 = change bg color
3004 * 12 = change text color 3319 * 12 = change text color
3005 * 13 = change mouse foreground color 3320 * 13 = change mouse foreground color
3006 * 17 = change highlight character colour 3321 * 17 = change highlight character colour
3007 * 18 = change bold character color 3322 * 18 = change bold character color
3008 * 19 = change underlined character color 3323 * 19 = change underlined character color
3009 * 46 = change logfile (not implemented) 3324 * 46 = change logfile (not implemented)
3010 * 50 = change font 3325 * 50 = change font
3011 * 3326 *
3012 * rxvt extensions: 3327 * rxvt extensions:
3013 * 10 = menu (may change in future)
3014 * 20 = bg pixmap 3328 * 20 = bg pixmap
3015 * 39 = change default fg color 3329 * 39 = change default fg color
3016 * 49 = change default bg color 3330 * 49 = change default bg color
3017 * 55 = dump scrollback buffer and all of screen 3331 * 55 = dump scrollback buffer and all of screen
3332 * 701 = change locale
3333 * 702 = find font
3334 * 703 = menu
3018 */ 3335 */
3019void 3336void
3020rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3021{ 3338{
3022 int changed = 0; 3339 int changed = 0;
3023 int color; 3340 int color;
3024 char *buf, *name; 3341 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1];
3025 3343
3026 assert(str != NULL); 3344 assert (str != NULL);
3027 switch (op) 3345 switch (op)
3028 { 3346 {
3029 case XTerm_name: 3347 case XTerm_name:
3030 set_title (str); 3348 set_title (str);
3031 /* FALLTHROUGH */ 3349 /* FALLTHROUGH */
3032 case XTerm_iconName: 3350 case XTerm_iconName:
3033 set_iconName (str); 3351 set_icon_name (str);
3034 break; 3352 break;
3035 case XTerm_title: 3353 case XTerm_title:
3036 set_title (str); 3354 set_title (str);
3037 break; 3355 break;
3356 case XTerm_property:
3357 if (str[0] == '?')
3358 {
3359 Atom prop = XInternAtom (display->display, str + 1, True);
3360 Atom actual_type;
3361 int actual_format;
3362 unsigned long nitems;
3363 unsigned long bytes_after;
3364 unsigned char *value = 0;
3365 const char *str = "";
3366
3367 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None
3373 && actual_format == 8)
3374 str = (const char *)(value);
3375
3376 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3377
3378 XFree (value);
3379 }
3380 else
3381 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383
3384 if (eq)
3385 {
3386 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0],
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 }
3392 else
3393 XDeleteProperty (display->display, TermWin.parent[0],
3394 display->atom (str));
3395 }
3396 break;
3397
3038 case XTerm_Color: 3398 case XTerm_Color:
3039 for (buf = (char *)str; buf && *buf;) 3399 for (buf = (char *)str; buf && *buf;)
3040 { 3400 {
3041 if ((name = STRCHR(buf, ';')) == NULL) 3401 if ((name = STRCHR (buf, ';')) == NULL)
3042 break; 3402 break;
3403
3043 *name++ = '\0'; 3404 *name++ = '\0';
3044 color = atoi(buf); 3405 color = atoi (buf);
3406
3045 if (color < 0 || color >= TOTAL_COLORS) 3407 if (color < 0 || color >= TOTAL_COLORS)
3046 break; 3408 break;
3409
3047 if ((buf = STRCHR(name, ';')) != NULL) 3410 if ((buf = STRCHR (name, ';')) != NULL)
3048 *buf++ = '\0'; 3411 *buf++ = '\0';
3412
3413 if (name[0] == '?' && !name[1])
3414 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 }
3422 else
3049 set_window_color (color + minCOLOR, name); 3423 set_window_color (color + minCOLOR, name);
3050 } 3424 }
3425 break;
3426 case XTerm_Color00:
3427 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3428 break;
3429 case XTerm_Color01:
3430 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3051 break; 3431 break;
3052#ifndef NO_CURSORCOLOR 3432#ifndef NO_CURSORCOLOR
3053 case XTerm_Color_cursor: 3433 case XTerm_Color_cursor:
3054 set_window_color (Color_cursor, str); 3434 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3055 break; 3435 break;
3056#endif 3436#endif
3057 case XTerm_Color_pointer: 3437 case XTerm_Color_pointer_fg:
3058 set_window_color (Color_pointer, str); 3438 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3439 break;
3440 case XTerm_Color_pointer_bg:
3441 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3059 break; 3442 break;
3060#ifndef NO_BOLD_UNDERLINE_REVERSE 3443#ifndef NO_BOLD_UNDERLINE_REVERSE
3061 case XTerm_Color_BD: 3444 case XTerm_Color_BD:
3062 set_window_color (Color_BD, str); 3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3063 break; 3446 break;
3064 case XTerm_Color_UL: 3447 case XTerm_Color_UL:
3065 set_window_color (Color_UL, str); 3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3066 break; 3449 break;
3067 case XTerm_Color_RV: 3450 case XTerm_Color_RV:
3068 set_window_color (Color_RV, str); 3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3069 break; 3452 break;
3070#endif 3453#endif
3071 3454
3072 case XTerm_Menu:
3073 /*
3074 * rxvt_menubar_dispatch() violates the constness of the string,
3075 * so DON'T do it here
3076 */
3077 break;
3078 case XTerm_Pixmap: 3455 case XTerm_Pixmap:
3079 if (*str != ';') 3456 if (*str != ';')
3080 { 3457 {
3081#if XPM_BACKGROUND 3458#if XPM_BACKGROUND
3082 scale_pixmap (""); /* reset to default scaling */ 3459 scale_pixmap (""); /* reset to default scaling */
3083 set_bgPixmap (str); /* change pixmap */ 3460 set_bgPixmap (str); /* change pixmap */
3084#endif 3461#endif
3085 scr_touch (true); 3462 scr_touch (true);
3086 } 3463 }
3087 while ((str = STRCHR(str, ';')) != NULL) 3464 while ((str = STRCHR (str, ';')) != NULL)
3088 { 3465 {
3089 str++; 3466 str++;
3090#if XPM_BACKGROUND 3467#if XPM_BACKGROUND
3091 changed += scale_pixmap (str); 3468 changed += scale_pixmap (str);
3092#endif 3469#endif
… …
3105 set_window_color (Color_fg, str); 3482 set_window_color (Color_fg, str);
3106 break; 3483 break;
3107 case XTerm_restoreBG: 3484 case XTerm_restoreBG:
3108 set_window_color (Color_bg, str); 3485 set_window_color (Color_bg, str);
3109 break; 3486 break;
3487
3110 case XTerm_logfile: 3488 case XTerm_logfile:
3489 // TODO, when secure mode?
3111 break; 3490 break;
3491
3112 case XTerm_font: 3492 case XTerm_font:
3493 if (query)
3494 {
3495 if (Options & Opt_insecure)
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3497 TermWin.fontset->fontdesc
3498 ? TermWin.fontset->fontdesc
3499 : "",
3500 resp);
3501 }
3502 else
3113 change_font (0, str); 3503 change_font (str);
3504 break;
3505
3506#ifndef NO_FRILLS
3507 case XTerm_locale:
3508 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3512 }
3513 else
3514 {
3515 set_locale (str);
3516# ifdef USE_XIM
3517 im_cb ();
3518# endif
3519 }
3520 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif
3531
3532#ifdef MENUBAR
3533 case XTerm_Menu:
3534 if (Options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3114 break; 3536 break;
3537#endif
3115#if 0 3538#if 0
3116 case XTerm_dumpscreen: /* no error notices */ 3539 case XTerm_dumpscreen: /* no error notices */
3117 { 3540 {
3118 int fd; 3541 int fd;
3119 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3542 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3120 { 3543 {
3121 scr_dump (fd); 3544 scr_dump (fd);
3122 close(fd); 3545 close (fd);
3123 } 3546 }
3124 } 3547 }
3125 break; 3548 break;
3126#endif 3549#endif
3127
3128 } 3550 }
3129} 3551}
3130/*----------------------------------------------------------------------*/ 3552/*----------------------------------------------------------------------*/
3131 3553
3132/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3554/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3140 * so no need for fancy checking 3562 * so no need for fancy checking
3141 */ 3563 */
3142int 3564int
3143rxvt_term::privcases (int mode, unsigned long bit) 3565rxvt_term::privcases (int mode, unsigned long bit)
3144{ 3566{
3145 int state; 3567 int state;
3146 3568
3147 if (mode == 's') 3569 if (mode == 's')
3148 { 3570 {
3149 SavedModes |= (PrivateModes & bit); 3571 SavedModes |= (PrivateModes & bit);
3150 return -1; 3572 return -1;
… …
3152 else 3574 else
3153 { 3575 {
3154 if (mode == 'r') 3576 if (mode == 'r')
3155 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3156 else 3578 else
3157 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3158 PrivMode(state, bit); 3580 PrivMode (state, bit);
3159 } 3581 }
3582
3160 return state; 3583 return state;
3161} 3584}
3162 3585
3163/* we're not using priv _yet_ */ 3586/* we're not using priv _yet_ */
3164void 3587void
3165rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3588rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3166{ 3589{
3167 unsigned int i, j; 3590 unsigned int i, j;
3168 int state; 3591 int state;
3592
3169 static const struct 3593 static const struct
3170 { 3594 {
3171 const int argval; 3595 const int argval;
3172 const unsigned long bit; 3596 const unsigned long bit;
3173 } 3597 }
3598
3174 argtopriv[] = { 3599 argtopriv[] = {
3175 { 1, PrivMode_aplCUR }, 3600 { 1, PrivMode_aplCUR },
3176 { 2, PrivMode_vt52 }, 3601 { 2, PrivMode_vt52 },
3177 { 3, PrivMode_132 }, 3602 { 3, PrivMode_132 },
3178 { 4, PrivMode_smoothScroll }, 3603 { 4, PrivMode_smoothScroll },
… …
3184 { menuBar_esc, PrivMode_menuBar }, 3609 { menuBar_esc, PrivMode_menuBar },
3185#endif 3610#endif
3186#ifdef scrollBar_esc 3611#ifdef scrollBar_esc
3187 { scrollBar_esc, PrivMode_scrollBar }, 3612 { scrollBar_esc, PrivMode_scrollBar },
3188#endif 3613#endif
3614 // 18, 19 printing-related
3189 { 25, PrivMode_VisibleCursor }, 3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3190 { 35, PrivMode_ShiftKeys }, 3617 { 35, PrivMode_ShiftKeys }, // rxvt extension
3191 { 40, PrivMode_132OK }, 3618 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI
3621 // 46 start logging
3192 { 47, PrivMode_Screen }, 3622 { 47, PrivMode_Screen },
3193 { 66, PrivMode_aplKP }, 3623 { 66, PrivMode_aplKP },
3194#ifndef NO_BACKSPACE_KEY 3624#ifndef NO_BACKSPACE_KEY
3195 { 67, PrivMode_BackSpace }, 3625 { 67, PrivMode_BackSpace },
3196#endif 3626#endif
3197 { 1000, PrivMode_MouseX11 }, 3627 { 1000, PrivMode_MouseX11 },
3628 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3629 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3630 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3198 { 1010, PrivMode_TtyOutputInh }, 3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3199 { 1011, PrivMode_Keypress }, 3632 { 1011, PrivMode_Keypress }, // rxvt extension
3633 // 1035 enable modifiers for alt, numlock NYI
3634 // 1036 send ESC for meta keys NYI
3635 // 1037 send DEL for keypad delete NYI
3200 { 1047, PrivMode_Screen }, 3636 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor
3201 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3202 }; 3640 };
3203 3641
3204 if (nargs == 0) 3642 if (nargs == 0)
3205 return; 3643 return;
3206 3644
… …
3213 for (i = 0; i < nargs; i++) 3651 for (i = 0; i < nargs; i++)
3214 { 3652 {
3215 state = -1; 3653 state = -1;
3216 3654
3217 /* basic handling */ 3655 /* basic handling */
3218 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3656 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3219 if (argtopriv[j].argval == arg[i]) 3657 if (argtopriv[j].argval == arg[i])
3220 { 3658 {
3221 state = privcases (mode, argtopriv[j].bit); 3659 state = privcases (mode, argtopriv[j].bit);
3222 break; 3660 break;
3223 } 3661 }
3224 3662
3225 /* extra handling for values with state unkept */ 3663 /* extra handling for values with state unkept */
3226 if (state == -1)
3227 switch (arg[i]) 3664 switch (arg[i])
3228 { 3665 {
3229 case 1048: /* alternative cursor save */ 3666 case 1048: /* alternative cursor save */
3667 if (Options & Opt_secondaryScreen)
3230 if (mode == 0) 3668 if (mode == 0)
3231 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
3232 else if (mode == 1) 3670 else if (mode == 1)
3233 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
3234 /* FALLTHROUGH */
3235 default:
3236 continue; /* for(;i;) */
3237 }
3238
3239 /* extra handling for values with valid 0 or 1 state */
3240 switch (arg[i])
3241 {
3242 /* case 1: - application cursor keys */
3243 case 2: /* VT52 mode */
3244 /* oddball mode. should be set regardless of set/reset
3245 * parameter. Return from VT52 mode with an ESC < from
3246 * within VT52 mode
3247 */
3248 PrivMode(1, PrivMode_vt52);
3249 break; 3672 break;
3673 }
3674
3675 if (state >= 0)
3676 /* extra handling for values with valid 0 or 1 state */
3677 switch (arg[i])
3678 {
3679 /* case 1: - application cursor keys */
3680 case 2: /* VT52 mode */
3681 /* oddball mode. should be set regardless of set/reset
3682 * parameter. Return from VT52 mode with an ESC < from
3683 * within VT52 mode
3684 */
3685 PrivMode (1, PrivMode_vt52);
3686 break;
3250 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
3251 if (PrivateModes & PrivMode_132OK) 3688 if (PrivateModes & PrivMode_132OK)
3252 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3253 (unsigned int)TermWin.height);
3254 break; 3690 break;
3255 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
3256 if (state) 3692 if (state)
3257 Options &= ~Opt_jumpScroll; 3693 Options &= ~Opt_jumpScroll;
3258 else 3694 else
3259 Options |= Opt_jumpScroll; 3695 Options |= Opt_jumpScroll;
3260 break; 3696 break;
3261 case 5: /* reverse video */ 3697 case 5: /* reverse video */
3262 scr_rvideo_mode (state); 3698 scr_rvideo_mode (state);
3263 break; 3699 break;
3264 case 6: /* relative/absolute origins */ 3700 case 6: /* relative/absolute origins */
3265 scr_relative_origin (state); 3701 scr_relative_origin (state);
3266 break; 3702 break;
3267 case 7: /* autowrap */ 3703 case 7: /* autowrap */
3268 scr_autowrap (state); 3704 scr_autowrap (state);
3269 break; 3705 break;
3270 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
3271 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
3272 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
3273 PrivateModes &= ~(PrivMode_MouseX11); 3709 PrivateModes &= ~PrivMode_MouseX11;
3274 break; 3710 break;
3275#ifdef menuBar_esc 3711#ifdef menuBar_esc
3276 case menuBar_esc: 3712 case menuBar_esc:
3277#ifdef MENUBAR 3713#ifdef MENUBAR
3278 map_menuBar (state); 3714 map_menuBar (state);
3279#endif 3715#endif
3280 break; 3716 break;
3281#endif 3717#endif
3282#ifdef scrollBar_esc 3718#ifdef scrollBar_esc
3283 case scrollBar_esc: 3719 case scrollBar_esc:
3284 if (scrollbar_mapping (state)) 3720 if (scrollbar_mapping (state))
3285 { 3721 {
3286 resize_all_windows (0, 0, 0); 3722 resize_all_windows (0, 0, 0);
3287 scr_touch (true); 3723 scr_touch (true);
3288 } 3724 }
3289 break; 3725 break;
3290#endif 3726#endif
3291 case 25: /* visible/invisible cursor */ 3727 case 25: /* visible/invisible cursor */
3292 scr_cursor_visible (state); 3728 scr_cursor_visible (state);
3293 break; 3729 break;
3294 /* case 35: - shift keys */ 3730 /* case 35: - shift keys */
3295 /* case 40: - 80 <--> 132 mode */ 3731 /* case 40: - 80 <--> 132 mode */
3296 case 47: /* secondary screen */ 3732 case 47: /* secondary screen */
3297 scr_change_screen (state); 3733 scr_change_screen (state);
3298 break; 3734 break;
3299 /* case 66: - application key pad */ 3735 /* case 66: - application key pad */
3300 /* case 67: - backspace key */ 3736 /* case 67: - backspace key */
3301 case 1000: /* X11 mouse reporting */ 3737 case 1000: /* X11 mouse reporting */
3302 if (state) /* orthogonal */ 3738 if (state) /* orthogonal */
3303 PrivateModes &= ~(PrivMode_MouseX10); 3739 PrivateModes &= ~PrivMode_MouseX10;
3304 break; 3740 break;
3305#if 0 3741#if 0
3306 case 1001: 3742 case 1001:
3307 break; /* X11 mouse highlighting */ 3743 break; /* X11 mouse highlighting */
3308#endif 3744#endif
3309 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3310 if (state) 3746 if (state)
3311 Options &= ~Opt_scrollTtyOutput; 3747 Options &= ~Opt_scrollTtyOutput;
3312 else 3748 else
3313 Options |= Opt_scrollTtyOutput; 3749 Options |= Opt_scrollTtyOutput;
3314 break; 3750 break;
3315 case 1011: /* scroll to bottom on key press */ 3751 case 1011: /* scroll to bottom on key press */
3316 if (state) 3752 if (state)
3317 Options |= Opt_scrollTtyKeypress; 3753 Options |= Opt_scrollTtyKeypress;
3318 else 3754 else
3319 Options &= ~Opt_scrollTtyKeypress; 3755 Options &= ~Opt_scrollTtyKeypress;
3320 break; 3756 break;
3321 case 1047: /* secondary screen w/ clearing */ 3757 case 1047: /* secondary screen w/ clearing last */
3322 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3758 if (Options & Opt_secondaryScreen)
3323 if (current_screen != PRIMARY) 3759 if (current_screen != PRIMARY)
3324 scr_erase_screen (2); 3760 scr_erase_screen (2);
3325 scr_change_screen (state); 3761 scr_change_screen (state);
3326 /* FALLTHROUGH */
3327 default:
3328 break; 3762 break;
3763 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen)
3766 if (current_screen != PRIMARY)
3767 scr_erase_screen (2);
3768 break;
3769 default:
3770 break;
3329 } 3771 }
3330 } 3772 }
3331} 3773}
3332/*}}} */ 3774/*}}} */
3333 3775
3334/*{{{ process sgr sequences */ 3776/*{{{ process sgr sequences */
3335void 3777void
3336rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3778rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3337{ 3779{
3338 unsigned int i; 3780 unsigned int i;
3339 short rendset; 3781 short rendset;
3340 int rendstyle; 3782 int rendstyle;
3341 3783
3342 if (nargs == 0) 3784 if (nargs == 0)
3343 { 3785 {
3344 scr_rendition (0, ~RS_None); 3786 scr_rendition (0, ~RS_None);
3345 return; 3787 return;
3346 } 3788 }
3789
3347 for (i = 0; i < nargs; i++) 3790 for (i = 0; i < nargs; i++)
3348 { 3791 {
3349 rendset = -1; 3792 rendset = -1;
3350 switch (arg[i]) 3793 switch (arg[i])
3351 { 3794 {
… …
3353 rendset = 0, rendstyle = ~RS_None; 3796 rendset = 0, rendstyle = ~RS_None;
3354 break; 3797 break;
3355 case 1: 3798 case 1:
3356 rendset = 1, rendstyle = RS_Bold; 3799 rendset = 1, rendstyle = RS_Bold;
3357 break; 3800 break;
3801 //case 2: // faint or second colour
3358 case 4: 3802 case 4:
3359 rendset = 1, rendstyle = RS_Uline; 3803 rendset = 1, rendstyle = RS_Uline;
3360 break; 3804 break;
3361 case 5: 3805 case 5: // slowly blinking
3806 case 6: // rapidly blinking
3362 rendset = 1, rendstyle = RS_Blink; 3807 rendset = 1, rendstyle = RS_Blink;
3363 break; 3808 break;
3809 //case 6: // scoansi light background
3364 case 7: 3810 case 7:
3365 rendset = 1, rendstyle = RS_RVid; 3811 rendset = 1, rendstyle = RS_RVid;
3812 break;
3813 case 8:
3814 // invisible. NYI
3815 break;
3816 //case 9: // crossed out
3817 //case 10: // scoansi acs off, primary font
3818 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font
3820 //...
3821 //case 19: // ninth alt font
3822 //case 20: // gothic
3823 case 21: // disable bold, faint
3824 rendset = 0, rendstyle = RS_Bold;
3366 break; 3825 break;
3367 case 22: 3826 case 22:
3368 rendset = 0, rendstyle = RS_Bold; 3827 rendset = 0, rendstyle = RS_Bold;
3369 break; 3828 break;
3829 //case 23: disable italic
3370 case 24: 3830 case 24:
3371 rendset = 0, rendstyle = RS_Uline; 3831 rendset = 0, rendstyle = RS_Uline;
3372 break; 3832 break;
3373 case 25: 3833 case 25:
3374 rendset = 0, rendstyle = RS_Blink; 3834 rendset = 0, rendstyle = RS_Blink;
3375 break; 3835 break;
3376 case 27: 3836 case 27:
3377 rendset = 0, rendstyle = RS_RVid; 3837 rendset = 0, rendstyle = RS_RVid;
3378 break; 3838 break;
3839 //case 28: // visible. NYI
3840 //case 29: // not crossed-out
3379 } 3841 }
3842
3380 if (rendset != -1) 3843 if (rendset != -1)
3381 { 3844 {
3382 scr_rendition (rendset, rendstyle); 3845 scr_rendition (rendset, rendstyle);
3383 continue; /* for(;i;) */ 3846 continue; /* for (;i;) */
3384 } 3847 }
3385 3848
3386 switch (arg[i]) 3849 switch (arg[i])
3387 { 3850 {
3388 case 30: 3851 case 30:
… …
3391 case 33: 3854 case 33:
3392 case 34: 3855 case 34:
3393 case 35: 3856 case 35:
3394 case 36: 3857 case 36:
3395 case 37: 3858 case 37:
3396 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3397 Color_fg);
3398 break; 3860 break;
3399#ifdef TTY_256COLOR 3861#ifdef TTY_256COLOR
3400 case 38: 3862 case 38:
3401 if (nargs > i + 2 && arg[i + 1] == 5) 3863 if (nargs > i + 2 && arg[i + 1] == 5)
3402 { 3864 {
3403 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3404 Color_fg);
3405 i += 2; 3866 i += 2;
3406 } 3867 }
3407 break; 3868 break;
3408#endif 3869#endif
3409 case 39: /* default fg */ 3870 case 39: /* default fg */
… …
3416 case 43: 3877 case 43:
3417 case 44: 3878 case 44:
3418 case 45: 3879 case 45:
3419 case 46: 3880 case 46:
3420 case 47: 3881 case 47:
3421 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3422 Color_bg);
3423 break; 3883 break;
3424#ifdef TTY_256COLOR 3884#ifdef TTY_256COLOR
3425 case 48: 3885 case 48:
3426 if (nargs > i + 2 && arg[i + 1] == 5) 3886 if (nargs > i + 2 && arg[i + 1] == 5)
3427 { 3887 {
3428 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3429 Color_bg);
3430 i += 2; 3889 i += 2;
3431 } 3890 }
3432 break; 3891 break;
3433#endif 3892#endif
3434 case 49: /* default bg */ 3893 case 49: /* default bg */
… …
3442 case 93: 3901 case 93:
3443 case 94: 3902 case 94:
3444 case 95: 3903 case 95:
3445 case 96: 3904 case 96:
3446 case 97: 3905 case 97:
3447 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3448 Color_fg); 3907 Color_fg);
3449 break; 3908 break;
3450 case 100: 3909 case 100:
3451 case 101: /* set bright bg color */ 3910 case 101: /* set bright bg color */
3452 case 102: 3911 case 102:
3453 case 103: 3912 case 103:
3454 case 104: 3913 case 104:
3455 case 105: 3914 case 105:
3456 case 106: 3915 case 106:
3457 case 107: 3916 case 107:
3458 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3459 Color_bg); 3918 Color_bg);
3460 break; 3919 break;
3461#endif 3920#endif
3462 3921
3463 } 3922 }
3464 } 3923 }
3465} 3924}
3466/*}}} */ 3925/*}}} */
3467 3926
3468/*{{{ process Rob Nation's own graphics mode sequences */ 3927/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3469void 3928void
3470rxvt_term::process_graphics () 3929rxvt_term::process_graphics ()
3471{ 3930{
3472 unsigned char ch, cmd = cmd_getc (); 3931 unicode_t ch, cmd = cmd_getc ();
3473 3932
3474#ifndef RXVT_GRAPHICS
3475 if (cmd == 'Q') 3933 if (cmd == 'Q')
3476 { /* query graphics */ 3934 { /* query graphics */
3477 tt_printf("\033G0\n"); /* no graphics */ 3935 tt_printf ("\033G0\n"); /* no graphics */
3478 return; 3936 return;
3479 } 3937 }
3480 /* swallow other graphics sequences until terminating ':' */ 3938 /* swallow other graphics sequences until terminating ':' */
3481 do 3939 do
3482 ch = cmd_getc (); 3940 ch = cmd_getc ();
3483 while (ch != ':'); 3941 while (ch != ':');
3484#else
3485 unsigned int nargs;
3486 int args[NGRX_PTS];
3487 unsigned char *text = NULL;
3488
3489 if (cmd == 'Q')
3490 { /* query graphics */
3491 tt_printf("\033G1\n"); /* yes, graphics (color) */
3492 return;
3493 }
3494 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3495 {
3496 int neg;
3497
3498 ch = cmd_getc ();
3499 neg = (ch == '-');
3500 if (neg || ch == '+')
3501 ch = cmd_getc ();
3502
3503 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3504 args[nargs] = args[nargs] * 10 + (ch - '0');
3505 if (neg)
3506 args[nargs] = -args[nargs];
3507
3508 nargs++;
3509 args[nargs] = 0;
3510 if (ch != ';')
3511 break;
3512 }
3513
3514 if ((cmd == 'T') && (nargs >= 5))
3515 {
3516 int i, len = args[4];
3517
3518 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3519
3520 if (text != NULL)
3521 {
3522 for (i = 0; i < len; i++)
3523 text[i] = cmd_getc ();
3524 text[len] = '\0';
3525 }
3526 }
3527 Gr_do_graphics (cmd, nargs, args, text);
3528#endif
3529} 3942}
3530/*}}} */ 3943/*}}} */
3531 3944
3532/* ------------------------------------------------------------------------- */ 3945/* ------------------------------------------------------------------------- */
3533 3946
3534/* 3947/*
3535 * Send printf() formatted output to the command. 3948 * Send printf () formatted output to the command.
3536 * Only use for small amounts of data. 3949 * Only use for small amounts of data.
3537 */ 3950 */
3538void 3951void
3539rxvt_term::tt_printf (const char *fmt,...) 3952rxvt_term::tt_printf (const char *fmt,...)
3540{ 3953{

Diff Legend

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