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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC

… …
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
… …
753 IMSendSpot (); 675 IMSendSpot ();
754#endif 676#endif
755 677
756 } 678 }
757 679
758 XFlush (display->display); 680 display->flush ();
759} 681}
760 682
761void 683void
762rxvt_term::check_cb (check_watcher &w) 684rxvt_term::check_cb (check_watcher &w)
763{ 685{
… …
798 720
799 memmove (cmdbuf_base, cmdbuf_ptr, n); 721 memmove (cmdbuf_base, cmdbuf_ptr, n);
800 cmdbuf_ptr = cmdbuf_base; 722 cmdbuf_ptr = cmdbuf_base;
801 cmdbuf_endp = cmdbuf_ptr + n; 723 cmdbuf_endp = cmdbuf_ptr + n;
802 724
803 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
804 726
805 if (n > 0) 727 if (n > 0)
806 { 728 {
807 cmdbuf_endp += n; 729 cmdbuf_endp += n;
808 return true; 730 return true;
809 } 731 }
810 else if (n < 0 && errno != EAGAIN) 732 else if (n < 0 && errno != EAGAIN)
811 destroy (); 733 destroy ();
812 734
813 return false; 735 return false;
814} 736}
815 737
816void 738void
817rxvt_term::pty_cb (io_watcher &w, short revents) 739rxvt_term::pty_cb (io_watcher &w, short revents)
… …
821 743
822 if (revents & EVENT_WRITE) 744 if (revents & EVENT_WRITE)
823 tt_write (0, 0); 745 tt_write (0, 0);
824 else if (revents & EVENT_READ) 746 else if (revents & EVENT_READ)
825 { 747 {
826 bool flag = true;
827
828 // loop, but don't allow a single term to monopolize us 748 // loop, but don't allow a single term to monopolize us
829 // the number of loops is fully arbitrary, and thus wrong 749 // the number of loops is fully arbitrary, and thus wrong
830 while (flag && pty_fill ()) 750 while (pty_fill ())
831 { 751 {
832 if (!seen_input) 752 if (!seen_input)
833 { 753 {
834 seen_input = 1; 754 seen_input = 1;
835 /* once we know the shell is running, send the screen size. Again! */ 755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
836 tt_winch (); 757 tt_winch ();
837 } 758 }
838 759
839 uint32_t ch = NOCHAR; 760 if (cmd_parse ())
840
841 for (;;)
842 {
843 if (ch == NOCHAR)
844 ch = next_char ();
845
846 if (ch == NOCHAR) // TODO: improve
847 break; 761 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 } 762 }
937 }
938 }
939}
940
941// read the next character, currently handles UTF-8
942// will probably handle all sorts of other stuff in the future
943uint32_t
944rxvt_term::next_char ()
945{
946 while (cmdbuf_ptr < cmdbuf_endp)
947 {
948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
949 return *cmdbuf_ptr++;
950
951 wchar_t wc;
952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
953
954 if (len == (size_t)-2)
955 return NOCHAR;
956
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 } 763 }
988} 764}
989 765
990#ifdef POINTER_BLANK 766#ifdef POINTER_BLANK
991void 767void
… …
1001} 777}
1002 778
1003void 779void
1004rxvt_term::pointer_blank () 780rxvt_term::pointer_blank ()
1005{ 781{
1006 if (!(Options & Opt_pointerBlank)) 782 if (! (Options & Opt_pointerBlank))
1007 return; 783 return;
1008 784
1009 XDefineCursor (display->display, TermWin.vt, blank_cursor); 785 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1010 XFlush (display->display); 786 XFlush (display->display);
1011 787
… …
1021 pointer_blank (); 797 pointer_blank ();
1022} 798}
1023#endif 799#endif
1024 800
1025void 801void
1026rxvt_term::mouse_report (const XButtonEvent &ev) 802rxvt_term::mouse_report (XButtonEvent &ev)
1027{ 803{
1028 int button_number, key_state = 0; 804 int button_number, key_state = 0;
1029 int x, y; 805 int x, y;
1030 806
1031 x = ev.x; 807 x = ev.x;
1032 y = ev.y; 808 y = ev.y;
1033 pixel_position (&x, &y); 809 pixel_position (&x, &y);
1034 810
… …
1071#endif 847#endif
1072 848
1073 } 849 }
1074 850
1075#ifdef DEBUG_MOUSEREPORT 851#ifdef DEBUG_MOUSEREPORT
1076 fprintf(stderr, "Mouse ["); 852 fprintf (stderr, "Mouse [");
1077 if (key_state & 16) 853 if (key_state & 16)
1078 fputc('C', stderr); 854 fputc ('C', stderr);
1079 if (key_state & 4) 855 if (key_state & 4)
1080 fputc('S', stderr); 856 fputc ('S', stderr);
1081 if (key_state & 8) 857 if (key_state & 8)
1082 fputc('A', stderr); 858 fputc ('A', stderr);
1083 if (key_state & 32) 859 if (key_state & 32)
1084 fputc('2', stderr); 860 fputc ('2', stderr);
1085 fprintf(stderr, "]: <%d>, %d/%d\n", 861 fprintf (stderr, "]: <%d>, %d/%d\n",
1086 button_number, 862 button_number,
1087 x + 1, 863 x + 1,
1088 y + 1); 864 y + 1);
1089#else 865#else
1090 tt_printf("\033[M%c%c%c", 866 tt_printf ("\033[M%c%c%c",
1091 (32 + button_number + key_state), 867 (32 + button_number + key_state),
1092 (32 + x + 1), 868 (32 + x + 1),
1093 (32 + y + 1)); 869 (32 + y + 1));
1094#endif 870#endif
1095} 871}
1096 872
1097#ifdef USING_W11LIB 873#ifdef USING_W11LIB
1098void 874void
1099rxvt_W11_process_x_event(XEvent *ev) 875rxvt_W11_process_x_event (XEvent *ev)
1100{ 876{
1101 rxvt_t *r = rxvt_get_r(); 877 rxvt_t *r = rxvt_get_r ();
1102 878
1103 x_cb (*ev); 879 x_cb (*ev);
1104} 880}
1105#endif 881#endif
1106 882
… …
1189#endif 965#endif
1190 966
1191#ifdef DEBUG_X 967#ifdef DEBUG_X
1192 struct timeval tp; 968 struct timeval tp;
1193 struct tm *ltt; 969 struct tm *ltt;
1194 (void)gettimeofday(&tp, NULL); 970 (void)gettimeofday (&tp, NULL);
1195 ltt = localtime(&(tp.tv_sec)); 971 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)); 972 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 973#endif
1198 974
1199 switch (ev.type) 975 switch (ev.type)
1200 { 976 {
1201 case KeyPress: 977 case KeyPress:
… …
1203 break; 979 break;
1204 980
1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1206 case KeyRelease: 982 case KeyRelease:
1207 { 983 {
1208 if (!(ev.xkey.state & ControlMask)) 984 if (! (ev.xkey.state & ControlMask))
1209 mouse_slip_wheel_speed = 0; 985 mouse_slip_wheel_speed = 0;
1210 else 986 else
1211 { 987 {
1212 KeySym ks; 988 KeySym ks;
1213 989
1214 ks = XKeycodeToKeysym(display->display, ev.xkey.keycode, 0); 990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1215 if (ks == XK_Control_L || ks == XK_Control_R) 991 if (ks == XK_Control_L || ks == XK_Control_R)
1216 mouse_slip_wheel_speed = 0; 992 mouse_slip_wheel_speed = 0;
1217 } 993 }
1218 break; 994 break;
1219 } 995 }
… …
1242 Atom ActualType; 1018 Atom ActualType;
1243 int ActualFormat; 1019 int ActualFormat;
1244 unsigned char *data; 1020 unsigned char *data;
1245 unsigned long Size, RemainingBytes; 1021 unsigned long Size, RemainingBytes;
1246 1022
1247 XGetWindowProperty(display->display, display->root, 1023 XGetWindowProperty (display->display, display->root,
1248 xa[XA_DNDSELECTION], 1024 xa[XA_DNDSELECTION],
1249 0L, 1000000L, 1025 0L, 1000000L,
1250 False, AnyPropertyType, 1026 False, AnyPropertyType,
1251 &ActualType, &ActualFormat, 1027 &ActualType, &ActualFormat,
1252 &Size, &RemainingBytes, 1028 &Size, &RemainingBytes,
1253 &data); 1029 &data);
1254 XChangeProperty(display->display, display->root, 1030 XChangeProperty (display->display, display->root,
1255 XA_CUT_BUFFER0, XA_STRING, 1031 XA_CUT_BUFFER0, XA_STRING,
1256 8, PropModeReplace, 1032 8, PropModeReplace,
1257 data, STRLEN(data)); 1033 data, STRLEN (data));
1258 selection_paste (display->root, XA_CUT_BUFFER0, True); 1034 selection_paste (display->root, XA_CUT_BUFFER0, True);
1259 XSetInputFocus(display->display, display->root, RevertToNone, CurrentTime); 1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1260 } 1036 }
1261#endif /* OFFIX_DND */ 1037#endif /* OFFIX_DND */
1262 break; 1038 break;
1263 1039
1264 case MappingNotify: 1040 case MappingNotify:
1265 XRefreshKeyboardMapping(&(ev.xmapping)); 1041 XRefreshKeyboardMapping (& (ev.xmapping));
1266 break; 1042 break;
1267 1043
1268 /* 1044 /*
1269 * XXX: this is not the _current_ arrangement 1045 * XXX: this is not the _current_ arrangement
1270 * Here's my conclusion: 1046 * Here's my conclusion:
… …
1295 { 1071 {
1296 TermWin.focus = 1; 1072 TermWin.focus = 1;
1297 want_refresh = 1; 1073 want_refresh = 1;
1298#ifdef USE_XIM 1074#ifdef USE_XIM
1299 if (Input_Context != NULL) 1075 if (Input_Context != NULL)
1300 XSetICFocus(Input_Context); 1076 XSetICFocus (Input_Context);
1301#endif 1077#endif
1302#ifdef CURSOR_BLINK 1078#ifdef CURSOR_BLINK
1303 if (Options & Opt_cursorBlink) 1079 if (Options & Opt_cursorBlink)
1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1305#endif 1081#endif
… …
1312 { 1088 {
1313 TermWin.focus = 0; 1089 TermWin.focus = 0;
1314 want_refresh = 1; 1090 want_refresh = 1;
1315#ifdef USE_XIM 1091#ifdef USE_XIM
1316 if (Input_Context != NULL) 1092 if (Input_Context != NULL)
1317 XUnsetICFocus(Input_Context); 1093 XUnsetICFocus (Input_Context);
1318#endif 1094#endif
1319#ifdef CURSOR_BLINK 1095#ifdef CURSOR_BLINK
1320 if (Options & Opt_cursorBlink) 1096 if (Options & Opt_cursorBlink)
1321 cursor_blink_ev.stop (); 1097 cursor_blink_ev.stop ();
1322 hidden_cursor = 0; 1098 hidden_cursor = 0;
… …
1332 1108
1333 do 1109 do
1334 { /* Wrap lots of configures into one */ 1110 { /* Wrap lots of configures into one */
1335 width = ev.xconfigure.width; 1111 width = ev.xconfigure.width;
1336 height = ev.xconfigure.height; 1112 height = ev.xconfigure.height;
1337 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1338 } 1114 }
1339 while (XCheckTypedWindowEvent(display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1340 1116
1341 if (szHint.width != width || szHint.height != height) 1117 if (szHint.width != width || szHint.height != height)
1342 { 1118 {
1343 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1344 resize_all_windows (width, height, 1); 1120 resize_all_windows (width, height, 1);
1345 } 1121 }
1346#ifdef DEBUG_SIZE 1122#ifdef DEBUG_SIZE
1347 else 1123 else
1348 { 1124 {
1349 D_SIZE((stderr, "Size: Not resizing")); 1125 D_SIZE ((stderr, "Size: Not resizing"));
1350 } 1126 }
1351#endif 1127#endif
1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1353 if (Options & Opt_transparent) 1129 if (Options & Opt_transparent)
1354 { 1130 {
1355 check_our_parents (); 1131 check_our_parents ();
1356 if (am_transparent) 1132 if (am_transparent)
1357 want_full_refresh = 1; 1133 want_full_refresh = 1;
1358 } 1134 }
1359#endif 1135#endif
1360
1361 } 1136 }
1362 break; 1137 break;
1363 1138
1364 case SelectionClear: 1139 case SelectionClear:
1365 selection_clear (); 1140 selection_clear ();
… …
1385 case MapNotify: 1160 case MapNotify:
1386 TermWin.mapped = 1; 1161 TermWin.mapped = 1;
1387#ifdef TEXT_BLINK 1162#ifdef TEXT_BLINK
1388 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1163 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1389#endif 1164#endif
1390 break;
1391
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; 1165 break;
1397 1166
1398#ifdef TRANSPARENT 1167#ifdef TRANSPARENT
1399 case ReparentNotify: 1168 case ReparentNotify:
1400 rootwin_cb (ev); 1169 rootwin_cb (ev);
… …
1419 } 1188 }
1420 else 1189 else
1421 { 1190 {
1422 XEvent unused_event; 1191 XEvent unused_event;
1423 1192
1424 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1425 Expose, 1194 Expose,
1426 &unused_event)) ; 1195 &unused_event)) ;
1427 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1428 GraphicsExpose, 1197 GraphicsExpose,
1429 &unused_event)) ; 1198 &unused_event)) ;
1430 if (isScrollbarWindow(ev.xany.window)) 1199 if (isScrollbarWindow (ev.xany.window))
1431 { 1200 {
1432 scrollBar.setIdle(); 1201 scrollBar.setIdle ();
1433 scrollbar_show (0); 1202 scrollbar_show (0);
1434 } 1203 }
1435#ifdef MENUBAR 1204#ifdef MENUBAR
1436 if (menubar_visible () && isMenuBarWindow(ev.xany.window)) 1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1437 menubar_expose (); 1206 menubar_expose ();
1438#endif 1207#endif
1439#ifdef RXVT_GRAPHICS
1440 Gr_expose (ev.xany.window);
1441#endif
1442
1443 } 1208 }
1444 break; 1209 break;
1445 1210
1446 case MotionNotify: 1211 case MotionNotify:
1447#ifdef POINTER_BLANK 1212#ifdef POINTER_BLANK
1448 if (hidden_pointer) 1213 if (hidden_pointer)
1449 pointer_unblank (); 1214 pointer_unblank ();
1450#endif 1215#endif
1451#if MENUBAR 1216#if MENUBAR
1452 if (isMenuBarWindow(ev.xany.window)) 1217 if (isMenuBarWindow (ev.xany.window))
1453 { 1218 {
1454 menubar_control (&(ev.xbutton)); 1219 menubar_control (ev.xbutton);
1455 break; 1220 break;
1456 } 1221 }
1457#endif 1222#endif
1458 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1459 break; 1224 break;
1460 1225
1461 if (ev.xany.window == TermWin.vt) 1226 if (ev.xany.window == TermWin.vt)
1462 { 1227 {
1463 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1464 { 1229 {
1465 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1466 ; 1231 ;
1467 1232
1468 XQueryPointer(display->display, TermWin.vt, 1233 XQueryPointer (display->display, TermWin.vt,
1469 &unused_root, &unused_child, 1234 &unused_root, &unused_child,
1470 &unused_root_x, &unused_root_y, 1235 &unused_root_x, &unused_root_y,
1471 &(ev.xbutton.x), &(ev.xbutton.y), 1236 & (ev.xbutton.x), & (ev.xbutton.y),
1472 &unused_mask); 1237 &unused_mask);
1473#ifdef MOUSE_THRESHOLD 1238#ifdef MOUSE_THRESHOLD
1474 /* deal with a `jumpy' mouse */ 1239 /* deal with a `jumpy' mouse */
1475 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1476 { 1241 {
1477#endif 1242#endif
1478 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1479 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1244 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1480#ifdef SELECTION_SCROLLING 1245#ifdef SELECTION_SCROLLING
1481 if (ev.xbutton.y < TermWin.int_bwidth 1246 if (ev.xbutton.y < TermWin.int_bwidth
1482 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1)) 1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1483 { 1248 {
1484 int dist; 1249 int dist;
1485 1250
1486 pending_scroll_selection=1; 1251 pending_scroll_selection=1;
1487 1252
… …
1509 { 1274 {
1510 scroll_selection_dir = DN; 1275 scroll_selection_dir = DN;
1511 dist = ev.xbutton.y - 1276 dist = ev.xbutton.y -
1512 (TermWin.int_bwidth + TermWin.height); 1277 (TermWin.int_bwidth + TermWin.height);
1513 } 1278 }
1514 scroll_selection_lines=(Pixel2Height(dist)/ 1279 scroll_selection_lines= (Pixel2Height (dist)/
1515 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1280 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1516 MIN_IT(scroll_selection_lines, 1281 MIN_IT (scroll_selection_lines,
1517 SELECTION_SCROLL_MAX_LINES); 1282 SELECTION_SCROLL_MAX_LINES);
1518 } 1283 }
1519 else 1284 else
1520 { 1285 {
1521 /* we are within the text window, so we 1286 /* we are within the text window, so we
… …
1529 } 1294 }
1530#endif 1295#endif
1531 1296
1532 } 1297 }
1533 } 1298 }
1534 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion()) 1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1535 { 1300 {
1536 while (XCheckTypedWindowEvent(display->display, scrollBar.win, 1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1537 MotionNotify, &ev)) ; 1302 MotionNotify, &ev)) ;
1538 XQueryPointer(display->display, scrollBar.win, 1303 XQueryPointer (display->display, scrollBar.win,
1539 &unused_root, &unused_child, 1304 &unused_root, &unused_child,
1540 &unused_root_x, &unused_root_y, 1305 &unused_root_x, &unused_root_y,
1541 &(ev.xbutton.x), &(ev.xbutton.y), 1306 & (ev.xbutton.x), & (ev.xbutton.y),
1542 &unused_mask); 1307 &unused_mask);
1543 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO, 1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1544 scrollbar_size()); 1309 scrollbar_size ());
1545 scr_refresh (refresh_type); 1310 scr_refresh (refresh_type);
1546 refresh_limit = 0; 1311 refresh_limit = 0;
1547 scrollbar_show (1); 1312 scrollbar_show (1);
1548 } 1313 }
1549 break; 1314 break;
… …
1554rxvt_term::rootwin_cb (XEvent &ev) 1319rxvt_term::rootwin_cb (XEvent &ev)
1555{ 1320{
1556 SET_R (this); 1321 SET_R (this);
1557 SET_LOCALE (locale); 1322 SET_LOCALE (locale);
1558 1323
1559 if (ev.type == PropertyNotify) 1324 switch (ev.type)
1560 { 1325 {
1561 /* 1326 case PropertyNotify:
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1328 {
1329 if (ev.xproperty.state == PropertyNewValue)
1330 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 break;
1332 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /*
1562 * if user used some Esetroot compatible prog to set the root bg, 1337 * 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. 1338 * use the property to determine the pixmap. We use it later on.
1564 */ 1339 */
1565 if (xa[XA_XROOTPMAPID] == 0) 1340 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False); 1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1567 1342
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return; 1344 return;
1570 } 1345 }
1571 1346
1347 /* FALLTHROUGH */
1348 case ReparentNotify:
1572 if ((Options & Opt_transparent) && check_our_parents ()) 1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1573 {
1574 if (am_transparent)
1575 want_full_refresh = 1; 1350 want_full_refresh = 1;
1351 break;
1352#endif
1576 } 1353 }
1577} 1354}
1578 1355
1579void 1356void
1580rxvt_term::button_press (const XButtonEvent &ev) 1357rxvt_term::button_press (XButtonEvent &ev)
1581{ 1358{
1582 int reportmode = 0, clickintime; 1359 int reportmode = 0, clickintime;
1583 1360
1584 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1585 if (!bypass_keystate) 1362 if (!bypass_keystate)
1586 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1363 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1587 /* 1364 /*
1588 * VT window processing of button press 1365 * VT window processing of button press
1589 */ 1366 */
1590 if (ev.window == TermWin.vt) 1367 if (ev.window == TermWin.vt)
1591 { 1368 {
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; 1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1600 if (reportmode) 1370 if (reportmode)
1371 {
1372 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state;
1375#ifdef MOUSE_REPORT_DOUBLECLICK
1376 if (ev.button == MEvent.button && clickintime)
1601 { 1377 {
1602 /* mouse report from vt window */ 1378 /* same button, within alloted time */
1603 /* save the xbutton state (for ButtonRelease) */ 1379 MEvent.clicks++;
1604 MEvent.state = ev.state; 1380 if (MEvent.clicks > 1)
1605#ifdef MOUSE_REPORT_DOUBLECLICK
1606 if (ev.button == MEvent.button && clickintime)
1607 { 1381 {
1608 /* same button, within alloted time */
1609 MEvent.clicks++;
1610 if (MEvent.clicks > 1)
1611 {
1612 /* only report double clicks */ 1382 /* only report double clicks */
1613 MEvent.clicks = 2; 1383 MEvent.clicks = 2;
1614 mouse_report (ev); 1384 mouse_report (ev);
1615 1385
1616 /* don't report the release */ 1386 /* don't report the release */
1617 MEvent.clicks = 0; 1387 MEvent.clicks = 0;
1618 MEvent.button = AnyButton; 1388 MEvent.button = AnyButton;
1619 }
1620 } 1389 }
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 } 1390 }
1634 else 1391 else
1635 { 1392 {
1393 /* different button, or time expired */
1394 MEvent.clicks = 1;
1395 MEvent.button = ev.button;
1396 mouse_report (ev);
1397 }
1398#else
1399 MEvent.button = ev.button;
1400 mouse_report (ev);
1401#endif /* MOUSE_REPORT_DOUBLECLICK */
1402
1403 }
1404 else
1405 {
1636 if (ev.button != MEvent.button) 1406 if (ev.button != MEvent.button)
1637 MEvent.clicks = 0; 1407 MEvent.clicks = 0;
1638 switch (ev.button) 1408 switch (ev.button)
1639 { 1409 {
1640 case Button1: 1410 case Button1:
1641 /* allow shift+left click to extend selection */ 1411 /* allow shift+left click to extend selection */
1642 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1643 { 1413 {
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) 1414 if (MEvent.button == Button1 && clickintime)
1664 selection_rotate (ev.x, ev.y); 1415 selection_rotate (ev.x, ev.y);
1665 else 1416 else
1666 selection_extend (ev.x, ev.y, 1); 1417 selection_extend (ev.x, ev.y, 1);
1418 }
1419 else
1420 {
1421 if (MEvent.button == Button1 && clickintime)
1422 MEvent.clicks++;
1423 else
1424 MEvent.clicks = 1;
1425
1426 selection_click (MEvent.clicks, ev.x, ev.y);
1427 }
1428
1429 MEvent.button = Button1;
1430 break;
1431
1432 case Button3:
1433 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y);
1435 else
1436 selection_extend (ev.x, ev.y, 1);
1667 MEvent.button = Button3; 1437 MEvent.button = Button3;
1668 break; 1438 break;
1669 }
1670 } 1439 }
1440 }
1671 MEvent.time = ev.time; 1441 MEvent.time = ev.time;
1672 return; 1442 return;
1673 }
1674 } 1443 }
1675 1444
1676 /* 1445 /*
1677 * Scrollbar window processing of button press 1446 * Scrollbar window processing of button press
1678 */ 1447 */
1679 if (isScrollbarWindow(ev.window)) 1448 if (isScrollbarWindow (ev.window))
1680 { 1449 {
1681 scrollBar.setIdle (); 1450 scrollBar.setIdle ();
1682 /* 1451 /*
1683 * Rxvt-style scrollbar: 1452 * Rxvt-style scrollbar:
1684 * move up if mouse is above slider 1453 * move up if mouse is above slider
… …
1696 * Mouse report disabled scrollbar: 1465 * Mouse report disabled scrollbar:
1697 * arrow buttons - send up/down 1466 * arrow buttons - send up/down
1698 * click on scrollbar - send pageup/down 1467 * click on scrollbar - send pageup/down
1699 */ 1468 */
1700 if ((scrollBar.style == R_SB_NEXT 1469 if ((scrollBar.style == R_SB_NEXT
1701 && scrollbarnext_upButton(ev.y)) 1470 && scrollbarnext_upButton (ev.y))
1702 || (scrollBar.style == R_SB_RXVT 1471 || (scrollBar.style == R_SB_RXVT
1703 && scrollbarrxvt_upButton(ev.y))) 1472 && scrollbarrxvt_upButton (ev.y)))
1704 tt_printf("\033[A"); 1473 tt_printf ("\033[A");
1705 else if ((scrollBar.style == R_SB_NEXT 1474 else if ((scrollBar.style == R_SB_NEXT
1706 && scrollbarnext_dnButton(ev.y)) 1475 && scrollbarnext_dnButton (ev.y))
1707 || (scrollBar.style == R_SB_RXVT 1476 || (scrollBar.style == R_SB_RXVT
1708 && scrollbarrxvt_dnButton(ev.y))) 1477 && scrollbarrxvt_dnButton (ev.y)))
1709 tt_printf("\033[B"); 1478 tt_printf ("\033[B");
1710 else 1479 else
1711 switch (ev.button) 1480 switch (ev.button)
1712 { 1481 {
1713 case Button2: 1482 case Button2:
1714 tt_printf("\014"); 1483 tt_printf ("\014");
1715 break; 1484 break;
1716 case Button1: 1485 case Button1:
1717 tt_printf("\033[6~"); 1486 tt_printf ("\033[6~");
1718 break; 1487 break;
1719 case Button3: 1488 case Button3:
1720 tt_printf("\033[5~"); 1489 tt_printf ("\033[5~");
1721 break; 1490 break;
1722 } 1491 }
1723 } 1492 }
1724 else 1493 else
1725#endif /* NO_SCROLLBAR_REPORT */ 1494#endif /* NO_SCROLLBAR_REPORT */
… …
1727 { 1496 {
1728 char upordown = 0; 1497 char upordown = 0;
1729 1498
1730 if (scrollBar.style == R_SB_NEXT) 1499 if (scrollBar.style == R_SB_NEXT)
1731 { 1500 {
1732 if (scrollbarnext_upButton(ev.y)) 1501 if (scrollbarnext_upButton (ev.y))
1733 upordown = -1; /* up */ 1502 upordown = -1; /* up */
1734 else if (scrollbarnext_dnButton(ev.y)) 1503 else if (scrollbarnext_dnButton (ev.y))
1735 upordown = 1; /* down */ 1504 upordown = 1; /* down */
1736 } 1505 }
1737 else if (scrollBar.style == R_SB_RXVT) 1506 else if (scrollBar.style == R_SB_RXVT)
1738 { 1507 {
1739 if (scrollbarrxvt_upButton(ev.y)) 1508 if (scrollbarrxvt_upButton (ev.y))
1740 upordown = -1; /* up */ 1509 upordown = -1; /* up */
1741 else if (scrollbarrxvt_dnButton(ev.y)) 1510 else if (scrollbarrxvt_dnButton (ev.y))
1742 upordown = 1; /* down */ 1511 upordown = 1; /* down */
1743 } 1512 }
1744 if (upordown) 1513 if (upordown)
1745 { 1514 {
1746#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
1769 case R_SB_ALIGN_BOTTOM: 1538 case R_SB_ALIGN_BOTTOM:
1770 csrO = scrollBar.bot - scrollBar.top; 1539 csrO = scrollBar.bot - scrollBar.top;
1771 break; 1540 break;
1772 } 1541 }
1773 if (scrollBar.style == R_SB_XTERM 1542 if (scrollBar.style == R_SB_XTERM
1774 || scrollbar_above_slider(ev.y) 1543 || scrollbar_above_slider (ev.y)
1775 || scrollbar_below_slider(ev.y)) 1544 || scrollbar_below_slider (ev.y))
1776 scr_move_to ( scrollbar_position(ev.y) - csrO, 1545 scr_move_to ( scrollbar_position (ev.y) - csrO,
1777 scrollbar_size()); 1546 scrollbar_size ());
1778 scrollBar.setMotion (); 1547 scrollBar.setMotion ();
1779 break; 1548 break;
1780 1549
1781 case Button1: 1550 case Button1:
1782 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1551 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1784 /* FALLTHROUGH */ 1553 /* FALLTHROUGH */
1785 1554
1786 case Button3: 1555 case Button3:
1787 if (scrollBar.style != R_SB_XTERM) 1556 if (scrollBar.style != R_SB_XTERM)
1788 { 1557 {
1789 if (scrollbar_above_slider(ev.y)) 1558 if (scrollbar_above_slider (ev.y))
1790# ifdef RXVT_SCROLL_FULL 1559# ifdef RXVT_SCROLL_FULL
1791 scr_page (UP, TermWin.nrow - 1); 1560 scr_page (UP, TermWin.nrow - 1);
1792# else 1561# else
1793 scr_page (UP, TermWin.nrow / 4); 1562 scr_page (UP, TermWin.nrow / 4);
1794# endif 1563# endif
1795 else if (scrollbar_below_slider(ev.y)) 1564 else if (scrollbar_below_slider (ev.y))
1796# ifdef RXVT_SCROLL_FULL 1565# ifdef RXVT_SCROLL_FULL
1797 scr_page (DN, TermWin.nrow - 1); 1566 scr_page (DN, TermWin.nrow - 1);
1798# else 1567# else
1799 scr_page (DN, TermWin.nrow / 4); 1568 scr_page (DN, TermWin.nrow / 4);
1800# endif 1569# endif
… …
1803 } 1572 }
1804 else 1573 else
1805 { 1574 {
1806 scr_page ((ev.button == Button1 ? DN : UP), 1575 scr_page ((ev.button == Button1 ? DN : UP),
1807 (TermWin.nrow 1576 (TermWin.nrow
1808 * scrollbar_position(ev.y) 1577 * scrollbar_position (ev.y)
1809 / scrollbar_size())); 1578 / scrollbar_size ()));
1810 } 1579 }
1811 break; 1580 break;
1812 } 1581 }
1813 } 1582 }
1814 return; 1583 return;
1815 } 1584 }
1816#if MENUBAR 1585#if MENUBAR
1817 /* 1586 /*
1818 * Menubar window processing of button press 1587 * Menubar window processing of button press
1819 */ 1588 */
1820 if (isMenuBarWindow(ev.window)) 1589 if (isMenuBarWindow (ev.window))
1821 menubar_control (ev); 1590 menubar_control (ev);
1822#endif 1591#endif
1823} 1592}
1824 1593
1825void 1594void
1826rxvt_term::button_release (const XButtonEvent &ev) 1595rxvt_term::button_release (XButtonEvent &ev)
1827{ 1596{
1828 int reportmode = 0; 1597 int reportmode = 0;
1829 1598
1830 csrO = 0; /* reset csr Offset */ 1599 csrO = 0; /* reset csr Offset */
1831 if (!bypass_keystate) 1600 if (!bypass_keystate)
1832 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1601 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1833 1602
1834 if (scrollbar_isUpDn()) 1603 if (scrollbar_isUpDn ())
1835 { 1604 {
1836 scrollBar.setIdle (); 1605 scrollBar.setIdle ();
1837 scrollbar_show (0); 1606 scrollbar_show (0);
1838#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1839 refresh_type &= ~SMOOTH_REFRESH; 1608 refresh_type &= ~SMOOTH_REFRESH;
… …
1843#ifdef SELECTION_SCROLLING 1612#ifdef SELECTION_SCROLLING
1844 pending_scroll_selection=0; 1613 pending_scroll_selection=0;
1845#endif 1614#endif
1846 if (ev.window == TermWin.vt) 1615 if (ev.window == TermWin.vt)
1847 { 1616 {
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) 1617 if (reportmode)
1618 {
1619 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4)
1622 return;
1623#ifdef MOUSE_REPORT_DOUBLECLICK
1624 /* only report the release of 'slow' single clicks */
1625 if (MEvent.button != AnyButton
1626 && (ev.button != MEvent.button
1627 || (ev.time - MEvent.time
1628 > MULTICLICK_TIME / 2)))
1856 { 1629 {
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; 1630 MEvent.clicks = 0;
1869 MEvent.button = AnyButton;
1870 mouse_report (ev);
1871 }
1872#else /* MOUSE_REPORT_DOUBLECLICK */
1873 MEvent.button = AnyButton; 1631 MEvent.button = AnyButton;
1874 mouse_report (ev); 1632 mouse_report (ev);
1633 }
1634#else /* MOUSE_REPORT_DOUBLECLICK */
1635 MEvent.button = AnyButton;
1636 mouse_report (ev);
1875#endif /* MOUSE_REPORT_DOUBLECLICK */ 1637#endif /* MOUSE_REPORT_DOUBLECLICK */
1876 return; 1638 return;
1877 } 1639 }
1878 /* 1640 /*
1879 * dumb hack to compensate for the failure of click-and-drag 1641 * dumb hack to compensate for the failure of click-and-drag
1880 * when overriding mouse reporting 1642 * when overriding mouse reporting
1881 */ 1643 */
1882 if (PrivateModes & PrivMode_mouse_report 1644 if (PrivateModes & PrivMode_mouse_report
1883 && bypass_keystate 1645 && bypass_keystate
1884 && ev.button == Button1 && MEvent.clicks <= 1) 1646 && ev.button == Button1 && MEvent.clicks <= 1)
1885 selection_extend (ev.x, ev.y, 0); 1647 selection_extend (ev.x, ev.y, 0);
1886 1648
1887 switch (ev.button) 1649 switch (ev.button)
1650 {
1651 case Button1:
1652 case Button3:
1653 selection_make (ev.time);
1654 break;
1655 case Button2:
1656 selection_request (ev.time, ev.x, ev.y);
1657 break;
1658#ifdef MOUSE_WHEEL
1659 case Button4:
1660 case Button5:
1888 { 1661 {
1889 case Button1: 1662 int i;
1890 case Button3: 1663 page_dirn v;
1891 selection_make (ev.time); 1664
1665 v = (ev.button == Button4) ? UP : DN;
1666 if (ev.state & ShiftMask)
1892 break; 1667 i = 1;
1893 case Button2: 1668 else if ((Options & Opt_mouseWheelScrollPage))
1894 selection_request (ev.time, ev.x, ev.y); 1669 i = TermWin.nrow - 1;
1670 else
1895 break; 1671 i = 5;
1896#ifdef MOUSE_WHEEL 1672# ifdef MOUSE_SLIP_WHEELING
1897 case Button4: 1673 if (ev.state & ControlMask)
1898 case Button5:
1899 { 1674 {
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); 1675 mouse_slip_wheel_speed += (v ? -1 : 1);
1914 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1915 } 1677 }
1916# endif 1678# endif
1917# ifdef JUMP_MOUSE_WHEEL 1679# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1918 scr_page (v, i); 1686 scr_page (v, 1);
1919 scr_refresh (SMOOTH_REFRESH); 1687 scr_refresh (SMOOTH_REFRESH);
1920 scrollbar_show (1); 1688 scrollbar_show (1);
1921# else
1922 while (i--)
1923 {
1924 scr_page (v, 1);
1925 scr_refresh (SMOOTH_REFRESH);
1926 scrollbar_show (1);
1927 } 1689 }
1928# endif 1690# endif
1929 1691
1692 }
1693 break;
1694#endif
1695
1696 }
1697 }
1698#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev);
1701#endif
1702}
1703
1704#ifdef TRANSPARENT
1705#if TINTING
1706/* shading taken from eterm-0.9.2 */
1707/* RGB 15 */
1708
1709static void
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1717 /* No saturation */
1718 for (y = h; --y >= 0;) {
1719 for (x = -w; x < 0; x++) {
1720 int r, g, b;
1721
1722 b = ((uint16_t *) ptr)[x];
1723 r = (b & 0x7c00) * rm;
1724 g = (b & 0x3e0) * gm;
1725 b = (b & 0x1f) * bm;
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1727 | ((g >> 8) & 0x3e0)
1728 | ((b >> 8) & 0x1f);
1729 }
1730 ptr += bpl;
1731 }
1732 } else {
1733 for (y = h; --y >= 0;) {
1734 for (x = -w; x < 0; x++) {
1735 int r, g, b;
1736
1737 b = ((uint16_t *) ptr)[x];
1738 r = (b & 0x7c00) * rm;
1739 g = (b & 0x3e0) * gm;
1740 b = (b & 0x1f) * bm;
1741 r |= (!(r >> 15) - 1);
1742 g |= (!(g >> 10) - 1);
1743 b |= (!(b >> 5) - 1);
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1745 | ((g >> 8) & 0x3e0)
1746 | ((b >> 8) & 0x1f);
1747 }
1748 ptr += bpl;
1749 }
1750 }
1751}
1752
1753/* RGB 16 */
1754static void
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1756{
1757 unsigned char *ptr;
1758 int x, y;
1759
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1762 /* No saturation */
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 }
1777 } else {
1778 for (y = h; --y >= 0;) {
1779 for (x = -w; x < 0; x++) {
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 }
1793 ptr += bpl;
1794 }
1795 }
1796}
1797
1798/* RGB 24 */
1799static void
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1801{
1802 unsigned char *ptr;
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1930 } 1826 }
1931 break;
1932#endif
1933
1934 } 1827 }
1828 ptr += bpl;
1829 }
1830 } else {
1831 for (y = h; --y >= 0;) {
1832 for (x = -(w * 3); x < 0; x += 3) {
1833 int r, g, b;
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1935 } 1860 }
1861 ptr += bpl;
1862 }
1936 } 1863 }
1937#ifdef MENUBAR
1938 else if (isMenuBarWindow(ev.window))
1939 menubar_control (ev);
1940#endif
1941} 1864}
1942 1865
1866/* RGB 32 */
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1943 1872
1944#ifdef TRANSPARENT 1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936}
1937
1938#endif
1939
1945/* 1940/*
1946 * Check our parents are still who we think they are. 1941 * Check our parents are still who we think they are.
1947 * Do transparency updates if required 1942 * Do transparency updates if required
1948 */ 1943 */
1949int 1944int
1950rxvt_term::check_our_parents () 1945rxvt_term::check_our_parents ()
1951{ 1946{
1952 int i, pchanged, aformat, have_pixmap, rootdepth; 1947 int i, pchanged, aformat, have_pixmap, rootdepth;
1953 unsigned long nitems, bytes_after; 1948 unsigned long nitems, bytes_after;
1954 Atom atype; 1949 Atom atype;
1955 unsigned char *prop = NULL; 1950 unsigned char *prop = NULL;
1956 Window root, oldp, *list; 1951 Window root, oldp, *list;
1957 Pixmap rootpixmap = None; 1952 Pixmap rootpixmap = None;
1958 XWindowAttributes wattr, wrootattr; 1953 XWindowAttributes wattr, wrootattr;
1959 1954
1960 pchanged = 0; 1955 pchanged = 0;
1961 1956
1962 if (!(Options & Opt_transparent)) 1957 if (!(Options & Opt_transparent))
1963 return pchanged; /* Don't try any more */ 1958 return pchanged; /* Don't try any more */
1964 1959
1965 XGetWindowAttributes(display->display, display->root, &wrootattr); 1960 XGetWindowAttributes (display->display, display->root, &wrootattr);
1966 rootdepth = wrootattr.depth; 1961 rootdepth = wrootattr.depth;
1967 1962
1968 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1964
1969 if (rootdepth != wattr.depth) 1965 if (rootdepth != wattr.depth)
1970 { 1966 {
1971 if (am_transparent) 1967 if (am_transparent)
1972 { 1968 {
1973 pchanged = 1; 1969 pchanged = 1;
1974 XSetWindowBackground(display->display, TermWin.vt, 1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1975 PixColors[Color_bg]);
1976 am_transparent = am_pixmap_trans = 0; 1971 am_transparent = am_pixmap_trans = 0;
1977 } 1972 }
1973
1978 return pchanged; /* Don't try any more */ 1974 return pchanged; /* Don't try any more */
1979 } 1975 }
1980 1976
1981 /* Get all X ops out of the queue so that our information is up-to-date. */ 1977 /* Get all X ops out of the queue so that our information is up-to-date. */
1982 XSync(display->display, False); 1978 XSync (display->display, False);
1983 1979
1984 /* 1980 /*
1985 * Make the frame window set by the window manager have 1981 * Make the frame window set by the window manager have
1986 * the root background. Some window managers put multiple nested frame 1982 * the root background. Some window managers put multiple nested frame
1987 * windows for each client, so we have to take care about that. 1983 * windows for each client, so we have to take care about that.
1988 */ 1984 */
1989 i = (xa[XA_XROOTPMAPID] != 0 1985 i = (xa[XA_XROOTPMAPID]
1990 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID], 1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1991 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1992 &nitems, &bytes_after, &prop) == Success)); 1988 &nitems, &bytes_after, &prop) == Success);
1989
1990 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success);
1995
1993 if (!i || prop == NULL) 1996 if (!i || prop == NULL)
1994 have_pixmap = 0; 1997 have_pixmap = 0;
1995 else 1998 else
1996 { 1999 {
1997 have_pixmap = 1; 2000 have_pixmap = 1;
1998 rootpixmap = *((Pixmap *)prop); 2001 rootpixmap = * ((Pixmap *)prop);
1999 XFree(prop); 2002 XFree (prop);
2000 } 2003 }
2004
2001 if (have_pixmap) 2005 if (have_pixmap)
2002 { 2006 {
2003 /* 2007 /*
2004 * Copy display->root pixmap transparency 2008 * Copy display->root pixmap transparency
2005 */ 2009 */
2006 int sx, sy, nx, ny; 2010 int sx, sy, nx, ny;
2007 unsigned int nw, nh; 2011 unsigned int nw, nh;
2008 Window cr; 2012 Window cr;
2009 XImage *image; 2013 XImage *image;
2010 GC gc; 2014 GC gc;
2011 XGCValues gcvalue; 2015 XGCValues gcvalue;
2012 2016
2013 XTranslateCoordinates(display->display, TermWin.parent[0], display->root, 2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2014 0, 0, &sx, &sy, &cr); 2018 0, 0, &sx, &sy, &cr);
2015 nw = (unsigned int)szHint.width; 2019 nw = (unsigned int)szHint.width;
2016 nh = (unsigned int)szHint.height; 2020 nh = (unsigned int)szHint.height;
2017 nx = ny = 0; 2021 nx = ny = 0;
2022
2018 if (sx < 0) 2023 if (sx < 0)
2019 { 2024 {
2020 nw += sx; 2025 nw += sx;
2021 nx = -sx; 2026 nx = -sx;
2022 sx = 0; 2027 sx = 0;
2023 } 2028 }
2029
2024 if (sy < 0) 2030 if (sy < 0)
2025 { 2031 {
2026 nh += sy; 2032 nh += sy;
2027 ny = -sy; 2033 ny = -sy;
2028 sy = 0; 2034 sy = 0;
2029 } 2035 }
2036
2030 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2032 allowedxerror = -1; 2039 allowedxerror = -1;
2033 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034 ZPixmap); 2041
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */ 2043 /* XXX: may need a delay here? */
2037 allowedxerror = 0; 2044 allowedxerror = 0;
2045
2038 if (image == NULL) 2046 if (image == NULL)
2039 { 2047 {
2040 if (am_transparent && am_pixmap_trans) 2048 if (am_transparent && am_pixmap_trans)
2041 { 2049 {
2042 pchanged = 1; 2050 pchanged = 1;
2043 if (TermWin.pixmap != None) 2051 if (TermWin.pixmap != None)
2044 { 2052 {
2045 XFreePixmap(display->display, TermWin.pixmap); 2053 XFreePixmap (display->display, TermWin.pixmap);
2046 TermWin.pixmap = None; 2054 TermWin.pixmap = None;
2047 } 2055 }
2048 } 2056 }
2057
2049 am_pixmap_trans = 0; 2058 am_pixmap_trans = 0;
2050 } 2059 }
2051 else 2060 else
2052 { 2061 {
2053 if (TermWin.pixmap != None) 2062 if (TermWin.pixmap != None)
2054 XFreePixmap(display->display, TermWin.pixmap); 2063 XFreePixmap (display->display, TermWin.pixmap);
2064
2065#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint))
2067 {
2068 unsigned short shade, rm, gm, bm;
2069
2070 PixColors[Color_tint].get (display, rm, gm, bm);
2071
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 }
2083#endif
2084
2055 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt, 2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2056 (unsigned int)szHint.width,
2057 (unsigned int)szHint.height, 2086 szHint.width, szHint.height, image->depth);
2058 (unsigned int)image->depth);
2059 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue); 2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2060 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0, 2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2061 nx, ny, (unsigned int)image->width,
2062 (unsigned int)image->height); 2089 nx, ny, image->width, image->height);
2063 XFreeGC(display->display, gc); 2090 XFreeGC (display->display, gc);
2064 XDestroyImage(image); 2091 XDestroyImage (image);
2065 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2066 TermWin.pixmap); 2093 TermWin.pixmap);
2094
2067 if (!am_transparent || !am_pixmap_trans) 2095 if (!am_transparent || !am_pixmap_trans)
2068 pchanged = 1; 2096 pchanged = 1;
2097
2069 am_transparent = am_pixmap_trans = 1; 2098 am_transparent = am_pixmap_trans = 1;
2070 } 2099 }
2071 } 2100 }
2101
2072 if (!am_pixmap_trans) 2102 if (!am_pixmap_trans)
2073 { 2103 {
2074 unsigned int n; 2104 unsigned int n;
2075 /* 2105 /*
2076 * InheritPixmap transparency 2106 * InheritPixmap transparency
2077 */ 2107 */
2078 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2079 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2080 i++)
2081 { 2110 {
2082 oldp = TermWin.parent[i]; 2111 oldp = TermWin.parent[i];
2083 XQueryTree(display->display, TermWin.parent[i - 1], &root, 2112 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2084 &TermWin.parent[i], &list, &n); 2113 &TermWin.parent[i], &list, &n);
2085 XFree(list); 2114 XFree (list);
2086 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116
2087 if (TermWin.parent[i] == display->root) 2117 if (TermWin.parent[i] == display->root)
2088 { 2118 {
2089 if (oldp != None) 2119 if (oldp != None)
2090 pchanged = 1; 2120 pchanged = 1;
2121
2091 break; 2122 break;
2092 } 2123 }
2124
2093 if (oldp != TermWin.parent[i]) 2125 if (oldp != TermWin.parent[i])
2094 pchanged = 1; 2126 pchanged = 1;
2095 } 2127 }
2128
2096 n = 0; 2129 n = 0;
2130
2097 if (pchanged) 2131 if (pchanged)
2098 { 2132 {
2099 for (; n < (unsigned int)i; n++) 2133 for (; n < (unsigned int)i; n++)
2100 { 2134 {
2101 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr); 2135 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")); 2136 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) 2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2104 { 2138 {
2105 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2106 break; 2140 break;
2107 } 2141 }
2108 } 2142 }
2109 } 2143 }
2110 if (n > (int)(sizeof(TermWin.parent) 2144
2111 / sizeof(TermWin.parent[0]))) 2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2112 { 2146 {
2113 D_X((stderr, "InheritPixmap Turning off")); 2147 D_X ((stderr, "InheritPixmap Turning off"));
2114 XSetWindowBackground(display->display, TermWin.parent[0], 2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2115 PixColors[Color_fg]);
2116 XSetWindowBackground(display->display, TermWin.vt, 2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2117 PixColors[Color_bg]);
2118 am_transparent = 0; 2150 am_transparent = 0;
2119 /* XXX: also turn off Opt_transparent? */ 2151 /* XXX: also turn off Opt_transparent? */
2120 } 2152 }
2121 else 2153 else
2122 { 2154 {
2155#if WAIT_FOR_WM
2123 /* wait (an arbitrary period) for the WM to do its thing 2156 /* wait (an arbitrary period) for the WM to do its thing
2124 * needed for fvwm2.2.2 (and before?) */ 2157 * 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); 2158 sleep (1);
2133# endif 2159#endif
2134 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2135 for (n = 0; n < (unsigned int)i; n++) 2161 for (n = 0; n < (unsigned int)i; n++)
2136 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n], 2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2137 ParentRelative); 2163
2138 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2139 ParentRelative);
2140 am_transparent = 1; 2165 am_transparent = 1;
2141 } 2166 }
2167
2142 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2143 TermWin.parent[i] = None; 2169 TermWin.parent[i] = None;
2144 } 2170 }
2171
2145 return pchanged; 2172 return pchanged;
2146} 2173}
2147#endif 2174#endif
2148 2175
2149/*}}} */ 2176/*}}} */
2177
2178bool
2179rxvt_term::cmd_parse ()
2180{
2181 bool flag = false;
2182 unicode_t ch = NOCHAR;
2183 unsigned char *seq_begin; // remember start of esc-sequence here
2184
2185 for (;;)
2186 {
2187 if (ch == NOCHAR)
2188 {
2189 seq_begin = cmdbuf_ptr;
2190 ch = next_char ();
2191 }
2192
2193 if (ch == NOCHAR) // TODO: improve
2194 break;
2195
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
2197 {
2198 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false;
2201 int nlines = 0;
2202 unicode_t *str = buf;
2203
2204 *str++ = ch;
2205
2206 for (;;)
2207 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r'))
2212 break;
2213
2214 *str++ = ch;
2215
2216 if (ch == '\n')
2217 {
2218 nlines++;
2219 refresh_count++;
2220
2221 if (! (Options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2223 {
2224 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR;
2227 break;
2228 }
2229
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1)
2232 {
2233 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0;
2235 str = buf;
2236 }
2237 }
2238
2239 if (str >= buf + UBUFSIZ)
2240 {
2241 ch = NOCHAR;
2242 break;
2243 }
2244 }
2245
2246 scr_add_lines (buf, nlines, str - buf);
2247
2248 /*
2249 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */
2257 if (refreshnow)
2258 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++;
2261
2262 scr_refresh (refresh_type);
2263 }
2264
2265 }
2266 else
2267 {
2268 try
2269 {
2270 process_nonprinting (ch);
2271 }
2272 catch (const class out_of_input &o)
2273 {
2274 // we ran out of input, retry later
2275 cmdbuf_ptr = seq_begin;
2276 break;
2277 }
2278
2279 ch = NOCHAR;
2280 }
2281 }
2282
2283 return flag;
2284}
2285
2286// read the next character
2287unicode_t
2288rxvt_term::next_char ()
2289{
2290 while (cmdbuf_ptr < cmdbuf_endp)
2291 {
2292 // assume 7-bit to be ascii ALWAYS
2293 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2294 return *cmdbuf_ptr++;
2295
2296 wchar_t wc;
2297 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2298
2299 if (len == (size_t)-2)
2300 {
2301 // the mbstate stores incomplete sequences. didn't know this :/
2302 cmdbuf_ptr = cmdbuf_endp;
2303 break;
2304 }
2305
2306 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308
2309 // assume wchar == unicode
2310 cmdbuf_ptr += len;
2311 return wc;
2312 }
2313
2314 return NOCHAR;
2315}
2316
2317/* rxvt_cmd_getc () - Return next input character */
2318/*
2319 * Return the next input character after first passing any keyboard input
2320 * to the command.
2321 */
2322unicode_t
2323rxvt_term::cmd_getc ()
2324{
2325 unicode_t c = next_char ();
2326
2327 if (c == NOCHAR)
2328 throw out_of_input;
2329
2330 return c;
2331}
2150 2332
2151/*{{{ print pipe */ 2333/*{{{ print pipe */
2152/*----------------------------------------------------------------------*/ 2334/*----------------------------------------------------------------------*/
2153#ifdef PRINTPIPE 2335#ifdef PRINTPIPE
2154FILE * 2336FILE *
2155rxvt_term::popen_printer () 2337rxvt_term::popen_printer ()
2156{ 2338{
2157 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2339 FILE *stream = popen (rs[Rs_print_pipe], "w");
2158 2340
2159 if (stream == NULL) 2341 if (stream == NULL)
2160 rxvt_print_error("can't open printer pipe"); 2342 rxvt_warn ("can't open printer pipe, not printing.\n");
2343
2161 return stream; 2344 return stream;
2162} 2345}
2163 2346
2164int 2347int
2165rxvt_term::pclose_printer (FILE *stream) 2348rxvt_term::pclose_printer (FILE *stream)
2166{ 2349{
2167 fflush (stream); 2350 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); 2351 return pclose (stream);
2174# endif
2175} 2352}
2176 2353
2177/* 2354/*
2178 * simulate attached vt100 printer 2355 * simulate attached vt100 printer
2179 */ 2356 */
2180void 2357void
2181rxvt_term::process_print_pipe () 2358rxvt_term::process_print_pipe ()
2182{ 2359{
2183 int done; 2360 int done;
2184 FILE *fd; 2361 FILE *fd;
2185 2362
2186 if ((fd = popen_printer ()) == NULL) 2363 if ((fd = popen_printer ()) == NULL)
2187 return; 2364 return;
2188 2365
2189 /* 2366 /*
2190 * Send all input to the printer until either ESC[4i or ESC[?4i 2367 * Send all input to the printer until either ESC[4i or ESC[?4i
2191 * is received. 2368 * is received.
2192 */ 2369 */
2193 for (done = 0; !done;) 2370 for (done = 0; !done;)
2194 { 2371 {
2195 unsigned char buf[8]; 2372 unsigned char buf[8];
2196 unsigned char ch; 2373 unicode_t ch;
2197 unsigned int i, len; 2374 unsigned int i, len;
2198 2375
2199 if ((ch = cmd_getc ()) != C0_ESC) 2376 if ((ch = cmd_getc ()) != C0_ESC)
2200 { 2377 {
2201 if (putc(ch, fd) == EOF) 2378 if (putc (ch, fd) == EOF)
2202 break; /* done = 1 */ 2379 break; /* done = 1 */
2203 } 2380 }
2204 else 2381 else
2205 { 2382 {
2206 len = 0; 2383 len = 0;
… …
2217 { 2394 {
2218 if ((buf[len++] = cmd_getc ()) == 'i') 2395 if ((buf[len++] = cmd_getc ()) == 'i')
2219 break; /* done = 1 */ 2396 break; /* done = 1 */
2220 } 2397 }
2221 } 2398 }
2399
2222 for (i = 0; i < len; i++) 2400 for (i = 0; i < len; i++)
2223 if (putc(buf[i], fd) == EOF) 2401 if (putc (buf[i], fd) == EOF)
2224 { 2402 {
2225 done = 1; 2403 done = 1;
2226 break; 2404 break;
2227 } 2405 }
2228 } 2406 }
2229 } 2407 }
2408
2230 pclose_printer (fd); 2409 pclose_printer (fd);
2231} 2410}
2232#endif /* PRINTPIPE */ 2411#endif /* PRINTPIPE */
2233/*}}} */ 2412/*}}} */
2234 2413
2235/* *INDENT-OFF* */ 2414/* *INDENT-OFF* */
2236enum { 2415enum {
2237 C1_40 = 0x40, 2416 C1_40 = 0x40,
2238 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2417 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, 2418 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, 2419 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 2420 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2242}; 2421};
2243/* *INDENT-ON* */ 2422/* *INDENT-ON* */
2244 2423
2245/*{{{ process non-printing single characters */ 2424/*{{{ process non-printing single characters */
2246void 2425void
2247rxvt_term::process_nonprinting (unsigned char ch) 2426rxvt_term::process_nonprinting (unicode_t ch)
2248{ 2427{
2249 switch (ch) 2428 switch (ch)
2250 { 2429 {
2430 case C0_ESC:
2431 process_escape_seq ();
2432 break;
2251 case C0_ENQ: /* terminal Status */ 2433 case C0_ENQ: /* terminal Status */
2252 if (rs[Rs_answerbackstring]) 2434 if (rs[Rs_answerbackstring])
2253 tt_write(
2254 (const unsigned char *)rs[Rs_answerbackstring], 2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2255 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2436 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2256 else 2437 else
2257 tt_write((unsigned char *)VT100_ANS, 2438 tt_write ((unsigned char *)VT100_ANS,
2258 (unsigned int)STRLEN(VT100_ANS)); 2439 (unsigned int)STRLEN (VT100_ANS));
2259 break; 2440 break;
2260 case C0_BEL: /* bell */ 2441 case C0_BEL: /* bell */
2261 scr_bell (); 2442 scr_bell ();
2262 break; 2443 break;
2263 case C0_BS: /* backspace */ 2444 case C0_BS: /* backspace */
… …
2278 scr_charset_choose (1); 2459 scr_charset_choose (1);
2279 break; 2460 break;
2280 case C0_SI: /* shift in - acs */ 2461 case C0_SI: /* shift in - acs */
2281 scr_charset_choose (0); 2462 scr_charset_choose (0);
2282 break; 2463 break;
2464
2465 // 8-bit controls
2466 case 0x90: /* DCS */
2467 process_dcs_seq ();
2468 break;
2469 case 0x9b: /* CSI */
2470 process_csi_seq ();
2471 break;
2472 case 0x9d: /* CSI */
2473 process_osc_seq ();
2474 break;
2283 } 2475 }
2284} 2476}
2285/*}}} */ 2477/*}}} */
2286 2478
2287 2479
2288/*{{{ process VT52 escape sequences */ 2480/*{{{ process VT52 escape sequences */
2289void 2481void
2290rxvt_term::process_escape_vt52 (unsigned char ch) 2482rxvt_term::process_escape_vt52 (unicode_t ch)
2291{ 2483{
2292 int row, col; 2484 int row, col;
2293 2485
2294 switch (ch) 2486 switch (ch)
2295 { 2487 {
… …
2325 row = cmd_getc () - ' '; 2517 row = cmd_getc () - ' ';
2326 col = cmd_getc () - ' '; 2518 col = cmd_getc () - ' ';
2327 scr_gotorc (row, col, 0); 2519 scr_gotorc (row, col, 0);
2328 break; 2520 break;
2329 case 'Z': /* identify the terminal type */ 2521 case 'Z': /* identify the terminal type */
2330 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2522 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2331 break; 2523 break;
2332 case '<': /* turn off VT52 mode */ 2524 case '<': /* turn off VT52 mode */
2333 PrivMode(0, PrivMode_vt52); 2525 PrivMode (0, PrivMode_vt52);
2334 break; 2526 break;
2335 case 'F': /* use special graphics character set */ 2527 case 'F': /* use special graphics character set */
2336 case 'G': /* use regular character set */ 2528 case 'G': /* use regular character set */
2337 /* unimplemented */ 2529 /* unimplemented */
2338 break; 2530 break;
… …
2347 2539
2348/*{{{ process escape sequences */ 2540/*{{{ process escape sequences */
2349void 2541void
2350rxvt_term::process_escape_seq () 2542rxvt_term::process_escape_seq ()
2351{ 2543{
2352 unsigned char ch = cmd_getc (); 2544 unicode_t ch = cmd_getc ();
2353 2545
2354 if (PrivateModes & PrivMode_vt52) 2546 if (PrivateModes & PrivMode_vt52)
2355 { 2547 {
2356 process_escape_vt52 (ch); 2548 process_escape_vt52 (ch);
2357 return; 2549 return;
… …
2374 scr_charset_set (2, (unsigned int)cmd_getc ()); 2566 scr_charset_set (2, (unsigned int)cmd_getc ());
2375 break; 2567 break;
2376 case '+': 2568 case '+':
2377 scr_charset_set (3, (unsigned int)cmd_getc ()); 2569 scr_charset_set (3, (unsigned int)cmd_getc ());
2378 break; 2570 break;
2379#ifdef MULTICHAR_SET
2380 case '$':
2381 scr_charset_set (-2, (unsigned int)cmd_getc ());
2382 break;
2383#endif
2384#ifndef NO_FRILLS 2571#ifndef NO_FRILLS
2385 case '6': 2572 case '6':
2386 scr_backindex (); 2573 scr_backindex ();
2387 break; 2574 break;
2388#endif 2575#endif
… …
2397 scr_forwardindex (); 2584 scr_forwardindex ();
2398 break; 2585 break;
2399#endif 2586#endif
2400 case '=': 2587 case '=':
2401 case '>': 2588 case '>':
2402 PrivMode((ch == '='), PrivMode_aplKP); 2589 PrivMode ((ch == '='), PrivMode_aplKP);
2403 break; 2590 break;
2404 2591
2405 case C1_40: 2592 case C1_40:
2406 cmd_getc (); 2593 cmd_getc ();
2407 break; 2594 break;
… …
2410 break; 2597 break;
2411 2598
2412 /* 8.3.87: NEXT LINE */ 2599 /* 8.3.87: NEXT LINE */
2413 case C1_NEL: /* ESC E */ 2600 case C1_NEL: /* ESC E */
2414 { 2601 {
2415 uint32_t nlcr[] = { '\n', '\r' }; 2602 unicode_t nlcr[] = { L'\n', L'\r' };
2416 scr_add_lines (nlcr, 1, 2); 2603 scr_add_lines (nlcr, 1, 2);
2417 } 2604 }
2418 break; 2605 break;
2419 2606
2420 /* kidnapped escape sequence: Should be 8.3.48 */ 2607 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2431 case C1_RI: /* ESC M */ 2618 case C1_RI: /* ESC M */
2432 scr_index (DN); 2619 scr_index (DN);
2433 break; 2620 break;
2434 2621
2435 /* 8.3.142: SINGLE-SHIFT TWO */ 2622 /* 8.3.142: SINGLE-SHIFT TWO */
2436 /*case C1_SS2: scr_single_shift (2); break; */ 2623 /*case C1_SS2: scr_single_shift (2); break; */
2437 2624
2438 /* 8.3.143: SINGLE-SHIFT THREE */ 2625 /* 8.3.143: SINGLE-SHIFT THREE */
2439 /*case C1_SS3: scr_single_shift (3); break; */ 2626 /*case C1_SS3: scr_single_shift (3); break; */
2440 2627
2441 /* 8.3.27: DEVICE CONTROL STRING */ 2628 /* 8.3.27: DEVICE CONTROL STRING */
2442 case C1_DCS: /* ESC P */ 2629 case C1_DCS: /* ESC P */
2443 process_dcs_seq (); 2630 process_dcs_seq ();
2444 break; 2631 break;
2445 2632
2446 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2633 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2447 case C1_SCI: /* ESC Z */ 2634 case C1_SCI: /* ESC Z */
2448 tt_write((const unsigned char *)ESCZ_ANSWER, 2635 tt_write ((const unsigned char *)ESCZ_ANSWER,
2449 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2636 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2450 break; /* steal obsolete ESC [ c */ 2637 break; /* steal obsolete ESC [ c */
2451 2638
2452 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2639 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2453 case C1_CSI: /* ESC [ */ 2640 case C1_CSI: /* ESC [ */
2454 process_csi_seq (); 2641 process_csi_seq ();
… …
2459 process_osc_seq (); 2646 process_osc_seq ();
2460 break; 2647 break;
2461 2648
2462 /* 8.3.106: RESET TO INITIAL STATE */ 2649 /* 8.3.106: RESET TO INITIAL STATE */
2463 case 'c': 2650 case 'c':
2651 mbstate.reset ();
2464 scr_poweron (); 2652 scr_poweron ();
2465 scrollbar_show (1); 2653 scrollbar_show (1);
2466 break; 2654 break;
2467 2655
2468 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2656 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2494 2682
2495#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2683#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2496 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2684 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2497 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2685 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2498#define get_byte_array_bit(array, bit) \ 2686#define get_byte_array_bit(array, bit) \
2499 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2687 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2500 2688
2501const unsigned char csi_defaults[] = 2689const unsigned char csi_defaults[] =
2502 { 2690 {
2503 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2691 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, */ 2692 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, */ 2693 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, [, \, ], ^, _, */ 2694 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, */ 2695 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, */ 2696 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, */ 2697 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, {, |, }, ~, */ 2698 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2511 }; 2699 };
2512/* *INDENT-ON* */ 2700/* *INDENT-ON* */
2513 2701
2514void 2702void
2515rxvt_term::process_csi_seq () 2703rxvt_term::process_csi_seq ()
2516{ 2704{
2517 unsigned char ch, priv, i; 2705 unicode_t ch, priv, i;
2518 unsigned int nargs, p; 2706 unsigned int nargs, p;
2519 int n, ndef; 2707 int n, ndef;
2520 int arg[ESC_ARGS]; 2708 int arg[ESC_ARGS];
2521 2709
2522 for (nargs = ESC_ARGS; nargs > 0;) 2710 for (nargs = ESC_ARGS; nargs > 0;)
2523 arg[--nargs] = 0; 2711 arg[--nargs] = 0;
2524 2712
2525 priv = 0; 2713 priv = 0;
… …
2527 if (ch >= '<' && ch <= '?') 2715 if (ch >= '<' && ch <= '?')
2528 { /* '<' '=' '>' '?' */ 2716 { /* '<' '=' '>' '?' */
2529 priv = ch; 2717 priv = ch;
2530 ch = cmd_getc (); 2718 ch = cmd_getc ();
2531 } 2719 }
2720
2532 /* read any numerical arguments */ 2721 /* read any numerical arguments */
2533 for (n = -1; ch < CSI_ICH; ) 2722 for (n = -1; ch < CSI_ICH; )
2534 { 2723 {
2535 if (isdigit(ch)) 2724 if (isdigit (ch))
2536 { 2725 {
2537 if (n < 0) 2726 if (n < 0)
2538 n = ch - '0'; 2727 n = ch - '0';
2539 else 2728 else
2540 n = n * 10 + ch - '0'; 2729 n = n * 10 + ch - '0';
… …
2543 { 2732 {
2544 if (nargs < ESC_ARGS) 2733 if (nargs < ESC_ARGS)
2545 arg[nargs++] = n; 2734 arg[nargs++] = n;
2546 n = -1; 2735 n = -1;
2547 } 2736 }
2548 else if (ch == '\b') 2737 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); 2738 process_nonprinting (ch);
2560 } 2739
2561 ch = cmd_getc (); 2740 ch = cmd_getc ();
2562 } 2741 }
2563 2742
2564 if (ch > CSI_7F) 2743 if (ch > CSI_7F)
2565 return; 2744 return;
2566 2745
2567 if (nargs < ESC_ARGS) 2746 if (nargs < ESC_ARGS)
2568 arg[nargs++] = n; 2747 arg[nargs++] = n;
2569 2748
2570 i = ch - CSI_ICH; 2749 i = ch - CSI_ICH;
2571 ndef = get_byte_array_bit(csi_defaults, i); 2750 ndef = get_byte_array_bit (csi_defaults, i);
2572 for (p = 0; p < nargs; p++) 2751 for (p = 0; p < nargs; p++)
2573 if (arg[p] == -1) 2752 if (arg[p] == -1)
2574 arg[p] = ndef; 2753 arg[p] = ndef;
2575 2754
2576#ifdef DEBUG_CMD 2755#ifdef DEBUG_CMD
2577 fprintf(stderr, "CSI "); 2756 fprintf (stderr, "CSI ");
2578 for (p = 0; p < nargs; p++) 2757 for (p = 0; p < nargs; p++)
2579 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2758 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2580 fprintf(stderr, "%c\n", ch); 2759 fprintf (stderr, "%c\n", ch);
2581#endif 2760#endif
2582 2761
2583 /* 2762 /*
2584 * private mode handling 2763 * private mode handling
2585 */ 2764 */
… …
2587 { 2766 {
2588 switch (priv) 2767 switch (priv)
2589 { 2768 {
2590 case '>': 2769 case '>':
2591 if (ch == CSI_DA) /* secondary device attributes */ 2770 if (ch == CSI_DA) /* secondary device attributes */
2592 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2771 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2593 break; 2772 break;
2594 case '?': 2773 case '?':
2595 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2774 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2596 process_terminal_mode (ch, priv, nargs, arg); 2775 process_terminal_mode (ch, priv, nargs, arg);
2597 break; 2776 break;
… …
2600 } 2779 }
2601 2780
2602 switch (ch) 2781 switch (ch)
2603 { 2782 {
2604 /* 2783 /*
2605 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2784 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2606 */ 2785 */
2607#ifdef PRINTPIPE 2786#ifdef PRINTPIPE
2608 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2787 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2609 switch (arg[0]) 2788 switch (arg[0])
2610 { 2789 {
… …
2706 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2885 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2707 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2708 break; 2887 break;
2709 2888
2710 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2711 tt_write((const unsigned char *)VT100_ANS, 2890 tt_write ((const unsigned char *)VT100_ANS,
2712 (unsigned int)(sizeof(VT100_ANS) - 1)); 2891 (unsigned int) (sizeof (VT100_ANS) - 1));
2713 break; 2892 break;
2714 2893
2715 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2716 process_sgr_mode (nargs, arg); 2895 process_sgr_mode (nargs, arg);
2717 break; 2896 break;
2718 2897
2719 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2898 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2720 switch (arg[0]) 2899 switch (arg[0])
2721 { 2900 {
2722 case 5: /* DSR requested */ 2901 case 5: /* DSR requested */
2723 tt_printf("\033[0n"); 2902 tt_printf ("\033[0n");
2724 break; 2903 break;
2725 case 6: /* CPR requested */ 2904 case 6: /* CPR requested */
2726 scr_report_position (); 2905 scr_report_position ();
2727 break; 2906 break;
2728#if defined (ENABLE_DISPLAY_ANSWER)
2729 case 7: /* unofficial extension */ 2907 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure)
2730 tt_printf("%-.250s\n", rs[Rs_display_name]); 2909 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2731 break; 2910 break;
2732#endif
2733 case 8: /* unofficial extension */ 2911 case 8: /* unofficial extension */
2734 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2735 break; 2913 break;
2736 } 2914 }
2737 break; 2915 break;
2738 2916
2739 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2917 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2806 break; 2984 break;
2807#endif 2985#endif
2808 2986
2809 case CSI_78: /* DECREQTPARM */ 2987 case CSI_78: /* DECREQTPARM */
2810 if (arg[0] == 0 || arg[0] == 1) 2988 if (arg[0] == 0 || arg[0] == 1)
2811 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2989 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2812 /* FALLTHROUGH */ 2990 break;
2813 2991
2814 default: 2992 default:
2815 break; 2993 break;
2816 } 2994 }
2817} 2995}
… …
2820#ifndef NO_FRILLS 2998#ifndef NO_FRILLS
2821/* ARGSUSED */ 2999/* ARGSUSED */
2822void 3000void
2823rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3001rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2824{ 3002{
2825 int x, y; 3003 int x, y;
2826#if 0
2827 char *s;
2828#endif
2829 XWindowAttributes wattr; 3004 XWindowAttributes wattr;
2830 Window wdummy; 3005 Window wdummy;
2831 3006
2832 if (nargs == 0) 3007 if (nargs == 0)
2833 return; 3008 return;
3009
2834 switch (args[0]) 3010 switch (args[0])
2835 { 3011 {
2836 /* 3012 /*
2837 * commands 3013 * commands
2838 */ 3014 */
2839 case 1: /* deiconify window */ 3015 case 1: /* deiconify window */
2840 XMapWindow(display->display, TermWin.parent[0]); 3016 XMapWindow (display->display, TermWin.parent[0]);
2841 break; 3017 break;
2842 case 2: /* iconify window */ 3018 case 2: /* iconify window */
2843 XIconifyWindow(display->display, TermWin.parent[0], 3019 XIconifyWindow (display->display, TermWin.parent[0],
2844 DefaultScreen(display->display)); 3020 DefaultScreen (display->display));
2845 break; 3021 break;
2846 case 3: /* set position (pixels) */ 3022 case 3: /* set position (pixels) */
2847 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]); 3023 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2848 break; 3024 break;
2849 case 4: /* set size (pixels) */ 3025 case 4: /* set size (pixels) */
2850 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3026 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2851 break; 3027 break;
2852 case 5: /* raise window */ 3028 case 5: /* raise window */
2853 XRaiseWindow(display->display, TermWin.parent[0]); 3029 XRaiseWindow (display->display, TermWin.parent[0]);
2854 break; 3030 break;
2855 case 6: /* lower window */ 3031 case 6: /* lower window */
2856 XLowerWindow(display->display, TermWin.parent[0]); 3032 XLowerWindow (display->display, TermWin.parent[0]);
2857 break; 3033 break;
2858 case 7: /* refresh window */ 3034 case 7: /* refresh window */
2859 scr_touch (true); 3035 scr_touch (true);
2860 break; 3036 break;
2861 case 8: /* set size (chars) */ 3037 case 8: /* set size (chars) */
2862 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2863 (unsigned int)(args[1] * TermWin.fheight)); 3039 (unsigned int) (args[1] * TermWin.fheight));
2864 break; 3040 break;
3041
3042 //case 9: NYI, TODO, restore maximized window or maximize window
2865 default: 3043 default:
2866 if (args[0] >= 24) /* set height (chars) */ 3044 if (args[0] >= 24) /* set height (chars) */
2867 set_widthheight ((unsigned int)TermWin.width, 3045 set_widthheight ((unsigned int)TermWin.width,
2868 (unsigned int)(args[1] * TermWin.fheight)); 3046 (unsigned int) (args[1] * TermWin.fheight));
2869 break; 3047 break;
3048
3049
2870 /* 3050 /*
2871 * reports - some output format copied from XTerm 3051 * reports - some output format copied from XTerm
2872 */ 3052 */
2873 case 11: /* report window state */ 3053 case 11: /* report window state */
2874 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2875 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2876 break; 3056 break;
2877 case 13: /* report window position */ 3057 case 13: /* report window position */
2878 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2879 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root, 3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2880 -wattr.border_width, -wattr.border_width, 3060 -wattr.border_width, -wattr.border_width,
2881 &x, &y, &wdummy); 3061 &x, &y, &wdummy);
2882 tt_printf("\033[3;%d;%dt", x, y); 3062 tt_printf ("\033[3;%d;%dt", x, y);
2883 break; 3063 break;
2884 case 14: /* report window size (pixels) */ 3064 case 14: /* report window size (pixels) */
2885 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2886 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2887 break; 3067 break;
2888 case 18: /* report window size (chars) */ 3068 case 18: /* report text area size (chars) */
2889 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2890 break; 3070 break;
2891#if 0 /* XXX: currently disabled due to security concerns */ 3071 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3073 break;
2892 case 20: /* report icon label */ 3074 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 {
3077 char *s;
2893 XGetIconName(display->display, TermWin.parent[0], &s); 3078 XGetIconName (display->display, TermWin.parent[0], &s);
2894 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3080 }
2895 break; 3081 break;
2896 case 21: /* report window title */ 3082 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 {
3085 char *s;
2897 XFetchName(display->display, TermWin.parent[0], &s); 3086 XFetchName (display->display, TermWin.parent[0], &s);
2898 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3088 }
2899 break; 3089 break;
2900#endif
2901
2902 } 3090 }
2903} 3091}
2904#endif 3092#endif
2905 3093
2906/*----------------------------------------------------------------------*/ 3094/*----------------------------------------------------------------------*/
2907/* 3095/*
2908 * get input up until STRING TERMINATOR (or BEL) 3096 * get input up until STRING TERMINATOR (or BEL)
2909 * ends_how is terminator used. returned input must be free()d 3097 * ends_how is terminator used. returned input must be free ()d
2910 */ 3098 */
2911unsigned char * 3099unsigned char *
2912rxvt_term::get_to_st (unsigned char *ends_how) 3100rxvt_term::get_to_st (unicode_t &ends_how)
2913{ 3101{
2914 int seen_esc = 0; /* seen escape? */ 3102 int seen_esc = 0; /* seen escape? */
2915 unsigned int n = 0; 3103 unsigned int n = 0;
2916 unsigned char *s; 3104 unsigned char *s;
3105 unicode_t ch;
2917 unsigned char ch, string[STRING_MAX]; 3106 unsigned char string[STRING_MAX];
2918 3107
2919 for (; (ch = cmd_getc ());) 3108 while ((ch = cmd_getc ()))
2920 { 3109 {
2921 if (ch == C0_BEL 3110 if (ch == C0_BEL || ch == CHAR_ST)
2922 || ch == CHAR_ST 3111 break;
3112
3113 if (seen_esc)
2923 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3114 if (ch == 0x5c) /* 7bit ST */
2924 break; 3115 break;
3116 else
3117 return NULL;
3118
2925 if (ch == C0_ESC) 3119 if (ch == C0_ESC)
2926 { 3120 {
2927 seen_esc = 1; 3121 seen_esc = 1;
2928 continue; 3122 continue;
2929 } 3123 }
2930 else if (ch == '\t') 3124 else if (ch == '\t')
2931 ch = ' '; /* translate '\t' to space */ 3125 ch = ' '; /* translate '\t' to space */
2932 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d))
2933 return NULL; /* other control character - exit */ 3127 return NULL; /* other control character - exit */
3128
2934 if (n < sizeof(string) - 1) 3129 if (n >= sizeof (string) - 1)
3130 // stop at some sane length
3131 return NULL;
3132
2935 string[n++] = ch; 3133 string[n++] = ch;
2936 seen_esc = 0; 3134 seen_esc = 0;
2937 } 3135 }
3136
2938 string[n++] = '\0'; 3137 string[n++] = '\0';
3138
2939 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2940 return NULL; 3140 return NULL;
3141
2941 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3142 ends_how = (ch == 0x5c ? C0_ESC : ch);
2942 STRNCPY(s, string, n); 3143 STRNCPY (s, string, n);
2943 return s; 3144 return s;
2944} 3145}
2945 3146
2946/*----------------------------------------------------------------------*/ 3147/*----------------------------------------------------------------------*/
2947/* 3148/*
2948 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2949 */ 3150 */
2950void 3151void
2951rxvt_term::process_dcs_seq () 3152rxvt_term::process_dcs_seq ()
2952{ 3153{
2953 unsigned char eh, *s; 3154 unsigned char *s;
3155 unicode_t eh;
3156
2954 /* 3157 /*
2955 * Not handled yet 3158 * Not handled yet
2956 */ 3159 */
2957 s = get_to_st (&eh); 3160 s = get_to_st (eh);
2958 if (s) 3161 if (s)
2959 free(s); 3162 free (s);
3163
2960 return; 3164 return;
2961} 3165}
2962 3166
2963/*----------------------------------------------------------------------*/ 3167/*----------------------------------------------------------------------*/
2964/* 3168/*
2965 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3169 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2966 */ 3170 */
2967void 3171void
2968rxvt_term::process_osc_seq () 3172rxvt_term::process_osc_seq ()
2969{ 3173{
2970 unsigned char ch, eh, *s; 3174 unicode_t ch, eh;
2971 int arg; 3175 int arg;
2972 3176
2973 ch = cmd_getc (); 3177 ch = cmd_getc ();
2974 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3178 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2975 arg = arg * 10 + (ch - '0'); 3179 arg = arg * 10 + (ch - '0');
2976 3180
2977 if (ch == ';') 3181 if (ch == ';')
2978 { 3182 {
2979 s = get_to_st (&eh); 3183 unsigned char *s = get_to_st (eh);
3184
2980 if (s) 3185 if (s)
2981 { 3186 {
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); 3187 process_xterm_seq (arg, (char *)s, eh);
2994 free(s); 3188 free (s);
3189 }
3190 }
3191}
3192
3193void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{
3196 if (str[0] == '?' && !str[1])
3197 {
3198 if (Options & Opt_insecure)
2995 } 3199 {
3200 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
2996 } 3204 }
3205 else
3206 set_window_color (color, str);
2997} 3207}
3208
2998/* 3209/*
2999 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3000 * 0 = change iconName/title 3211 * 0 = change iconName/title
3001 * 1 = change iconName 3212 * 1 = change iconName
3002 * 2 = change title 3213 * 2 = change title
3003 * 4 = change color 3214 * 4 = change color
3215 * 10 = change fg color
3216 * 11 = change bg color
3004 * 12 = change text color 3217 * 12 = change text color
3005 * 13 = change mouse foreground color 3218 * 13 = change mouse foreground color
3006 * 17 = change highlight character colour 3219 * 17 = change highlight character colour
3007 * 18 = change bold character color 3220 * 18 = change bold character color
3008 * 19 = change underlined character color 3221 * 19 = change underlined character color
3009 * 46 = change logfile (not implemented) 3222 * 46 = change logfile (not implemented)
3010 * 50 = change font 3223 * 50 = change font
3011 * 3224 *
3012 * rxvt extensions: 3225 * rxvt extensions:
3013 * 10 = menu (may change in future)
3014 * 20 = bg pixmap 3226 * 20 = bg pixmap
3015 * 39 = change default fg color 3227 * 39 = change default fg color
3016 * 49 = change default bg color 3228 * 49 = change default bg color
3017 * 55 = dump scrollback buffer and all of screen 3229 * 55 = dump scrollback buffer and all of screen
3230 * 701 = change locale
3231 * 702 = find font
3232 * 703 = menu
3018 */ 3233 */
3019void 3234void
3020rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3235rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3021{ 3236{
3022 int changed = 0; 3237 int changed = 0;
3023 int color; 3238 int color;
3024 char *buf, *name; 3239 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1];
3025 3241
3026 assert(str != NULL); 3242 assert (str != NULL);
3027 switch (op) 3243 switch (op)
3028 { 3244 {
3029 case XTerm_name: 3245 case XTerm_name:
3030 set_title (str); 3246 set_title (str);
3031 /* FALLTHROUGH */ 3247 /* FALLTHROUGH */
3032 case XTerm_iconName: 3248 case XTerm_iconName:
3033 set_iconName (str); 3249 set_icon_name (str);
3034 break; 3250 break;
3035 case XTerm_title: 3251 case XTerm_title:
3036 set_title (str); 3252 set_title (str);
3037 break; 3253 break;
3254 case XTerm_property:
3255 if (str[0] == '?')
3256 {
3257 Atom prop = XInternAtom (display->display, str + 1, True);
3258 Atom actual_type;
3259 int actual_format;
3260 unsigned long nitems;
3261 unsigned long bytes_after;
3262 unsigned char *value = 0;
3263 const char *str = "";
3264
3265 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None
3271 && actual_format == 8)
3272 str = (const char *)(value);
3273
3274 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3275
3276 XFree (value);
3277 }
3278 else
3279 {
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281
3282 if (eq)
3283 {
3284 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0],
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 }
3290 else
3291 XDeleteProperty (display->display, TermWin.parent[0],
3292 display->atom (str));
3293 }
3294 break;
3295
3038 case XTerm_Color: 3296 case XTerm_Color:
3039 for (buf = (char *)str; buf && *buf;) 3297 for (buf = (char *)str; buf && *buf;)
3040 { 3298 {
3041 if ((name = STRCHR(buf, ';')) == NULL) 3299 if ((name = STRCHR (buf, ';')) == NULL)
3042 break; 3300 break;
3301
3043 *name++ = '\0'; 3302 *name++ = '\0';
3044 color = atoi(buf); 3303 color = atoi (buf);
3304
3045 if (color < 0 || color >= TOTAL_COLORS) 3305 if (color < 0 || color >= TOTAL_COLORS)
3046 break; 3306 break;
3307
3047 if ((buf = STRCHR(name, ';')) != NULL) 3308 if ((buf = STRCHR (name, ';')) != NULL)
3048 *buf++ = '\0'; 3309 *buf++ = '\0';
3310
3311 if (name[0] == '?' && !name[1])
3312 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 }
3320 else
3049 set_window_color (color + minCOLOR, name); 3321 set_window_color (color + minCOLOR, name);
3050 } 3322 }
3323 break;
3324 case XTerm_Color00:
3325 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3326 break;
3327 case XTerm_Color01:
3328 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3051 break; 3329 break;
3052#ifndef NO_CURSORCOLOR 3330#ifndef NO_CURSORCOLOR
3053 case XTerm_Color_cursor: 3331 case XTerm_Color_cursor:
3054 set_window_color (Color_cursor, str); 3332 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3055 break; 3333 break;
3056#endif 3334#endif
3057 case XTerm_Color_pointer: 3335 case XTerm_Color_pointer_fg:
3058 set_window_color (Color_pointer, str); 3336 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3337 break;
3338 case XTerm_Color_pointer_bg:
3339 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3059 break; 3340 break;
3060#ifndef NO_BOLD_UNDERLINE_REVERSE 3341#ifndef NO_BOLD_UNDERLINE_REVERSE
3061 case XTerm_Color_BD: 3342 case XTerm_Color_BD:
3062 set_window_color (Color_BD, str); 3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3063 break; 3344 break;
3064 case XTerm_Color_UL: 3345 case XTerm_Color_UL:
3065 set_window_color (Color_UL, str); 3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3066 break; 3347 break;
3067 case XTerm_Color_RV: 3348 case XTerm_Color_RV:
3068 set_window_color (Color_RV, str); 3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3069 break; 3350 break;
3070#endif 3351#endif
3071 3352
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: 3353 case XTerm_Pixmap:
3079 if (*str != ';') 3354 if (*str != ';')
3080 { 3355 {
3081#if XPM_BACKGROUND 3356#if XPM_BACKGROUND
3082 scale_pixmap (""); /* reset to default scaling */ 3357 scale_pixmap (""); /* reset to default scaling */
3083 set_bgPixmap (str); /* change pixmap */ 3358 set_bgPixmap (str); /* change pixmap */
3084#endif 3359#endif
3085 scr_touch (true); 3360 scr_touch (true);
3086 } 3361 }
3087 while ((str = STRCHR(str, ';')) != NULL) 3362 while ((str = STRCHR (str, ';')) != NULL)
3088 { 3363 {
3089 str++; 3364 str++;
3090#if XPM_BACKGROUND 3365#if XPM_BACKGROUND
3091 changed += scale_pixmap (str); 3366 changed += scale_pixmap (str);
3092#endif 3367#endif
… …
3105 set_window_color (Color_fg, str); 3380 set_window_color (Color_fg, str);
3106 break; 3381 break;
3107 case XTerm_restoreBG: 3382 case XTerm_restoreBG:
3108 set_window_color (Color_bg, str); 3383 set_window_color (Color_bg, str);
3109 break; 3384 break;
3385
3110 case XTerm_logfile: 3386 case XTerm_logfile:
3387 // TODO, when secure mode?
3111 break; 3388 break;
3389
3112 case XTerm_font: 3390 case XTerm_font:
3391 if (query)
3392 {
3393 if (Options & Opt_insecure)
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3395 TermWin.fontset->fontdesc
3396 ? TermWin.fontset->fontdesc
3397 : "",
3398 resp);
3399 }
3400 else
3113 change_font (0, str); 3401 change_font (str);
3402 break;
3403
3404#ifndef NO_FRILLS
3405 case XTerm_locale:
3406 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3410 }
3411 else
3412 {
3413 set_locale (str);
3414# ifdef USE_XIM
3415 im_cb ();
3416# endif
3417 }
3418 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif
3429
3430#ifdef MENUBAR
3431 case XTerm_Menu:
3432 if (Options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3114 break; 3434 break;
3435#endif
3115#if 0 3436#if 0
3116 case XTerm_dumpscreen: /* no error notices */ 3437 case XTerm_dumpscreen: /* no error notices */
3117 { 3438 {
3118 int fd; 3439 int fd;
3119 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3440 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3120 { 3441 {
3121 scr_dump (fd); 3442 scr_dump (fd);
3122 close(fd); 3443 close (fd);
3123 } 3444 }
3124 } 3445 }
3125 break; 3446 break;
3126#endif 3447#endif
3127
3128 } 3448 }
3129} 3449}
3130/*----------------------------------------------------------------------*/ 3450/*----------------------------------------------------------------------*/
3131 3451
3132/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3452/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3140 * so no need for fancy checking 3460 * so no need for fancy checking
3141 */ 3461 */
3142int 3462int
3143rxvt_term::privcases (int mode, unsigned long bit) 3463rxvt_term::privcases (int mode, unsigned long bit)
3144{ 3464{
3145 int state; 3465 int state;
3146 3466
3147 if (mode == 's') 3467 if (mode == 's')
3148 { 3468 {
3149 SavedModes |= (PrivateModes & bit); 3469 SavedModes |= (PrivateModes & bit);
3150 return -1; 3470 return -1;
… …
3152 else 3472 else
3153 { 3473 {
3154 if (mode == 'r') 3474 if (mode == 'r')
3155 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3156 else 3476 else
3157 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3158 PrivMode(state, bit); 3478 PrivMode (state, bit);
3159 } 3479 }
3480
3160 return state; 3481 return state;
3161} 3482}
3162 3483
3163/* we're not using priv _yet_ */ 3484/* we're not using priv _yet_ */
3164void 3485void
3165rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3486rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3166{ 3487{
3167 unsigned int i, j; 3488 unsigned int i, j;
3168 int state; 3489 int state;
3490
3169 static const struct 3491 static const struct
3170 { 3492 {
3171 const int argval; 3493 const int argval;
3172 const unsigned long bit; 3494 const unsigned long bit;
3173 } 3495 }
3496
3174 argtopriv[] = { 3497 argtopriv[] = {
3175 { 1, PrivMode_aplCUR }, 3498 { 1, PrivMode_aplCUR },
3176 { 2, PrivMode_vt52 }, 3499 { 2, PrivMode_vt52 },
3177 { 3, PrivMode_132 }, 3500 { 3, PrivMode_132 },
3178 { 4, PrivMode_smoothScroll }, 3501 { 4, PrivMode_smoothScroll },
… …
3184 { menuBar_esc, PrivMode_menuBar }, 3507 { menuBar_esc, PrivMode_menuBar },
3185#endif 3508#endif
3186#ifdef scrollBar_esc 3509#ifdef scrollBar_esc
3187 { scrollBar_esc, PrivMode_scrollBar }, 3510 { scrollBar_esc, PrivMode_scrollBar },
3188#endif 3511#endif
3512 // 18, 19 printing-related
3189 { 25, PrivMode_VisibleCursor }, 3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3190 { 35, PrivMode_ShiftKeys }, 3515 { 35, PrivMode_ShiftKeys }, // rxvt extension
3191 { 40, PrivMode_132OK }, 3516 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI
3519 // 46 start logging
3192 { 47, PrivMode_Screen }, 3520 { 47, PrivMode_Screen },
3193 { 66, PrivMode_aplKP }, 3521 { 66, PrivMode_aplKP },
3194#ifndef NO_BACKSPACE_KEY 3522#ifndef NO_BACKSPACE_KEY
3195 { 67, PrivMode_BackSpace }, 3523 { 67, PrivMode_BackSpace },
3196#endif 3524#endif
3197 { 1000, PrivMode_MouseX11 }, 3525 { 1000, PrivMode_MouseX11 },
3526 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3527 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3528 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3198 { 1010, PrivMode_TtyOutputInh }, 3529 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3199 { 1011, PrivMode_Keypress }, 3530 { 1011, PrivMode_Keypress }, // rxvt extension
3531 // 1035 enable modifiers for alt, numlock NYI
3532 // 1036 send ESC for meta keys NYI
3533 // 1037 send DEL for keypad delete NYI
3200 { 1047, PrivMode_Screen }, 3534 { 1047, PrivMode_Screen },
3535 // 1048 save and restore cursor
3201 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3536 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3537 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3202 }; 3538 };
3203 3539
3204 if (nargs == 0) 3540 if (nargs == 0)
3205 return; 3541 return;
3206 3542
… …
3213 for (i = 0; i < nargs; i++) 3549 for (i = 0; i < nargs; i++)
3214 { 3550 {
3215 state = -1; 3551 state = -1;
3216 3552
3217 /* basic handling */ 3553 /* basic handling */
3218 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3554 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3219 if (argtopriv[j].argval == arg[i]) 3555 if (argtopriv[j].argval == arg[i])
3220 { 3556 {
3221 state = privcases (mode, argtopriv[j].bit); 3557 state = privcases (mode, argtopriv[j].bit);
3222 break; 3558 break;
3223 } 3559 }
3224 3560
3225 /* extra handling for values with state unkept */ 3561 /* extra handling for values with state unkept */
3226 if (state == -1)
3227 switch (arg[i]) 3562 switch (arg[i])
3228 { 3563 {
3229 case 1048: /* alternative cursor save */ 3564 case 1048: /* alternative cursor save */
3565 if (Options & Opt_secondaryScreen)
3230 if (mode == 0) 3566 if (mode == 0)
3231 scr_cursor (RESTORE); 3567 scr_cursor (RESTORE);
3232 else if (mode == 1) 3568 else if (mode == 1)
3233 scr_cursor (SAVE); 3569 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; 3570 break;
3571 }
3572
3573 if (state >= 0)
3574 /* extra handling for values with valid 0 or 1 state */
3575 switch (arg[i])
3576 {
3577 /* case 1: - application cursor keys */
3578 case 2: /* VT52 mode */
3579 /* oddball mode. should be set regardless of set/reset
3580 * parameter. Return from VT52 mode with an ESC < from
3581 * within VT52 mode
3582 */
3583 PrivMode (1, PrivMode_vt52);
3584 break;
3250 case 3: /* 80/132 */ 3585 case 3: /* 80/132 */
3251 if (PrivateModes & PrivMode_132OK) 3586 if (PrivateModes & PrivMode_132OK)
3252 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3253 (unsigned int)TermWin.height);
3254 break; 3588 break;
3255 case 4: /* smooth scrolling */ 3589 case 4: /* smooth scrolling */
3256 if (state) 3590 if (state)
3257 Options &= ~Opt_jumpScroll; 3591 Options &= ~Opt_jumpScroll;
3258 else 3592 else
3259 Options |= Opt_jumpScroll; 3593 Options |= Opt_jumpScroll;
3260 break; 3594 break;
3261 case 5: /* reverse video */ 3595 case 5: /* reverse video */
3262 scr_rvideo_mode (state); 3596 scr_rvideo_mode (state);
3263 break; 3597 break;
3264 case 6: /* relative/absolute origins */ 3598 case 6: /* relative/absolute origins */
3265 scr_relative_origin (state); 3599 scr_relative_origin (state);
3266 break; 3600 break;
3267 case 7: /* autowrap */ 3601 case 7: /* autowrap */
3268 scr_autowrap (state); 3602 scr_autowrap (state);
3269 break; 3603 break;
3270 /* case 8: - auto repeat, can't do on a per window basis */ 3604 /* case 8: - auto repeat, can't do on a per window basis */
3271 case 9: /* X10 mouse reporting */ 3605 case 9: /* X10 mouse reporting */
3272 if (state) /* orthogonal */ 3606 if (state) /* orthogonal */
3273 PrivateModes &= ~(PrivMode_MouseX11); 3607 PrivateModes &= ~PrivMode_MouseX11;
3274 break; 3608 break;
3275#ifdef menuBar_esc 3609#ifdef menuBar_esc
3276 case menuBar_esc: 3610 case menuBar_esc:
3277#ifdef MENUBAR 3611#ifdef MENUBAR
3278 map_menuBar (state); 3612 map_menuBar (state);
3279#endif 3613#endif
3280 break; 3614 break;
3281#endif 3615#endif
3282#ifdef scrollBar_esc 3616#ifdef scrollBar_esc
3283 case scrollBar_esc: 3617 case scrollBar_esc:
3284 if (scrollbar_mapping (state)) 3618 if (scrollbar_mapping (state))
3285 { 3619 {
3286 resize_all_windows (0, 0, 0); 3620 resize_all_windows (0, 0, 0);
3287 scr_touch (true); 3621 scr_touch (true);
3288 } 3622 }
3289 break; 3623 break;
3290#endif 3624#endif
3291 case 25: /* visible/invisible cursor */ 3625 case 25: /* visible/invisible cursor */
3292 scr_cursor_visible (state); 3626 scr_cursor_visible (state);
3293 break; 3627 break;
3294 /* case 35: - shift keys */ 3628 /* case 35: - shift keys */
3295 /* case 40: - 80 <--> 132 mode */ 3629 /* case 40: - 80 <--> 132 mode */
3296 case 47: /* secondary screen */ 3630 case 47: /* secondary screen */
3297 scr_change_screen (state); 3631 scr_change_screen (state);
3298 break; 3632 break;
3299 /* case 66: - application key pad */ 3633 /* case 66: - application key pad */
3300 /* case 67: - backspace key */ 3634 /* case 67: - backspace key */
3301 case 1000: /* X11 mouse reporting */ 3635 case 1000: /* X11 mouse reporting */
3302 if (state) /* orthogonal */ 3636 if (state) /* orthogonal */
3303 PrivateModes &= ~(PrivMode_MouseX10); 3637 PrivateModes &= ~PrivMode_MouseX10;
3304 break; 3638 break;
3305#if 0 3639#if 0
3306 case 1001: 3640 case 1001:
3307 break; /* X11 mouse highlighting */ 3641 break; /* X11 mouse highlighting */
3308#endif 3642#endif
3309 case 1010: /* scroll to bottom on TTY output inhibit */ 3643 case 1010: /* scroll to bottom on TTY output inhibit */
3310 if (state) 3644 if (state)
3311 Options &= ~Opt_scrollTtyOutput; 3645 Options &= ~Opt_scrollTtyOutput;
3312 else 3646 else
3313 Options |= Opt_scrollTtyOutput; 3647 Options |= Opt_scrollTtyOutput;
3314 break; 3648 break;
3315 case 1011: /* scroll to bottom on key press */ 3649 case 1011: /* scroll to bottom on key press */
3316 if (state) 3650 if (state)
3317 Options |= Opt_scrollTtyKeypress; 3651 Options |= Opt_scrollTtyKeypress;
3318 else 3652 else
3319 Options &= ~Opt_scrollTtyKeypress; 3653 Options &= ~Opt_scrollTtyKeypress;
3320 break; 3654 break;
3321 case 1047: /* secondary screen w/ clearing */ 3655 case 1047: /* secondary screen w/ clearing last */
3322 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3656 if (Options & Opt_secondaryScreen)
3323 if (current_screen != PRIMARY) 3657 if (current_screen != PRIMARY)
3324 scr_erase_screen (2); 3658 scr_erase_screen (2);
3325 scr_change_screen (state); 3659 scr_change_screen (state);
3326 /* FALLTHROUGH */
3327 default:
3328 break; 3660 break;
3661 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen)
3664 if (current_screen != PRIMARY)
3665 scr_erase_screen (2);
3666 break;
3667 default:
3668 break;
3329 } 3669 }
3330 } 3670 }
3331} 3671}
3332/*}}} */ 3672/*}}} */
3333 3673
3334/*{{{ process sgr sequences */ 3674/*{{{ process sgr sequences */
3335void 3675void
3336rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3676rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3337{ 3677{
3338 unsigned int i; 3678 unsigned int i;
3339 short rendset; 3679 short rendset;
3340 int rendstyle; 3680 int rendstyle;
3341 3681
3342 if (nargs == 0) 3682 if (nargs == 0)
3343 { 3683 {
3344 scr_rendition (0, ~RS_None); 3684 scr_rendition (0, ~RS_None);
3345 return; 3685 return;
3346 } 3686 }
3687
3347 for (i = 0; i < nargs; i++) 3688 for (i = 0; i < nargs; i++)
3348 { 3689 {
3349 rendset = -1; 3690 rendset = -1;
3350 switch (arg[i]) 3691 switch (arg[i])
3351 { 3692 {
… …
3362 rendset = 1, rendstyle = RS_Blink; 3703 rendset = 1, rendstyle = RS_Blink;
3363 break; 3704 break;
3364 case 7: 3705 case 7:
3365 rendset = 1, rendstyle = RS_RVid; 3706 rendset = 1, rendstyle = RS_RVid;
3366 break; 3707 break;
3708 case 8:
3709 // invisible. NYI
3710 break;
3367 case 22: 3711 case 22:
3368 rendset = 0, rendstyle = RS_Bold; 3712 rendset = 0, rendstyle = RS_Bold;
3369 break; 3713 break;
3370 case 24: 3714 case 24:
3371 rendset = 0, rendstyle = RS_Uline; 3715 rendset = 0, rendstyle = RS_Uline;
… …
3374 rendset = 0, rendstyle = RS_Blink; 3718 rendset = 0, rendstyle = RS_Blink;
3375 break; 3719 break;
3376 case 27: 3720 case 27:
3377 rendset = 0, rendstyle = RS_RVid; 3721 rendset = 0, rendstyle = RS_RVid;
3378 break; 3722 break;
3723 case 28:
3724 // visible. NYI
3725 break;
3379 } 3726 }
3727
3380 if (rendset != -1) 3728 if (rendset != -1)
3381 { 3729 {
3382 scr_rendition (rendset, rendstyle); 3730 scr_rendition (rendset, rendstyle);
3383 continue; /* for(;i;) */ 3731 continue; /* for (;i;) */
3384 } 3732 }
3385 3733
3386 switch (arg[i]) 3734 switch (arg[i])
3387 { 3735 {
3388 case 30: 3736 case 30:
… …
3391 case 33: 3739 case 33:
3392 case 34: 3740 case 34:
3393 case 35: 3741 case 35:
3394 case 36: 3742 case 36:
3395 case 37: 3743 case 37:
3396 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3397 Color_fg);
3398 break; 3745 break;
3399#ifdef TTY_256COLOR 3746#ifdef TTY_256COLOR
3400 case 38: 3747 case 38:
3401 if (nargs > i + 2 && arg[i + 1] == 5) 3748 if (nargs > i + 2 && arg[i + 1] == 5)
3402 { 3749 {
3403 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3404 Color_fg);
3405 i += 2; 3751 i += 2;
3406 } 3752 }
3407 break; 3753 break;
3408#endif 3754#endif
3409 case 39: /* default fg */ 3755 case 39: /* default fg */
… …
3416 case 43: 3762 case 43:
3417 case 44: 3763 case 44:
3418 case 45: 3764 case 45:
3419 case 46: 3765 case 46:
3420 case 47: 3766 case 47:
3421 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3422 Color_bg);
3423 break; 3768 break;
3424#ifdef TTY_256COLOR 3769#ifdef TTY_256COLOR
3425 case 48: 3770 case 48:
3426 if (nargs > i + 2 && arg[i + 1] == 5) 3771 if (nargs > i + 2 && arg[i + 1] == 5)
3427 { 3772 {
3428 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3429 Color_bg);
3430 i += 2; 3774 i += 2;
3431 } 3775 }
3432 break; 3776 break;
3433#endif 3777#endif
3434 case 49: /* default bg */ 3778 case 49: /* default bg */
… …
3442 case 93: 3786 case 93:
3443 case 94: 3787 case 94:
3444 case 95: 3788 case 95:
3445 case 96: 3789 case 96:
3446 case 97: 3790 case 97:
3447 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3448 Color_fg); 3792 Color_fg);
3449 break; 3793 break;
3450 case 100: 3794 case 100:
3451 case 101: /* set bright bg color */ 3795 case 101: /* set bright bg color */
3452 case 102: 3796 case 102:
3453 case 103: 3797 case 103:
3454 case 104: 3798 case 104:
3455 case 105: 3799 case 105:
3456 case 106: 3800 case 106:
3457 case 107: 3801 case 107:
3458 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3459 Color_bg); 3803 Color_bg);
3460 break; 3804 break;
3461#endif 3805#endif
3462 3806
3463 } 3807 }
… …
3467 3811
3468/*{{{ process Rob Nation's own graphics mode sequences */ 3812/*{{{ process Rob Nation's own graphics mode sequences */
3469void 3813void
3470rxvt_term::process_graphics () 3814rxvt_term::process_graphics ()
3471{ 3815{
3472 unsigned char ch, cmd = cmd_getc (); 3816 unicode_t ch, cmd = cmd_getc ();
3473 3817
3474#ifndef RXVT_GRAPHICS
3475 if (cmd == 'Q') 3818 if (cmd == 'Q')
3476 { /* query graphics */ 3819 { /* query graphics */
3477 tt_printf("\033G0\n"); /* no graphics */ 3820 tt_printf ("\033G0\n"); /* no graphics */
3478 return; 3821 return;
3479 } 3822 }
3480 /* swallow other graphics sequences until terminating ':' */ 3823 /* swallow other graphics sequences until terminating ':' */
3481 do 3824 do
3482 ch = cmd_getc (); 3825 ch = cmd_getc ();
3483 while (ch != ':'); 3826 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} 3827}
3530/*}}} */ 3828/*}}} */
3531 3829
3532/* ------------------------------------------------------------------------- */ 3830/* ------------------------------------------------------------------------- */
3533 3831
3534/* 3832/*
3535 * Send printf() formatted output to the command. 3833 * Send printf () formatted output to the command.
3536 * Only use for small amounts of data. 3834 * Only use for small amounts of data.
3537 */ 3835 */
3538void 3836void
3539rxvt_term::tt_printf (const char *fmt,...) 3837rxvt_term::tt_printf (const char *fmt,...)
3540{ 3838{

Diff Legend

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