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.39 by pcg, Mon Feb 9 07:15:46 2004 UTC vs.
Revision 1.49 by pcg, Sat Feb 21 22:14:00 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.
… …
55 56
56/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
57void 58void
58rxvt_term::lookup_key (XKeyEvent &ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
59{ 60{
60 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
61 unsigned int newlen; 62 unsigned int newlen;
62 KeySym keysym; 63 KeySym keysym;
63#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
65#endif 66#endif
66 int valid_keysym; 67 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
68 69
69 /* 70 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
… …
77 meta = (ev.state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (numlock_state || (ev.state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 numlock_state = (ev.state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 84 }
84 85
85 kbuf[0] = 0; 86 kbuf[0] = 0;
86 87
87#ifdef USE_XIM 88#ifdef USE_XIM
88 if (Input_Context) 89 if (Input_Context)
89 { 90 {
90 Status status_return; 91 Status status_return;
91 92
92#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
96 else 97 else
97#endif 98#endif
98
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
… …
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 { 114 {
115 wkbuf[len] = 0; 115 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 117 if (len < 0)
118 len = 0; 118 len = 0;
… …
120 else 120 else
121 len = 0; 121 len = 0;
122 } 122 }
123 123
124 valid_keysym = status_return == XLookupKeySym 124 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 125 || status_return == XLookupBoth;
126 } 126 }
127 else 127 else
128#endif 128#endif
129
130 { 129 {
131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 130 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 131 valid_keysym = keysym != NoSymbol;
133 } 132 }
134 133
135 if (valid_keysym) 134 if (valid_keysym)
136 { 135 {
137 /* for some backwards compatibility */ 136 /* for some backwards compatibility */
… …
162 { 161 {
163#else 162#else
164 if (IS_SCROLL_MOD) 163 if (IS_SCROLL_MOD)
165 { 164 {
166#endif 165#endif
167 int lnsppg; 166 int lnsppg;
168 167
169#ifdef PAGING_CONTEXT_LINES 168#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 170#else
172 lnsppg = TermWin.nrow * 4 / 5; 171 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 209 scr_move_to (1, 0);
211 return; 210 return;
212 } 211 }
213 } 212 }
214#endif 213#endif
215
216 } 214 }
217 215
218 if (shft) 216 if (shft)
219 { 217 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 218 /* Shift + F1 - F10 generates F11 - F20 */
… …
253 { 251 {
254 greek_mode = !greek_mode; 252 greek_mode = !greek_mode;
255 if (greek_mode) 253 if (greek_mode)
256 { 254 {
257 xterm_seq (XTerm_title, 255 xterm_seq (XTerm_title,
258 (greek_getmode() == GREEK_ELOT928 256 (greek_getmode () == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset(); 258 greek_reset ();
261 } 259 }
262 else 260 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return; 262 return;
265 } 263 }
266#endif 264#endif
267 265
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 266 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 { 267 {
270#ifdef KEYSYM_RESOURCE 268#ifdef KEYSYM_RESOURCE
271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 270 {
273 unsigned int l; 271 unsigned int l;
274 const unsigned char *kbuf0; 272 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC; 273 const unsigned char ch = C0_ESC;
276 274
… …
286 tt_write (kbuf0, l); 284 tt_write (kbuf0, l);
287 return; 285 return;
288 } 286 }
289 else 287 else
290#endif 288#endif
291
292 { 289 {
293 newlen = 1; 290 newlen = 1;
294 switch (keysym) 291 switch (keysym)
295 { 292 {
296#ifndef NO_BACKSPACE_KEY 293#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 294 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 295 if (PrivateModes & PrivMode_HaveBackSpace)
299 { 296 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 297 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 298 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 299 kbuf[1] = '\0';
303 } 300 }
304 else 301 else
305 STRCPY(kbuf, key_backspace); 302 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET 303# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0) 304 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 { 305 {
309 int col, row; 306 int col, row;
310 307
311 newlen = STRLEN(kbuf); 308 newlen = STRLEN (kbuf);
312 col = screen.cur.col - 1; 309 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines; 310 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2(screen.rend[row][col])) 311 if (IS_MULTI2 (screen.rend[row][col]))
315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
316 } 313 }
317# endif 314# endif
318 break; 315 break;
319#endif 316#endif
320#ifndef NO_DELETE_KEY 317#ifndef NO_DELETE_KEY
321 case XK_Delete: 318 case XK_Delete:
322 STRCPY(kbuf, key_delete); 319 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET 320# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack) 321 if (Options & Opt_mc_hack)
325 { 322 {
326 int col, row; 323 int col, row;
327 324
328 newlen = STRLEN(kbuf); 325 newlen = STRLEN (kbuf);
329 col = screen.cur.col; 326 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines; 327 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col])) 328 if (IS_MULTI1 (screen.rend[row][col]))
332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
333 } 330 }
334# endif 331# endif
335 break; 332 break;
336#endif 333#endif
337 case XK_Tab: 334 case XK_Tab:
338 if (shft) 335 if (shft)
339 STRCPY(kbuf, "\033[Z"); 336 STRCPY (kbuf, "\033[Z");
340 else 337 else
341 { 338 {
342#ifdef CTRL_TAB_MAKES_META 339#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 340 if (ctrl)
344 meta = 1; 341 meta = 1;
… …
348 meta = 1; 345 meta = 1;
349#endif 346#endif
350 newlen = 0; 347 newlen = 0;
351 } 348 }
352 break; 349 break;
353
354 350
355#ifdef XK_KP_Left 351#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 352 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 353 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 354 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 355 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 356 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 357 {
362 STRCPY(kbuf, "\033OZ"); 358 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 359 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 360 break;
365 } 361 }
366 else 362 else
367 /* translate to std. cursor key */ 363 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 364 keysym = XK_Left + (keysym - XK_KP_Left);
… …
370#endif 366#endif
371 case XK_Up: /* "\033[A" */ 367 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 368 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 369 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 370 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 371 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 372 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 373 /* do Shift first */
378 if (shft) 374 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 375 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 376 else if (ctrl)
381 { 377 {
382 kbuf[1] = 'O'; 378 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 379 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 380 }
385 else if (PrivateModes & PrivMode_aplCUR) 381 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 382 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET 383#ifdef MULTICHAR_SET
388 //TODO: ?? 384 //TODO: ??
… …
392 388
393 col = screen.cur.col; 389 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines; 390 row = screen.cur.row + TermWin.saveLines;
395 m = 0; 391 m = 0;
396 if (keysym == XK_Right 392 if (keysym == XK_Right
397 && IS_MULTI1(screen.rend[row][col])) 393 && IS_MULTI1 (screen.rend[row][col]))
398 m = 1; 394 m = 1;
399 else if (keysym == XK_Left) 395 else if (keysym == XK_Left)
400 { 396 {
401 if (col > 0) 397 if (col > 0)
402 { 398 {
403 if (IS_MULTI2(screen.rend[row][col - 1])) 399 if (IS_MULTI2 (screen.rend[row][col - 1]))
404 m = 1; 400 m = 1;
405 } 401 }
406 else if (screen.cur.row > 0) 402 else if (screen.cur.row > 0)
407 { 403 {
408 col = screen.tlen[--row]; 404 col = screen.tlen[--row];
409 if (col == -1) 405 if (col == -1)
410 col = TermWin.ncol - 1; 406 col = TermWin.ncol - 1;
411 else 407 else
412 col--; 408 col--;
413 if (col > 0 409 if (col > 0
414 && IS_MULTI2(screen.rend[row][col])) 410 && IS_MULTI2 (screen.rend[row][col]))
415 m = 1; 411 m = 1;
416 } 412 }
417 } 413 }
418 if (m) 414 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
420 } 416 }
421#endif 417#endif
422 break; 418 break;
423 419
424#ifndef UNSHIFTED_SCROLLKEYS 420#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 421# ifdef XK_KP_Prior
426 case XK_KP_Prior: 422 case XK_KP_Prior:
427 /* allow shift to override */ 423 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 424 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
429 { 425 {
430 STRCPY(kbuf, "\033Oy"); 426 STRCPY (kbuf, "\033Oy");
431 break; 427 break;
432 } 428 }
433 /* FALLTHROUGH */ 429 /* FALLTHROUGH */
434# endif 430# endif
435 case XK_Prior: 431 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 432 STRCPY (kbuf, "\033[5~");
437 break; 433 break;
438# ifdef XK_KP_Next 434# ifdef XK_KP_Next
439 case XK_KP_Next: 435 case XK_KP_Next:
440 /* allow shift to override */ 436 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 437 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 { 438 {
443 STRCPY(kbuf, "\033Os"); 439 STRCPY (kbuf, "\033Os");
444 break; 440 break;
445 } 441 }
446 /* FALLTHROUGH */ 442 /* FALLTHROUGH */
447# endif 443# endif
448 case XK_Next: 444 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 445 STRCPY (kbuf, "\033[6~");
450 break; 446 break;
451#endif 447#endif
452 case XK_KP_Enter: 448 case XK_KP_Enter:
453 /* allow shift to override */ 449 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 450 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 { 451 {
456 STRCPY(kbuf, "\033OM"); 452 STRCPY (kbuf, "\033OM");
457 } 453 }
458 else 454 else
459 { 455 {
460 kbuf[0] = '\r'; 456 kbuf[0] = '\r';
461 kbuf[1] = '\0'; 457 kbuf[1] = '\0';
462 } 458 }
463 break; 459 break;
464 460
465#ifdef XK_KP_Begin 461#ifdef XK_KP_Begin
466 case XK_KP_Begin: 462 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 463 STRCPY (kbuf, "\033Ou");
468 break; 464 break;
469 465
470 case XK_KP_Insert: 466 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op"); 467 STRCPY (kbuf, "\033Op");
472 break; 468 break;
473 469
474 case XK_KP_Delete: 470 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On"); 471 STRCPY (kbuf, "\033On");
476 break; 472 break;
477#endif 473#endif
478 case XK_KP_F1: /* "\033OP" */ 474 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 475 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 476 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 477 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 478 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 479 kbuf[2] += (keysym - XK_KP_F1);
484 break; 480 break;
485 481
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 482 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 483 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 484 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 485 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 486 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 487 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 488 case XK_KP_0: /* "\033Op" : "0" */
… …
500 case XK_KP_8: /* "\033Ox" : "8" */ 496 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 497 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 498 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 499 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
504 { 500 {
505 STRCPY(kbuf, "\033Oj"); 501 STRCPY (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 502 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 503 }
508 else 504 else
509 { 505 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 506 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 507 kbuf[1] = '\0';
512 } 508 }
513 break; 509 break;
514 510
515 case XK_Find: 511 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 512 STRCPY (kbuf, "\033[1~");
517 break; 513 break;
518 case XK_Insert: 514 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 515 STRCPY (kbuf, "\033[2~");
520 break; 516 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 517#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 518 case DXK_Remove:
523 /* FALLTHROUGH */ 519 /* FALLTHROUGH */
524#endif 520#endif
525 case XK_Execute: 521 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 522 STRCPY (kbuf, "\033[3~");
527 break; 523 break;
528 case XK_Select: 524 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 525 STRCPY (kbuf, "\033[4~");
530 break; 526 break;
531#ifdef XK_KP_End 527#ifdef XK_KP_End
532 case XK_KP_End: 528 case XK_KP_End:
533 /* allow shift to override */ 529 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 530 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
535 { 531 {
536 STRCPY(kbuf, "\033Oq"); 532 STRCPY (kbuf, "\033Oq");
537 break; 533 break;
538 } 534 }
539 /* FALLTHROUGH */ 535 /* FALLTHROUGH */
540#endif 536#endif
541 case XK_End: 537 case XK_End:
542 STRCPY(kbuf, KS_END); 538 STRCPY (kbuf, KS_END);
543 break; 539 break;
544#ifdef XK_KP_Home 540#ifdef XK_KP_Home
545 case XK_KP_Home: 541 case XK_KP_Home:
546 /* allow shift to override */ 542 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 543 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
548 { 544 {
549 STRCPY(kbuf, "\033Ow"); 545 STRCPY (kbuf, "\033Ow");
550 break; 546 break;
551 } 547 }
552 /* FALLTHROUGH */ 548 /* FALLTHROUGH */
553#endif 549#endif
554 case XK_Home: 550 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 551 STRCPY (kbuf, KS_HOME);
556 break; 552 break;
557 553
558#define FKEY(n, fkey) \ 554#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 555 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 556
561 case XK_F1: /* "\033[11~" */ 557 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 558 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 559 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 560 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 561 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 562 FKEY (11, XK_F1);
567 break; 563 break;
568 case XK_F6: /* "\033[17~" */ 564 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 565 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 566 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 567 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 568 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 569 FKEY (17, XK_F6);
574 break; 570 break;
575 case XK_F11: /* "\033[23~" */ 571 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 572 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 573 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 574 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 575 FKEY (23, XK_F11);
580 break; 576 break;
581 case XK_F15: /* "\033[28~" */ 577 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 578 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 579 FKEY (28, XK_F15);
584 break; 580 break;
585 case XK_Help: /* "\033[28~" */ 581 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 582 FKEY (28, XK_Help);
587 break; 583 break;
588 case XK_Menu: /* "\033[29~" */ 584 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 585 FKEY (29, XK_Menu);
590 break; 586 break;
591 case XK_F17: /* "\033[31~" */ 587 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 588 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 589 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 590 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 601 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 602 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 603 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 604 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 605 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 606 FKEY (31, XK_F17);
611 break; 607 break;
612#undef FKEY 608#undef FKEY
613 default: 609 default:
614 newlen = 0; 610 newlen = 0;
615 break; 611 break;
616 } 612 }
617 if (newlen) 613 if (newlen)
618 len = STRLEN(kbuf); 614 len = STRLEN (kbuf);
619 } 615 }
620 /* 616 /*
621 * Pass meta for all function keys, if 'meta' option set 617 * Pass meta for all function keys, if 'meta' option set
622 */ 618 */
623#ifdef META8_OPTION 619#ifdef META8_OPTION
… …
644 meta = 0; 640 meta = 0;
645 } 641 }
646#endif 642#endif
647#ifdef GREEK_SUPPORT 643#ifdef GREEK_SUPPORT
648 if (greek_mode) 644 if (greek_mode)
649 len = greek_xlat(kbuf, len); 645 len = greek_xlat (kbuf, len);
650#endif 646#endif
651 /* nil */ ; 647 /* nil */ ;
652 } 648 }
653 } 649 }
654 650
… …
683#endif 679#endif
684 ) 680 )
685 { 681 {
686 const unsigned char ch = C0_ESC; 682 const unsigned char ch = C0_ESC;
687 683
688 tt_write(&ch, 1); 684 tt_write (&ch, 1);
689 } 685 }
690#ifdef DEBUG_CMD 686#ifdef DEBUG_CMD
691 if (debug_key) 687 if (debug_key)
692 { /* Display keyboard buffer contents */ 688 { /* Display keyboard buffer contents */
693 char *p; 689 char *p;
694 int i; 690 int i;
695 691
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 693 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 695 fprintf (stderr, "'\n");
700 } 696 }
701#endif /* DEBUG_CMD */ 697#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 698 tt_write (kbuf, (unsigned int)len);
703} 699}
704/*}}} */ 700/*}}} */
705 701
706#if (MENUBAR_MAX) 702#if (MENUBAR_MAX)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 704/* attempt to `write' count to the input buffer */
709unsigned int 705unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 706rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 707{
712 unsigned int n, s; 708 unsigned int n, s;
713 709
714 n = cmdbuf_ptr - cmdbuf_base; 710 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
716 if (n > 0 && s < count) 712 if (n > 0 && s < count)
717 { 713 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 714 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 716 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 717 cmdbuf_endp -= n;
722 s += n; 718 s += n;
723 } 719 }
724 if (count > s) 720 if (count > s)
725 { 721 {
726 rxvt_print_error("data loss: cmd_write too large"); 722 rxvt_print_error ("data loss: cmd_write too large");
727 count = s; 723 count = s;
728 } 724 }
729 for (; count--;) 725 for (; count--;)
730 *cmdbuf_endp++ = *str++; 726 *cmdbuf_endp++ = *str++;
731 return 0; 727 return 0;
… …
753 IMSendSpot (); 749 IMSendSpot ();
754#endif 750#endif
755 751
756 } 752 }
757 753
758 XFlush (display->display); 754 display->flush ();
759} 755}
760 756
761void 757void
762rxvt_term::check_cb (check_watcher &w) 758rxvt_term::check_cb (check_watcher &w)
763{ 759{
… …
869 if (ch == '\n') 865 if (ch == '\n')
870 { 866 {
871 nlines++; 867 nlines++;
872 refresh_count++; 868 refresh_count++;
873 869
874 if (!(Options & Opt_jumpScroll) 870 if (! (Options & Opt_jumpScroll)
875 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
876 { 872 {
877 refreshnow = true; 873 refreshnow = true;
878 flag = false; 874 flag = false;
879 ch = NOCHAR; 875 ch = NOCHAR;
… …
947 { 943 {
948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
949 return *cmdbuf_ptr++; 945 return *cmdbuf_ptr++;
950 946
951 wchar_t wc; 947 wchar_t wc;
952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
953 949
954 if (len == (size_t)-2) 950 if (len == (size_t)-2)
955 return NOCHAR; 951 return NOCHAR;
956 952
957 if (len == (size_t)-1) 953 if (len == (size_t)-1)
… …
963 } 959 }
964 960
965 return NOCHAR; 961 return NOCHAR;
966} 962}
967 963
968/* rxvt_cmd_getc() - Return next input character */ 964/* rxvt_cmd_getc () - Return next input character */
969/* 965/*
970 * Return the next input character after first passing any keyboard input 966 * Return the next input character after first passing any keyboard input
971 * to the command. 967 * to the command.
972 */ 968 */
973uint32_t 969uint32_t
… …
1001} 997}
1002 998
1003void 999void
1004rxvt_term::pointer_blank () 1000rxvt_term::pointer_blank ()
1005{ 1001{
1006 if (!(Options & Opt_pointerBlank)) 1002 if (! (Options & Opt_pointerBlank))
1007 return; 1003 return;
1008 1004
1009 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1005 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1010 XFlush (display->display); 1006 XFlush (display->display);
1011 1007
… …
1071#endif 1067#endif
1072 1068
1073 } 1069 }
1074 1070
1075#ifdef DEBUG_MOUSEREPORT 1071#ifdef DEBUG_MOUSEREPORT
1076 fprintf(stderr, "Mouse ["); 1072 fprintf (stderr, "Mouse [");
1077 if (key_state & 16) 1073 if (key_state & 16)
1078 fputc('C', stderr); 1074 fputc ('C', stderr);
1079 if (key_state & 4) 1075 if (key_state & 4)
1080 fputc('S', stderr); 1076 fputc ('S', stderr);
1081 if (key_state & 8) 1077 if (key_state & 8)
1082 fputc('A', stderr); 1078 fputc ('A', stderr);
1083 if (key_state & 32) 1079 if (key_state & 32)
1084 fputc('2', stderr); 1080 fputc ('2', stderr);
1085 fprintf(stderr, "]: <%d>, %d/%d\n", 1081 fprintf (stderr, "]: <%d>, %d/%d\n",
1086 button_number, 1082 button_number,
1087 x + 1, 1083 x + 1,
1088 y + 1); 1084 y + 1);
1089#else 1085#else
1090 tt_printf("\033[M%c%c%c", 1086 tt_printf ("\033[M%c%c%c",
1091 (32 + button_number + key_state), 1087 (32 + button_number + key_state),
1092 (32 + x + 1), 1088 (32 + x + 1),
1093 (32 + y + 1)); 1089 (32 + y + 1));
1094#endif 1090#endif
1095} 1091}
1096 1092
1097#ifdef USING_W11LIB 1093#ifdef USING_W11LIB
1098void 1094void
1099rxvt_W11_process_x_event(XEvent *ev) 1095rxvt_W11_process_x_event (XEvent *ev)
1100{ 1096{
1101 rxvt_t *r = rxvt_get_r(); 1097 rxvt_t *r = rxvt_get_r ();
1102 1098
1103 x_cb (*ev); 1099 x_cb (*ev);
1104} 1100}
1105#endif 1101#endif
1106 1102
… …
1189#endif 1185#endif
1190 1186
1191#ifdef DEBUG_X 1187#ifdef DEBUG_X
1192 struct timeval tp; 1188 struct timeval tp;
1193 struct tm *ltt; 1189 struct tm *ltt;
1194 (void)gettimeofday(&tp, NULL); 1190 (void)gettimeofday (&tp, NULL);
1195 ltt = localtime(&(tp.tv_sec)); 1191 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)); 1192 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1197#endif 1193#endif
1198 1194
1199 switch (ev.type) 1195 switch (ev.type)
1200 { 1196 {
1201 case KeyPress: 1197 case KeyPress:
… …
1203 break; 1199 break;
1204 1200
1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1206 case KeyRelease: 1202 case KeyRelease:
1207 { 1203 {
1208 if (!(ev.xkey.state & ControlMask)) 1204 if (! (ev.xkey.state & ControlMask))
1209 mouse_slip_wheel_speed = 0; 1205 mouse_slip_wheel_speed = 0;
1210 else 1206 else
1211 { 1207 {
1212 KeySym ks; 1208 KeySym ks;
1213 1209
1214 ks = XKeycodeToKeysym(display->display, ev.xkey.keycode, 0); 1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1215 if (ks == XK_Control_L || ks == XK_Control_R) 1211 if (ks == XK_Control_L || ks == XK_Control_R)
1216 mouse_slip_wheel_speed = 0; 1212 mouse_slip_wheel_speed = 0;
1217 } 1213 }
1218 break; 1214 break;
1219 } 1215 }
… …
1242 Atom ActualType; 1238 Atom ActualType;
1243 int ActualFormat; 1239 int ActualFormat;
1244 unsigned char *data; 1240 unsigned char *data;
1245 unsigned long Size, RemainingBytes; 1241 unsigned long Size, RemainingBytes;
1246 1242
1247 XGetWindowProperty(display->display, display->root, 1243 XGetWindowProperty (display->display, display->root,
1248 xa[XA_DNDSELECTION], 1244 xa[XA_DNDSELECTION],
1249 0L, 1000000L, 1245 0L, 1000000L,
1250 False, AnyPropertyType, 1246 False, AnyPropertyType,
1251 &ActualType, &ActualFormat, 1247 &ActualType, &ActualFormat,
1252 &Size, &RemainingBytes, 1248 &Size, &RemainingBytes,
1253 &data); 1249 &data);
1254 XChangeProperty(display->display, display->root, 1250 XChangeProperty (display->display, display->root,
1255 XA_CUT_BUFFER0, XA_STRING, 1251 XA_CUT_BUFFER0, XA_STRING,
1256 8, PropModeReplace, 1252 8, PropModeReplace,
1257 data, STRLEN(data)); 1253 data, STRLEN (data));
1258 selection_paste (display->root, XA_CUT_BUFFER0, True); 1254 selection_paste (display->root, XA_CUT_BUFFER0, True);
1259 XSetInputFocus(display->display, display->root, RevertToNone, CurrentTime); 1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1260 } 1256 }
1261#endif /* OFFIX_DND */ 1257#endif /* OFFIX_DND */
1262 break; 1258 break;
1263 1259
1264 case MappingNotify: 1260 case MappingNotify:
1265 XRefreshKeyboardMapping(&(ev.xmapping)); 1261 XRefreshKeyboardMapping (& (ev.xmapping));
1266 break; 1262 break;
1267 1263
1268 /* 1264 /*
1269 * XXX: this is not the _current_ arrangement 1265 * XXX: this is not the _current_ arrangement
1270 * Here's my conclusion: 1266 * Here's my conclusion:
… …
1295 { 1291 {
1296 TermWin.focus = 1; 1292 TermWin.focus = 1;
1297 want_refresh = 1; 1293 want_refresh = 1;
1298#ifdef USE_XIM 1294#ifdef USE_XIM
1299 if (Input_Context != NULL) 1295 if (Input_Context != NULL)
1300 XSetICFocus(Input_Context); 1296 XSetICFocus (Input_Context);
1301#endif 1297#endif
1302#ifdef CURSOR_BLINK 1298#ifdef CURSOR_BLINK
1303 if (Options & Opt_cursorBlink) 1299 if (Options & Opt_cursorBlink)
1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1305#endif 1301#endif
… …
1312 { 1308 {
1313 TermWin.focus = 0; 1309 TermWin.focus = 0;
1314 want_refresh = 1; 1310 want_refresh = 1;
1315#ifdef USE_XIM 1311#ifdef USE_XIM
1316 if (Input_Context != NULL) 1312 if (Input_Context != NULL)
1317 XUnsetICFocus(Input_Context); 1313 XUnsetICFocus (Input_Context);
1318#endif 1314#endif
1319#ifdef CURSOR_BLINK 1315#ifdef CURSOR_BLINK
1320 if (Options & Opt_cursorBlink) 1316 if (Options & Opt_cursorBlink)
1321 cursor_blink_ev.stop (); 1317 cursor_blink_ev.stop ();
1322 hidden_cursor = 0; 1318 hidden_cursor = 0;
… …
1332 1328
1333 do 1329 do
1334 { /* Wrap lots of configures into one */ 1330 { /* Wrap lots of configures into one */
1335 width = ev.xconfigure.width; 1331 width = ev.xconfigure.width;
1336 height = ev.xconfigure.height; 1332 height = ev.xconfigure.height;
1337 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1333 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1338 } 1334 }
1339 while (XCheckTypedWindowEvent(display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1340 1336
1341 if (szHint.width != width || szHint.height != height) 1337 if (szHint.width != width || szHint.height != height)
1342 { 1338 {
1343 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1339 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1344 resize_all_windows (width, height, 1); 1340 resize_all_windows (width, height, 1);
1345 } 1341 }
1346#ifdef DEBUG_SIZE 1342#ifdef DEBUG_SIZE
1347 else 1343 else
1348 { 1344 {
1349 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE ((stderr, "Size: Not resizing"));
1350 } 1346 }
1351#endif 1347#endif
1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1353 if (Options & Opt_transparent) 1349 if (Options & Opt_transparent)
1354 { 1350 {
… …
1360 1356
1361 } 1357 }
1362 break; 1358 break;
1363 1359
1364 case SelectionClear: 1360 case SelectionClear:
1365 selection_clear (); 1361 display->set_selection_owner (0);
1366 break; 1362 break;
1367 1363
1368 case SelectionNotify: 1364 case SelectionNotify:
1369 if (selection_wait == Sel_normal) 1365 if (selection_wait == Sel_normal)
1370 selection_paste (ev.xselection.requestor, 1366 selection_paste (ev.xselection.requestor,
… …
1385 case MapNotify: 1381 case MapNotify:
1386 TermWin.mapped = 1; 1382 TermWin.mapped = 1;
1387#ifdef TEXT_BLINK 1383#ifdef TEXT_BLINK
1388 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1389#endif 1385#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; 1386 break;
1397 1387
1398#ifdef TRANSPARENT 1388#ifdef TRANSPARENT
1399 case ReparentNotify: 1389 case ReparentNotify:
1400 rootwin_cb (ev); 1390 rootwin_cb (ev);
… …
1419 } 1409 }
1420 else 1410 else
1421 { 1411 {
1422 XEvent unused_event; 1412 XEvent unused_event;
1423 1413
1424 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1425 Expose, 1415 Expose,
1426 &unused_event)) ; 1416 &unused_event)) ;
1427 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1428 GraphicsExpose, 1418 GraphicsExpose,
1429 &unused_event)) ; 1419 &unused_event)) ;
1430 if (isScrollbarWindow(ev.xany.window)) 1420 if (isScrollbarWindow (ev.xany.window))
1431 { 1421 {
1432 scrollBar.setIdle(); 1422 scrollBar.setIdle ();
1433 scrollbar_show (0); 1423 scrollbar_show (0);
1434 } 1424 }
1435#ifdef MENUBAR 1425#ifdef MENUBAR
1436 if (menubar_visible () && isMenuBarWindow(ev.xany.window)) 1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1437 menubar_expose (); 1427 menubar_expose ();
1438#endif 1428#endif
1439#ifdef RXVT_GRAPHICS 1429#ifdef RXVT_GRAPHICS
1440 Gr_expose (ev.xany.window); 1430 Gr_expose (ev.xany.window);
1441#endif 1431#endif
… …
1447#ifdef POINTER_BLANK 1437#ifdef POINTER_BLANK
1448 if (hidden_pointer) 1438 if (hidden_pointer)
1449 pointer_unblank (); 1439 pointer_unblank ();
1450#endif 1440#endif
1451#if MENUBAR 1441#if MENUBAR
1452 if (isMenuBarWindow(ev.xany.window)) 1442 if (isMenuBarWindow (ev.xany.window))
1453 { 1443 {
1454 menubar_control (&(ev.xbutton)); 1444 menubar_control (& (ev.xbutton));
1455 break; 1445 break;
1456 } 1446 }
1457#endif 1447#endif
1458 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1459 break; 1449 break;
1460 1450
1461 if (ev.xany.window == TermWin.vt) 1451 if (ev.xany.window == TermWin.vt)
1462 { 1452 {
1463 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1464 { 1454 {
1465 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1466 ; 1456 ;
1467 1457
1468 XQueryPointer(display->display, TermWin.vt, 1458 XQueryPointer (display->display, TermWin.vt,
1469 &unused_root, &unused_child, 1459 &unused_root, &unused_child,
1470 &unused_root_x, &unused_root_y, 1460 &unused_root_x, &unused_root_y,
1471 &(ev.xbutton.x), &(ev.xbutton.y), 1461 & (ev.xbutton.x), & (ev.xbutton.y),
1472 &unused_mask); 1462 &unused_mask);
1473#ifdef MOUSE_THRESHOLD 1463#ifdef MOUSE_THRESHOLD
1474 /* deal with a `jumpy' mouse */ 1464 /* deal with a `jumpy' mouse */
1475 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1476 { 1466 {
1477#endif 1467#endif
1478 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1479 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1469 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1480#ifdef SELECTION_SCROLLING 1470#ifdef SELECTION_SCROLLING
1481 if (ev.xbutton.y < TermWin.int_bwidth 1471 if (ev.xbutton.y < TermWin.int_bwidth
1482 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1)) 1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1483 { 1473 {
1484 int dist; 1474 int dist;
1485 1475
1486 pending_scroll_selection=1; 1476 pending_scroll_selection=1;
1487 1477
… …
1509 { 1499 {
1510 scroll_selection_dir = DN; 1500 scroll_selection_dir = DN;
1511 dist = ev.xbutton.y - 1501 dist = ev.xbutton.y -
1512 (TermWin.int_bwidth + TermWin.height); 1502 (TermWin.int_bwidth + TermWin.height);
1513 } 1503 }
1514 scroll_selection_lines=(Pixel2Height(dist)/ 1504 scroll_selection_lines= (Pixel2Height (dist)/
1515 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1505 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1516 MIN_IT(scroll_selection_lines, 1506 MIN_IT (scroll_selection_lines,
1517 SELECTION_SCROLL_MAX_LINES); 1507 SELECTION_SCROLL_MAX_LINES);
1518 } 1508 }
1519 else 1509 else
1520 { 1510 {
1521 /* we are within the text window, so we 1511 /* we are within the text window, so we
… …
1529 } 1519 }
1530#endif 1520#endif
1531 1521
1532 } 1522 }
1533 } 1523 }
1534 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion()) 1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1535 { 1525 {
1536 while (XCheckTypedWindowEvent(display->display, scrollBar.win, 1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1537 MotionNotify, &ev)) ; 1527 MotionNotify, &ev)) ;
1538 XQueryPointer(display->display, scrollBar.win, 1528 XQueryPointer (display->display, scrollBar.win,
1539 &unused_root, &unused_child, 1529 &unused_root, &unused_child,
1540 &unused_root_x, &unused_root_y, 1530 &unused_root_x, &unused_root_y,
1541 &(ev.xbutton.x), &(ev.xbutton.y), 1531 & (ev.xbutton.x), & (ev.xbutton.y),
1542 &unused_mask); 1532 &unused_mask);
1543 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO, 1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1544 scrollbar_size()); 1534 scrollbar_size ());
1545 scr_refresh (refresh_type); 1535 scr_refresh (refresh_type);
1546 refresh_limit = 0; 1536 refresh_limit = 0;
1547 scrollbar_show (1); 1537 scrollbar_show (1);
1548 } 1538 }
1549 break; 1539 break;
1550 } 1540 }
1551} 1541}
1552 1542
1553#ifdef TRANSPARENT
1554void 1543void
1555rxvt_term::rootwin_cb (XEvent &ev) 1544rxvt_term::rootwin_cb (XEvent &ev)
1556{ 1545{
1557 SET_R (this); 1546 SET_R (this);
1558 SET_LOCALE (locale); 1547 SET_LOCALE (locale);
1559 1548
1560 if (ev.type == PropertyNotify) 1549 switch (ev.type)
1561 { 1550 {
1562 /* 1551 case PropertyNotify:
1552 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1553 {
1554 if (ev.xproperty.state == PropertyNewValue)
1555 selection_property (ev.xproperty.window, ev.xproperty.atom);
1556 break;
1557 }
1558#ifdef TRANSPARENT
1559 else
1560 {
1561 /*
1563 * if user used some Esetroot compatible prog to set the root bg, 1562 * if user used some Esetroot compatible prog to set the root bg,
1564 * use the property to determine the pixmap. We use it later on. 1563 * use the property to determine the pixmap. We use it later on.
1565 */ 1564 */
1566 if (xa[XA_XROOTPMAPID] == 0) 1565 if (xa[XA_XROOTPMAPID] == 0)
1567 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False); 1566 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1568 1567
1569 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1570 return; 1569 return;
1571 } 1570 }
1572 1571
1572 /* FALLTHROUGH */
1573 case ReparentNotify:
1573 if ((Options & Opt_transparent) && check_our_parents ()) 1574 if ((Options & Opt_transparent) && check_our_parents ())
1574 {
1575 if (am_transparent) 1575 if (am_transparent)
1576 want_full_refresh = 1; 1576 want_full_refresh = 1;
1577 } 1577 break;
1578}
1579#endif 1578#endif
1579 }
1580}
1580 1581
1581void 1582void
1582rxvt_term::button_press (const XButtonEvent &ev) 1583rxvt_term::button_press (const XButtonEvent &ev)
1583{ 1584{
1584 int reportmode = 0, clickintime; 1585 int reportmode = 0, clickintime;
1585 1586
1586 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1587 if (!bypass_keystate) 1588 if (!bypass_keystate)
1588 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1589 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1589 /* 1590 /*
1590 * VT window processing of button press 1591 * VT window processing of button press
1591 */ 1592 */
1592 if (ev.window == TermWin.vt) 1593 if (ev.window == TermWin.vt)
1593 { 1594 {
… …
1639 MEvent.clicks = 0; 1640 MEvent.clicks = 0;
1640 switch (ev.button) 1641 switch (ev.button)
1641 { 1642 {
1642 case Button1: 1643 case Button1:
1643 /* allow shift+left click to extend selection */ 1644 /* allow shift+left click to extend selection */
1644 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1645 { 1646 {
1646 if (MEvent.button == Button1 && clickintime) 1647 if (MEvent.button == Button1 && clickintime)
1647 selection_rotate (ev.x, ev.y); 1648 selection_rotate (ev.x, ev.y);
1648 else 1649 else
1649 selection_extend (ev.x, ev.y, 1); 1650 selection_extend (ev.x, ev.y, 1);
… …
1676 } 1677 }
1677 1678
1678 /* 1679 /*
1679 * Scrollbar window processing of button press 1680 * Scrollbar window processing of button press
1680 */ 1681 */
1681 if (isScrollbarWindow(ev.window)) 1682 if (isScrollbarWindow (ev.window))
1682 { 1683 {
1683 scrollBar.setIdle (); 1684 scrollBar.setIdle ();
1684 /* 1685 /*
1685 * Rxvt-style scrollbar: 1686 * Rxvt-style scrollbar:
1686 * move up if mouse is above slider 1687 * move up if mouse is above slider
… …
1698 * Mouse report disabled scrollbar: 1699 * Mouse report disabled scrollbar:
1699 * arrow buttons - send up/down 1700 * arrow buttons - send up/down
1700 * click on scrollbar - send pageup/down 1701 * click on scrollbar - send pageup/down
1701 */ 1702 */
1702 if ((scrollBar.style == R_SB_NEXT 1703 if ((scrollBar.style == R_SB_NEXT
1703 && scrollbarnext_upButton(ev.y)) 1704 && scrollbarnext_upButton (ev.y))
1704 || (scrollBar.style == R_SB_RXVT 1705 || (scrollBar.style == R_SB_RXVT
1705 && scrollbarrxvt_upButton(ev.y))) 1706 && scrollbarrxvt_upButton (ev.y)))
1706 tt_printf("\033[A"); 1707 tt_printf ("\033[A");
1707 else if ((scrollBar.style == R_SB_NEXT 1708 else if ((scrollBar.style == R_SB_NEXT
1708 && scrollbarnext_dnButton(ev.y)) 1709 && scrollbarnext_dnButton (ev.y))
1709 || (scrollBar.style == R_SB_RXVT 1710 || (scrollBar.style == R_SB_RXVT
1710 && scrollbarrxvt_dnButton(ev.y))) 1711 && scrollbarrxvt_dnButton (ev.y)))
1711 tt_printf("\033[B"); 1712 tt_printf ("\033[B");
1712 else 1713 else
1713 switch (ev.button) 1714 switch (ev.button)
1714 { 1715 {
1715 case Button2: 1716 case Button2:
1716 tt_printf("\014"); 1717 tt_printf ("\014");
1717 break; 1718 break;
1718 case Button1: 1719 case Button1:
1719 tt_printf("\033[6~"); 1720 tt_printf ("\033[6~");
1720 break; 1721 break;
1721 case Button3: 1722 case Button3:
1722 tt_printf("\033[5~"); 1723 tt_printf ("\033[5~");
1723 break; 1724 break;
1724 } 1725 }
1725 } 1726 }
1726 else 1727 else
1727#endif /* NO_SCROLLBAR_REPORT */ 1728#endif /* NO_SCROLLBAR_REPORT */
… …
1729 { 1730 {
1730 char upordown = 0; 1731 char upordown = 0;
1731 1732
1732 if (scrollBar.style == R_SB_NEXT) 1733 if (scrollBar.style == R_SB_NEXT)
1733 { 1734 {
1734 if (scrollbarnext_upButton(ev.y)) 1735 if (scrollbarnext_upButton (ev.y))
1735 upordown = -1; /* up */ 1736 upordown = -1; /* up */
1736 else if (scrollbarnext_dnButton(ev.y)) 1737 else if (scrollbarnext_dnButton (ev.y))
1737 upordown = 1; /* down */ 1738 upordown = 1; /* down */
1738 } 1739 }
1739 else if (scrollBar.style == R_SB_RXVT) 1740 else if (scrollBar.style == R_SB_RXVT)
1740 { 1741 {
1741 if (scrollbarrxvt_upButton(ev.y)) 1742 if (scrollbarrxvt_upButton (ev.y))
1742 upordown = -1; /* up */ 1743 upordown = -1; /* up */
1743 else if (scrollbarrxvt_dnButton(ev.y)) 1744 else if (scrollbarrxvt_dnButton (ev.y))
1744 upordown = 1; /* down */ 1745 upordown = 1; /* down */
1745 } 1746 }
1746 if (upordown) 1747 if (upordown)
1747 { 1748 {
1748#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
1771 case R_SB_ALIGN_BOTTOM: 1772 case R_SB_ALIGN_BOTTOM:
1772 csrO = scrollBar.bot - scrollBar.top; 1773 csrO = scrollBar.bot - scrollBar.top;
1773 break; 1774 break;
1774 } 1775 }
1775 if (scrollBar.style == R_SB_XTERM 1776 if (scrollBar.style == R_SB_XTERM
1776 || scrollbar_above_slider(ev.y) 1777 || scrollbar_above_slider (ev.y)
1777 || scrollbar_below_slider(ev.y)) 1778 || scrollbar_below_slider (ev.y))
1778 scr_move_to ( scrollbar_position(ev.y) - csrO, 1779 scr_move_to ( scrollbar_position (ev.y) - csrO,
1779 scrollbar_size()); 1780 scrollbar_size ());
1780 scrollBar.setMotion (); 1781 scrollBar.setMotion ();
1781 break; 1782 break;
1782 1783
1783 case Button1: 1784 case Button1:
1784 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1785 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1786 /* FALLTHROUGH */ 1787 /* FALLTHROUGH */
1787 1788
1788 case Button3: 1789 case Button3:
1789 if (scrollBar.style != R_SB_XTERM) 1790 if (scrollBar.style != R_SB_XTERM)
1790 { 1791 {
1791 if (scrollbar_above_slider(ev.y)) 1792 if (scrollbar_above_slider (ev.y))
1792# ifdef RXVT_SCROLL_FULL 1793# ifdef RXVT_SCROLL_FULL
1793 scr_page (UP, TermWin.nrow - 1); 1794 scr_page (UP, TermWin.nrow - 1);
1794# else 1795# else
1795 scr_page (UP, TermWin.nrow / 4); 1796 scr_page (UP, TermWin.nrow / 4);
1796# endif 1797# endif
1797 else if (scrollbar_below_slider(ev.y)) 1798 else if (scrollbar_below_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 1799# ifdef RXVT_SCROLL_FULL
1799 scr_page (DN, TermWin.nrow - 1); 1800 scr_page (DN, TermWin.nrow - 1);
1800# else 1801# else
1801 scr_page (DN, TermWin.nrow / 4); 1802 scr_page (DN, TermWin.nrow / 4);
1802# endif 1803# endif
… …
1805 } 1806 }
1806 else 1807 else
1807 { 1808 {
1808 scr_page ((ev.button == Button1 ? DN : UP), 1809 scr_page ((ev.button == Button1 ? DN : UP),
1809 (TermWin.nrow 1810 (TermWin.nrow
1810 * scrollbar_position(ev.y) 1811 * scrollbar_position (ev.y)
1811 / scrollbar_size())); 1812 / scrollbar_size ()));
1812 } 1813 }
1813 break; 1814 break;
1814 } 1815 }
1815 } 1816 }
1816 return; 1817 return;
1817 } 1818 }
1818#if MENUBAR 1819#if MENUBAR
1819 /* 1820 /*
1820 * Menubar window processing of button press 1821 * Menubar window processing of button press
1821 */ 1822 */
1822 if (isMenuBarWindow(ev.window)) 1823 if (isMenuBarWindow (ev.window))
1823 menubar_control (ev); 1824 menubar_control (ev);
1824#endif 1825#endif
1825} 1826}
1826 1827
1827void 1828void
… …
1829{ 1830{
1830 int reportmode = 0; 1831 int reportmode = 0;
1831 1832
1832 csrO = 0; /* reset csr Offset */ 1833 csrO = 0; /* reset csr Offset */
1833 if (!bypass_keystate) 1834 if (!bypass_keystate)
1834 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1835 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1835 1836
1836 if (scrollbar_isUpDn()) 1837 if (scrollbar_isUpDn ())
1837 { 1838 {
1838 scrollBar.setIdle (); 1839 scrollBar.setIdle ();
1839 scrollbar_show (0); 1840 scrollbar_show (0);
1840#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1841 refresh_type &= ~SMOOTH_REFRESH; 1842 refresh_type &= ~SMOOTH_REFRESH;
… …
1847#endif 1848#endif
1848 if (ev.window == TermWin.vt) 1849 if (ev.window == TermWin.vt)
1849 { 1850 {
1850#ifdef RXVT_GRAPHICS 1851#ifdef RXVT_GRAPHICS
1851 if (ev.subwindow != None) 1852 if (ev.subwindow != None)
1852 rxvt_Gr_ButtonRelease(ev.x, ev.y); 1853 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1853 else 1854 else
1854#endif 1855#endif
1855 1856
1856 { 1857 {
1857 if (reportmode) 1858 if (reportmode)
… …
1935 1936
1936 } 1937 }
1937 } 1938 }
1938 } 1939 }
1939#ifdef MENUBAR 1940#ifdef MENUBAR
1940 else if (isMenuBarWindow(ev.window)) 1941 else if (isMenuBarWindow (ev.window))
1941 menubar_control (ev); 1942 menubar_control (ev);
1942#endif 1943#endif
1943} 1944}
1944 1945
1945 1946
… …
1959 Pixmap rootpixmap = None; 1960 Pixmap rootpixmap = None;
1960 XWindowAttributes wattr, wrootattr; 1961 XWindowAttributes wattr, wrootattr;
1961 1962
1962 pchanged = 0; 1963 pchanged = 0;
1963 1964
1964 if (!(Options & Opt_transparent)) 1965 if (! (Options & Opt_transparent))
1965 return pchanged; /* Don't try any more */ 1966 return pchanged; /* Don't try any more */
1966 1967
1967 XGetWindowAttributes(display->display, display->root, &wrootattr); 1968 XGetWindowAttributes (display->display, display->root, &wrootattr);
1968 rootdepth = wrootattr.depth; 1969 rootdepth = wrootattr.depth;
1969 1970
1970 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1971 if (rootdepth != wattr.depth) 1972 if (rootdepth != wattr.depth)
1972 { 1973 {
1973 if (am_transparent) 1974 if (am_transparent)
1974 { 1975 {
1975 pchanged = 1; 1976 pchanged = 1;
1976 XSetWindowBackground(display->display, TermWin.vt, 1977 XSetWindowBackground (display->display, TermWin.vt,
1977 PixColors[Color_bg]); 1978 PixColors[Color_bg]);
1978 am_transparent = am_pixmap_trans = 0; 1979 am_transparent = am_pixmap_trans = 0;
1979 } 1980 }
1980 return pchanged; /* Don't try any more */ 1981 return pchanged; /* Don't try any more */
1981 } 1982 }
1982 1983
1983 /* Get all X ops out of the queue so that our information is up-to-date. */ 1984 /* Get all X ops out of the queue so that our information is up-to-date. */
1984 XSync(display->display, False); 1985 XSync (display->display, False);
1985 1986
1986 /* 1987 /*
1987 * Make the frame window set by the window manager have 1988 * Make the frame window set by the window manager have
1988 * the root background. Some window managers put multiple nested frame 1989 * the root background. Some window managers put multiple nested frame
1989 * windows for each client, so we have to take care about that. 1990 * windows for each client, so we have to take care about that.
1990 */ 1991 */
1991 i = (xa[XA_XROOTPMAPID] != 0 1992 i = (xa[XA_XROOTPMAPID] != 0
1992 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID], 1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success)); 1995 &nitems, &bytes_after, &prop) == Success));
1995 if (!i || prop == NULL) 1996 if (!i || prop == NULL)
1996 have_pixmap = 0; 1997 have_pixmap = 0;
1997 else 1998 else
1998 { 1999 {
1999 have_pixmap = 1; 2000 have_pixmap = 1;
2000 rootpixmap = *((Pixmap *)prop); 2001 rootpixmap = * ((Pixmap *)prop);
2001 XFree(prop); 2002 XFree (prop);
2002 } 2003 }
2003 if (have_pixmap) 2004 if (have_pixmap)
2004 { 2005 {
2005 /* 2006 /*
2006 * Copy display->root pixmap transparency 2007 * Copy display->root pixmap transparency
… …
2010 Window cr; 2011 Window cr;
2011 XImage *image; 2012 XImage *image;
2012 GC gc; 2013 GC gc;
2013 XGCValues gcvalue; 2014 XGCValues gcvalue;
2014 2015
2015 XTranslateCoordinates(display->display, TermWin.parent[0], display->root, 2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2016 0, 0, &sx, &sy, &cr); 2017 0, 0, &sx, &sy, &cr);
2017 nw = (unsigned int)szHint.width; 2018 nw = (unsigned int)szHint.width;
2018 nh = (unsigned int)szHint.height; 2019 nh = (unsigned int)szHint.height;
2019 nx = ny = 0; 2020 nx = ny = 0;
2020 if (sx < 0) 2021 if (sx < 0)
… …
2027 { 2028 {
2028 nh += sy; 2029 nh += sy;
2029 ny = -sy; 2030 ny = -sy;
2030 sy = 0; 2031 sy = 0;
2031 } 2032 }
2032 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2033 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2034 allowedxerror = -1; 2035 allowedxerror = -1;
2035 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2036 ZPixmap); 2037 ZPixmap);
2037 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2038 /* XXX: may need a delay here? */ 2039 /* XXX: may need a delay here? */
2039 allowedxerror = 0; 2040 allowedxerror = 0;
2040 if (image == NULL) 2041 if (image == NULL)
… …
2042 if (am_transparent && am_pixmap_trans) 2043 if (am_transparent && am_pixmap_trans)
2043 { 2044 {
2044 pchanged = 1; 2045 pchanged = 1;
2045 if (TermWin.pixmap != None) 2046 if (TermWin.pixmap != None)
2046 { 2047 {
2047 XFreePixmap(display->display, TermWin.pixmap); 2048 XFreePixmap (display->display, TermWin.pixmap);
2048 TermWin.pixmap = None; 2049 TermWin.pixmap = None;
2049 } 2050 }
2050 } 2051 }
2051 am_pixmap_trans = 0; 2052 am_pixmap_trans = 0;
2052 } 2053 }
2053 else 2054 else
2054 { 2055 {
2055 if (TermWin.pixmap != None) 2056 if (TermWin.pixmap != None)
2056 XFreePixmap(display->display, TermWin.pixmap); 2057 XFreePixmap (display->display, TermWin.pixmap);
2057 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt, 2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2058 (unsigned int)szHint.width, 2059 (unsigned int)szHint.width,
2059 (unsigned int)szHint.height, 2060 (unsigned int)szHint.height,
2060 (unsigned int)image->depth); 2061 (unsigned int)image->depth);
2061 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue); 2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2062 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0, 2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2063 nx, ny, (unsigned int)image->width, 2064 nx, ny, (unsigned int)image->width,
2064 (unsigned int)image->height); 2065 (unsigned int)image->height);
2065 XFreeGC(display->display, gc); 2066 XFreeGC (display->display, gc);
2066 XDestroyImage(image); 2067 XDestroyImage (image);
2067 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2068 TermWin.pixmap); 2069 TermWin.pixmap);
2069 if (!am_transparent || !am_pixmap_trans) 2070 if (!am_transparent || !am_pixmap_trans)
2070 pchanged = 1; 2071 pchanged = 1;
2071 am_transparent = am_pixmap_trans = 1; 2072 am_transparent = am_pixmap_trans = 1;
2072 } 2073 }
… …
2075 { 2076 {
2076 unsigned int n; 2077 unsigned int n;
2077 /* 2078 /*
2078 * InheritPixmap transparency 2079 * InheritPixmap transparency
2079 */ 2080 */
2080 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2081 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2082 i++) 2083 i++)
2083 { 2084 {
2084 oldp = TermWin.parent[i]; 2085 oldp = TermWin.parent[i];
2085 XQueryTree(display->display, TermWin.parent[i - 1], &root, 2086 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2086 &TermWin.parent[i], &list, &n); 2087 &TermWin.parent[i], &list, &n);
2087 XFree(list); 2088 XFree (list);
2088 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2089 if (TermWin.parent[i] == display->root) 2090 if (TermWin.parent[i] == display->root)
2090 { 2091 {
2091 if (oldp != None) 2092 if (oldp != None)
2092 pchanged = 1; 2093 pchanged = 1;
2093 break; 2094 break;
… …
2098 n = 0; 2099 n = 0;
2099 if (pchanged) 2100 if (pchanged)
2100 { 2101 {
2101 for (; n < (unsigned int)i; n++) 2102 for (; n < (unsigned int)i; n++)
2102 { 2103 {
2103 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr); 2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2104 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2105 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2105 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2106 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2106 { 2107 {
2107 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2108 break; 2109 break;
2109 } 2110 }
2110 } 2111 }
2111 } 2112 }
2112 if (n > (int)(sizeof(TermWin.parent) 2113 if (n > (int) (sizeof (TermWin.parent)
2113 / sizeof(TermWin.parent[0]))) 2114 / sizeof (TermWin.parent[0])))
2114 { 2115 {
2115 D_X((stderr, "InheritPixmap Turning off")); 2116 D_X ((stderr, "InheritPixmap Turning off"));
2116 XSetWindowBackground(display->display, TermWin.parent[0], 2117 XSetWindowBackground (display->display, TermWin.parent[0],
2117 PixColors[Color_fg]); 2118 PixColors[Color_fg]);
2118 XSetWindowBackground(display->display, TermWin.vt, 2119 XSetWindowBackground (display->display, TermWin.vt,
2119 PixColors[Color_bg]); 2120 PixColors[Color_bg]);
2120 am_transparent = 0; 2121 am_transparent = 0;
2121 /* XXX: also turn off Opt_transparent? */ 2122 /* XXX: also turn off Opt_transparent? */
2122 } 2123 }
2123 else 2124 else
… …
2127# ifdef HAVE_NANOSLEEP 2128# ifdef HAVE_NANOSLEEP
2128 struct timespec rqt; 2129 struct timespec rqt;
2129 2130
2130 rqt.tv_sec = 1; 2131 rqt.tv_sec = 1;
2131 rqt.tv_nsec = 0; 2132 rqt.tv_nsec = 0;
2132 nanosleep(&rqt, NULL); 2133 nanosleep (&rqt, NULL);
2133# else 2134# else
2134 sleep(1); 2135 sleep (1);
2135# endif 2136# endif
2136 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2137 for (n = 0; n < (unsigned int)i; n++) 2138 for (n = 0; n < (unsigned int)i; n++)
2138 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n], 2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2139 ParentRelative); 2140 ParentRelative);
2140 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2141 ParentRelative); 2142 ParentRelative);
2142 am_transparent = 1; 2143 am_transparent = 1;
2143 } 2144 }
2144 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2145 TermWin.parent[i] = None; 2146 TermWin.parent[i] = None;
2146 } 2147 }
2147 return pchanged; 2148 return pchanged;
2148} 2149}
2149#endif 2150#endif
… …
2154/*----------------------------------------------------------------------*/ 2155/*----------------------------------------------------------------------*/
2155#ifdef PRINTPIPE 2156#ifdef PRINTPIPE
2156FILE * 2157FILE *
2157rxvt_term::popen_printer () 2158rxvt_term::popen_printer ()
2158{ 2159{
2159 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2160 FILE *stream = popen (rs[Rs_print_pipe], "w");
2160 2161
2161 if (stream == NULL) 2162 if (stream == NULL)
2162 rxvt_print_error("can't open printer pipe"); 2163 rxvt_print_error ("can't open printer pipe");
2163 return stream; 2164 return stream;
2164} 2165}
2165 2166
2166int 2167int
2167rxvt_term::pclose_printer (FILE *stream) 2168rxvt_term::pclose_printer (FILE *stream)
2168{ 2169{
2169 fflush (stream); 2170 fflush (stream);
2170 /* pclose() reported not to work on SunOS 4.1.3 */ 2171 /* pclose () reported not to work on SunOS 4.1.3 */
2171# if defined (__sun__) /* TODO: RESOLVE THIS */ 2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2172 /* pclose works provided SIGCHLD handler uses waitpid */ 2173 /* pclose works provided SIGCHLD handler uses waitpid */
2173 return pclose (stream); /* return fclose (stream); */ 2174 return pclose (stream); /* return fclose (stream); */
2174# else 2175# else
2175 return pclose (stream); 2176 return pclose (stream);
… …
2198 unsigned char ch; 2199 unsigned char ch;
2199 unsigned int i, len; 2200 unsigned int i, len;
2200 2201
2201 if ((ch = cmd_getc ()) != C0_ESC) 2202 if ((ch = cmd_getc ()) != C0_ESC)
2202 { 2203 {
2203 if (putc(ch, fd) == EOF) 2204 if (putc (ch, fd) == EOF)
2204 break; /* done = 1 */ 2205 break; /* done = 1 */
2205 } 2206 }
2206 else 2207 else
2207 { 2208 {
2208 len = 0; 2209 len = 0;
… …
2220 if ((buf[len++] = cmd_getc ()) == 'i') 2221 if ((buf[len++] = cmd_getc ()) == 'i')
2221 break; /* done = 1 */ 2222 break; /* done = 1 */
2222 } 2223 }
2223 } 2224 }
2224 for (i = 0; i < len; i++) 2225 for (i = 0; i < len; i++)
2225 if (putc(buf[i], fd) == EOF) 2226 if (putc (buf[i], fd) == EOF)
2226 { 2227 {
2227 done = 1; 2228 done = 1;
2228 break; 2229 break;
2229 } 2230 }
2230 } 2231 }
… …
2250{ 2251{
2251 switch (ch) 2252 switch (ch)
2252 { 2253 {
2253 case C0_ENQ: /* terminal Status */ 2254 case C0_ENQ: /* terminal Status */
2254 if (rs[Rs_answerbackstring]) 2255 if (rs[Rs_answerbackstring])
2255 tt_write( 2256 tt_write (
2256 (const unsigned char *)rs[Rs_answerbackstring], 2257 (const unsigned char *)rs[Rs_answerbackstring],
2257 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2258 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2258 else 2259 else
2259 tt_write((unsigned char *)VT100_ANS, 2260 tt_write ((unsigned char *)VT100_ANS,
2260 (unsigned int)STRLEN(VT100_ANS)); 2261 (unsigned int)STRLEN (VT100_ANS));
2261 break; 2262 break;
2262 case C0_BEL: /* bell */ 2263 case C0_BEL: /* bell */
2263 scr_bell (); 2264 scr_bell ();
2264 break; 2265 break;
2265 case C0_BS: /* backspace */ 2266 case C0_BS: /* backspace */
… …
2327 row = cmd_getc () - ' '; 2328 row = cmd_getc () - ' ';
2328 col = cmd_getc () - ' '; 2329 col = cmd_getc () - ' ';
2329 scr_gotorc (row, col, 0); 2330 scr_gotorc (row, col, 0);
2330 break; 2331 break;
2331 case 'Z': /* identify the terminal type */ 2332 case 'Z': /* identify the terminal type */
2332 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2333 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2333 break; 2334 break;
2334 case '<': /* turn off VT52 mode */ 2335 case '<': /* turn off VT52 mode */
2335 PrivMode(0, PrivMode_vt52); 2336 PrivMode (0, PrivMode_vt52);
2336 break; 2337 break;
2337 case 'F': /* use special graphics character set */ 2338 case 'F': /* use special graphics character set */
2338 case 'G': /* use regular character set */ 2339 case 'G': /* use regular character set */
2339 /* unimplemented */ 2340 /* unimplemented */
2340 break; 2341 break;
… …
2399 scr_forwardindex (); 2400 scr_forwardindex ();
2400 break; 2401 break;
2401#endif 2402#endif
2402 case '=': 2403 case '=':
2403 case '>': 2404 case '>':
2404 PrivMode((ch == '='), PrivMode_aplKP); 2405 PrivMode ((ch == '='), PrivMode_aplKP);
2405 break; 2406 break;
2406 2407
2407 case C1_40: 2408 case C1_40:
2408 cmd_getc (); 2409 cmd_getc ();
2409 break; 2410 break;
… …
2445 process_dcs_seq (); 2446 process_dcs_seq ();
2446 break; 2447 break;
2447 2448
2448 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2449 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2449 case C1_SCI: /* ESC Z */ 2450 case C1_SCI: /* ESC Z */
2450 tt_write((const unsigned char *)ESCZ_ANSWER, 2451 tt_write ((const unsigned char *)ESCZ_ANSWER,
2451 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2452 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2452 break; /* steal obsolete ESC [ c */ 2453 break; /* steal obsolete ESC [ c */
2453 2454
2454 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2455 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2455 case C1_CSI: /* ESC [ */ 2456 case C1_CSI: /* ESC [ */
2456 process_csi_seq (); 2457 process_csi_seq ();
… …
2496 2497
2497#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2498#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2498 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2499 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2499 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2500 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2500#define get_byte_array_bit(array, bit) \ 2501#define get_byte_array_bit(array, bit) \
2501 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2502 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2502 2503
2503const unsigned char csi_defaults[] = 2504const unsigned char csi_defaults[] =
2504 { 2505 {
2505 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2506 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2506 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2507 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2507 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2508 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2508 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2509 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2509 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2510 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2510 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2511 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2511 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2512 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2512 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2513 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2513 }; 2514 };
2514/* *INDENT-ON* */ 2515/* *INDENT-ON* */
2515 2516
2516void 2517void
2517rxvt_term::process_csi_seq () 2518rxvt_term::process_csi_seq ()
… …
2532 ch = cmd_getc (); 2533 ch = cmd_getc ();
2533 } 2534 }
2534 /* read any numerical arguments */ 2535 /* read any numerical arguments */
2535 for (n = -1; ch < CSI_ICH; ) 2536 for (n = -1; ch < CSI_ICH; )
2536 { 2537 {
2537 if (isdigit(ch)) 2538 if (isdigit (ch))
2538 { 2539 {
2539 if (n < 0) 2540 if (n < 0)
2540 n = ch - '0'; 2541 n = ch - '0';
2541 else 2542 else
2542 n = n * 10 + ch - '0'; 2543 n = n * 10 + ch - '0';
… …
2568 2569
2569 if (nargs < ESC_ARGS) 2570 if (nargs < ESC_ARGS)
2570 arg[nargs++] = n; 2571 arg[nargs++] = n;
2571 2572
2572 i = ch - CSI_ICH; 2573 i = ch - CSI_ICH;
2573 ndef = get_byte_array_bit(csi_defaults, i); 2574 ndef = get_byte_array_bit (csi_defaults, i);
2574 for (p = 0; p < nargs; p++) 2575 for (p = 0; p < nargs; p++)
2575 if (arg[p] == -1) 2576 if (arg[p] == -1)
2576 arg[p] = ndef; 2577 arg[p] = ndef;
2577 2578
2578#ifdef DEBUG_CMD 2579#ifdef DEBUG_CMD
2579 fprintf(stderr, "CSI "); 2580 fprintf (stderr, "CSI ");
2580 for (p = 0; p < nargs; p++) 2581 for (p = 0; p < nargs; p++)
2581 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2582 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2582 fprintf(stderr, "%c\n", ch); 2583 fprintf (stderr, "%c\n", ch);
2583#endif 2584#endif
2584 2585
2585 /* 2586 /*
2586 * private mode handling 2587 * private mode handling
2587 */ 2588 */
… …
2589 { 2590 {
2590 switch (priv) 2591 switch (priv)
2591 { 2592 {
2592 case '>': 2593 case '>':
2593 if (ch == CSI_DA) /* secondary device attributes */ 2594 if (ch == CSI_DA) /* secondary device attributes */
2594 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2595 break; 2596 break;
2596 case '?': 2597 case '?':
2597 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2598 process_terminal_mode (ch, priv, nargs, arg); 2599 process_terminal_mode (ch, priv, nargs, arg);
2599 break; 2600 break;
… …
2602 } 2603 }
2603 2604
2604 switch (ch) 2605 switch (ch)
2605 { 2606 {
2606 /* 2607 /*
2607 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2608 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2608 */ 2609 */
2609#ifdef PRINTPIPE 2610#ifdef PRINTPIPE
2610 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2611 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2611 switch (arg[0]) 2612 switch (arg[0])
2612 { 2613 {
… …
2708 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2709 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2710 break; 2711 break;
2711 2712
2712 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2713 tt_write((const unsigned char *)VT100_ANS, 2714 tt_write ((const unsigned char *)VT100_ANS,
2714 (unsigned int)(sizeof(VT100_ANS) - 1)); 2715 (unsigned int) (sizeof (VT100_ANS) - 1));
2715 break; 2716 break;
2716 2717
2717 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2718 process_sgr_mode (nargs, arg); 2719 process_sgr_mode (nargs, arg);
2719 break; 2720 break;
2720 2721
2721 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2722 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2722 switch (arg[0]) 2723 switch (arg[0])
2723 { 2724 {
2724 case 5: /* DSR requested */ 2725 case 5: /* DSR requested */
2725 tt_printf("\033[0n"); 2726 tt_printf ("\033[0n");
2726 break; 2727 break;
2727 case 6: /* CPR requested */ 2728 case 6: /* CPR requested */
2728 scr_report_position (); 2729 scr_report_position ();
2729 break; 2730 break;
2730#if defined (ENABLE_DISPLAY_ANSWER) 2731#if defined (ENABLE_DISPLAY_ANSWER)
2731 case 7: /* unofficial extension */ 2732 case 7: /* unofficial extension */
2732 tt_printf("%-.250s\n", rs[Rs_display_name]); 2733 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2733 break; 2734 break;
2734#endif 2735#endif
2735 case 8: /* unofficial extension */ 2736 case 8: /* unofficial extension */
2736 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2737 break; 2738 break;
… …
2808 break; 2809 break;
2809#endif 2810#endif
2810 2811
2811 case CSI_78: /* DECREQTPARM */ 2812 case CSI_78: /* DECREQTPARM */
2812 if (arg[0] == 0 || arg[0] == 1) 2813 if (arg[0] == 0 || arg[0] == 1)
2813 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2814 /* FALLTHROUGH */ 2815 /* FALLTHROUGH */
2815 2816
2816 default: 2817 default:
2817 break; 2818 break;
2818 } 2819 }
… …
2837 { 2838 {
2838 /* 2839 /*
2839 * commands 2840 * commands
2840 */ 2841 */
2841 case 1: /* deiconify window */ 2842 case 1: /* deiconify window */
2842 XMapWindow(display->display, TermWin.parent[0]); 2843 XMapWindow (display->display, TermWin.parent[0]);
2843 break; 2844 break;
2844 case 2: /* iconify window */ 2845 case 2: /* iconify window */
2845 XIconifyWindow(display->display, TermWin.parent[0], 2846 XIconifyWindow (display->display, TermWin.parent[0],
2846 DefaultScreen(display->display)); 2847 DefaultScreen (display->display));
2847 break; 2848 break;
2848 case 3: /* set position (pixels) */ 2849 case 3: /* set position (pixels) */
2849 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]); 2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2850 break; 2851 break;
2851 case 4: /* set size (pixels) */ 2852 case 4: /* set size (pixels) */
2852 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2853 break; 2854 break;
2854 case 5: /* raise window */ 2855 case 5: /* raise window */
2855 XRaiseWindow(display->display, TermWin.parent[0]); 2856 XRaiseWindow (display->display, TermWin.parent[0]);
2856 break; 2857 break;
2857 case 6: /* lower window */ 2858 case 6: /* lower window */
2858 XLowerWindow(display->display, TermWin.parent[0]); 2859 XLowerWindow (display->display, TermWin.parent[0]);
2859 break; 2860 break;
2860 case 7: /* refresh window */ 2861 case 7: /* refresh window */
2861 scr_touch (true); 2862 scr_touch (true);
2862 break; 2863 break;
2863 case 8: /* set size (chars) */ 2864 case 8: /* set size (chars) */
2864 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2865 (unsigned int)(args[1] * TermWin.fheight)); 2866 (unsigned int) (args[1] * TermWin.fheight));
2866 break; 2867 break;
2867 default: 2868 default:
2868 if (args[0] >= 24) /* set height (chars) */ 2869 if (args[0] >= 24) /* set height (chars) */
2869 set_widthheight ((unsigned int)TermWin.width, 2870 set_widthheight ((unsigned int)TermWin.width,
2870 (unsigned int)(args[1] * TermWin.fheight)); 2871 (unsigned int) (args[1] * TermWin.fheight));
2871 break; 2872 break;
2872 /* 2873 /*
2873 * reports - some output format copied from XTerm 2874 * reports - some output format copied from XTerm
2874 */ 2875 */
2875 case 11: /* report window state */ 2876 case 11: /* report window state */
2876 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2877 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2878 break; 2879 break;
2879 case 13: /* report window position */ 2880 case 13: /* report window position */
2880 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2881 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root, 2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2882 -wattr.border_width, -wattr.border_width, 2883 -wattr.border_width, -wattr.border_width,
2883 &x, &y, &wdummy); 2884 &x, &y, &wdummy);
2884 tt_printf("\033[3;%d;%dt", x, y); 2885 tt_printf ("\033[3;%d;%dt", x, y);
2885 break; 2886 break;
2886 case 14: /* report window size (pixels) */ 2887 case 14: /* report window size (pixels) */
2887 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2888 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2889 break; 2890 break;
2890 case 18: /* report window size (chars) */ 2891 case 18: /* report window size (chars) */
2891 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2892 break; 2893 break;
2893#if 0 /* XXX: currently disabled due to security concerns */ 2894#if 0 /* XXX: currently disabled due to security concerns */
2894 case 20: /* report icon label */ 2895 case 20: /* report icon label */
2895 XGetIconName(display->display, TermWin.parent[0], &s); 2896 XGetIconName (display->display, TermWin.parent[0], &s);
2896 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2897 break; 2898 break;
2898 case 21: /* report window title */ 2899 case 21: /* report window title */
2899 XFetchName(display->display, TermWin.parent[0], &s); 2900 XFetchName (display->display, TermWin.parent[0], &s);
2900 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2901 break; 2902 break;
2902#endif 2903#endif
2903 2904
2904 } 2905 }
2905} 2906}
2906#endif 2907#endif
2907 2908
2908/*----------------------------------------------------------------------*/ 2909/*----------------------------------------------------------------------*/
2909/* 2910/*
2910 * get input up until STRING TERMINATOR (or BEL) 2911 * get input up until STRING TERMINATOR (or BEL)
2911 * ends_how is terminator used. returned input must be free()d 2912 * ends_how is terminator used. returned input must be free ()d
2912 */ 2913 */
2913unsigned char * 2914unsigned char *
2914rxvt_term::get_to_st (unsigned char *ends_how) 2915rxvt_term::get_to_st (unsigned char *ends_how)
2915{ 2916{
2916 int seen_esc = 0; /* seen escape? */ 2917 int seen_esc = 0; /* seen escape? */
… …
2931 } 2932 }
2932 else if (ch == '\t') 2933 else if (ch == '\t')
2933 ch = ' '; /* translate '\t' to space */ 2934 ch = ' '; /* translate '\t' to space */
2934 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2935 return NULL; /* other control character - exit */ 2936 return NULL; /* other control character - exit */
2936 if (n < sizeof(string) - 1) 2937 if (n < sizeof (string) - 1)
2937 string[n++] = ch; 2938 string[n++] = ch;
2938 seen_esc = 0; 2939 seen_esc = 0;
2939 } 2940 }
2940 string[n++] = '\0'; 2941 string[n++] = '\0';
2941 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2942 return NULL; 2943 return NULL;
2943 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2944 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2944 STRNCPY(s, string, n); 2945 STRNCPY (s, string, n);
2945 return s; 2946 return s;
2946} 2947}
2947 2948
2948/*----------------------------------------------------------------------*/ 2949/*----------------------------------------------------------------------*/
2949/* 2950/*
… …
2956 /* 2957 /*
2957 * Not handled yet 2958 * Not handled yet
2958 */ 2959 */
2959 s = get_to_st (&eh); 2960 s = get_to_st (&eh);
2960 if (s) 2961 if (s)
2961 free(s); 2962 free (s);
2962 return; 2963 return;
2963} 2964}
2964 2965
2965/*----------------------------------------------------------------------*/ 2966/*----------------------------------------------------------------------*/
2966/* 2967/*
… …
2971{ 2972{
2972 unsigned char ch, eh, *s; 2973 unsigned char ch, eh, *s;
2973 int arg; 2974 int arg;
2974 2975
2975 ch = cmd_getc (); 2976 ch = cmd_getc ();
2976 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2977 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2977 arg = arg * 10 + (ch - '0'); 2978 arg = arg * 10 + (ch - '0');
2978 2979
2979 if (ch == ';') 2980 if (ch == ';')
2980 { 2981 {
2981 s = get_to_st (&eh); 2982 s = get_to_st (&eh);
2982 if (s) 2983 if (s)
2983 { 2984 {
2984 /* 2985 /*
2985 * rxvt_menubar_dispatch() violates the constness of the string, 2986 * rxvt_menubar_dispatch () violates the constness of the string,
2986 * so do it here 2987 * so do it here
2987 */ 2988 */
2988 if (arg == XTerm_Menu) 2989 if (arg == XTerm_Menu)
2989#if 0 /* XXX: currently disabled due to security concerns */ 2990#if 0 /* XXX: currently disabled due to security concerns */
2990 menubar_dispatch ((char *)s); 2991 menubar_dispatch ((char *)s);
2991#else 2992#else
2992 (void)0; 2993 (void)0;
2993#endif 2994#endif
2994 else 2995 else
2995 xterm_seq (arg, (char *)s, eh); 2996 xterm_seq (arg, (char *)s, eh);
2996 free(s); 2997 free (s);
2997 } 2998 }
2998 } 2999 }
2999} 3000}
3000/* 3001/*
3001 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
… …
3017 * 39 = change default fg color 3018 * 39 = change default fg color
3018 * 49 = change default bg color 3019 * 49 = change default bg color
3019 * 55 = dump scrollback buffer and all of screen 3020 * 55 = dump scrollback buffer and all of screen
3020 */ 3021 */
3021void 3022void
3022rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
3023{ 3024{
3024 int changed = 0; 3025 int changed = 0;
3025 int color; 3026 int color;
3026 char *buf, *name; 3027 char *buf, *name;
3027 3028
3028 assert(str != NULL); 3029 assert (str != NULL);
3029 switch (op) 3030 switch (op)
3030 { 3031 {
3031 case XTerm_name: 3032 case XTerm_name:
3032 set_title (str); 3033 set_title (str);
3033 /* FALLTHROUGH */ 3034 /* FALLTHROUGH */
… …
3038 set_title (str); 3039 set_title (str);
3039 break; 3040 break;
3040 case XTerm_Color: 3041 case XTerm_Color:
3041 for (buf = (char *)str; buf && *buf;) 3042 for (buf = (char *)str; buf && *buf;)
3042 { 3043 {
3043 if ((name = STRCHR(buf, ';')) == NULL) 3044 if ((name = STRCHR (buf, ';')) == NULL)
3044 break; 3045 break;
3045 *name++ = '\0'; 3046 *name++ = '\0';
3046 color = atoi(buf); 3047 color = atoi (buf);
3047 if (color < 0 || color >= TOTAL_COLORS) 3048 if (color < 0 || color >= TOTAL_COLORS)
3048 break; 3049 break;
3049 if ((buf = STRCHR(name, ';')) != NULL) 3050 if ((buf = STRCHR (name, ';')) != NULL)
3050 *buf++ = '\0'; 3051 *buf++ = '\0';
3051 set_window_color (color + minCOLOR, name); 3052 set_window_color (color + minCOLOR, name);
3052 } 3053 }
3053 break; 3054 break;
3054#ifndef NO_CURSORCOLOR 3055#ifndef NO_CURSORCOLOR
… …
3071 break; 3072 break;
3072#endif 3073#endif
3073 3074
3074 case XTerm_Menu: 3075 case XTerm_Menu:
3075 /* 3076 /*
3076 * rxvt_menubar_dispatch() violates the constness of the string, 3077 * rxvt_menubar_dispatch () violates the constness of the string,
3077 * so DON'T do it here 3078 * so DON'T do it here
3078 */ 3079 */
3079 break; 3080 break;
3080 case XTerm_Pixmap: 3081 case XTerm_Pixmap:
3081 if (*str != ';') 3082 if (*str != ';')
… …
3084 scale_pixmap (""); /* reset to default scaling */ 3085 scale_pixmap (""); /* reset to default scaling */
3085 set_bgPixmap (str); /* change pixmap */ 3086 set_bgPixmap (str); /* change pixmap */
3086#endif 3087#endif
3087 scr_touch (true); 3088 scr_touch (true);
3088 } 3089 }
3089 while ((str = STRCHR(str, ';')) != NULL) 3090 while ((str = STRCHR (str, ';')) != NULL)
3090 { 3091 {
3091 str++; 3092 str++;
3092#if XPM_BACKGROUND 3093#if XPM_BACKGROUND
3093 changed += scale_pixmap (str); 3094 changed += scale_pixmap (str);
3094#endif 3095#endif
… …
3116 break; 3117 break;
3117#if 0 3118#if 0
3118 case XTerm_dumpscreen: /* no error notices */ 3119 case XTerm_dumpscreen: /* no error notices */
3119 { 3120 {
3120 int fd; 3121 int fd;
3121 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3122 { 3123 {
3123 scr_dump (fd); 3124 scr_dump (fd);
3124 close(fd); 3125 close (fd);
3125 } 3126 }
3126 } 3127 }
3127 break; 3128 break;
3128#endif 3129#endif
3129 3130
… …
3154 else 3155 else
3155 { 3156 {
3156 if (mode == 'r') 3157 if (mode == 'r')
3157 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3158 else 3159 else
3159 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3160 PrivMode(state, bit); 3161 PrivMode (state, bit);
3161 } 3162 }
3162 return state; 3163 return state;
3163} 3164}
3164 3165
3165/* we're not using priv _yet_ */ 3166/* we're not using priv _yet_ */
3166void 3167void
3167rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3168{ 3169{
3169 unsigned int i, j; 3170 unsigned int i, j;
3170 int state; 3171 int state;
3171 static const struct 3172 static const struct
3172 { 3173 {
… …
3215 for (i = 0; i < nargs; i++) 3216 for (i = 0; i < nargs; i++)
3216 { 3217 {
3217 state = -1; 3218 state = -1;
3218 3219
3219 /* basic handling */ 3220 /* basic handling */
3220 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3221 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3221 if (argtopriv[j].argval == arg[i]) 3222 if (argtopriv[j].argval == arg[i])
3222 { 3223 {
3223 state = privcases (mode, argtopriv[j].bit); 3224 state = privcases (mode, argtopriv[j].bit);
3224 break; 3225 break;
3225 } 3226 }
… …
3233 scr_cursor (RESTORE); 3234 scr_cursor (RESTORE);
3234 else if (mode == 1) 3235 else if (mode == 1)
3235 scr_cursor (SAVE); 3236 scr_cursor (SAVE);
3236 /* FALLTHROUGH */ 3237 /* FALLTHROUGH */
3237 default: 3238 default:
3238 continue; /* for(;i;) */ 3239 continue; /* for (;i;) */
3239 } 3240 }
3240 3241
3241 /* extra handling for values with valid 0 or 1 state */ 3242 /* extra handling for values with valid 0 or 1 state */
3242 switch (arg[i]) 3243 switch (arg[i])
3243 { 3244 {
… …
3245 case 2: /* VT52 mode */ 3246 case 2: /* VT52 mode */
3246 /* oddball mode. should be set regardless of set/reset 3247 /* oddball mode. should be set regardless of set/reset
3247 * parameter. Return from VT52 mode with an ESC < from 3248 * parameter. Return from VT52 mode with an ESC < from
3248 * within VT52 mode 3249 * within VT52 mode
3249 */ 3250 */
3250 PrivMode(1, PrivMode_vt52); 3251 PrivMode (1, PrivMode_vt52);
3251 break; 3252 break;
3252 case 3: /* 80/132 */ 3253 case 3: /* 80/132 */
3253 if (PrivateModes & PrivMode_132OK) 3254 if (PrivateModes & PrivMode_132OK)
3254 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3255 (unsigned int)TermWin.height); 3256 (unsigned int)TermWin.height);
3256 break; 3257 break;
3257 case 4: /* smooth scrolling */ 3258 case 4: /* smooth scrolling */
3258 if (state) 3259 if (state)
3259 Options &= ~Opt_jumpScroll; 3260 Options &= ~Opt_jumpScroll;
… …
3270 scr_autowrap (state); 3271 scr_autowrap (state);
3271 break; 3272 break;
3272 /* case 8: - auto repeat, can't do on a per window basis */ 3273 /* case 8: - auto repeat, can't do on a per window basis */
3273 case 9: /* X10 mouse reporting */ 3274 case 9: /* X10 mouse reporting */
3274 if (state) /* orthogonal */ 3275 if (state) /* orthogonal */
3275 PrivateModes &= ~(PrivMode_MouseX11); 3276 PrivateModes &= ~ (PrivMode_MouseX11);
3276 break; 3277 break;
3277#ifdef menuBar_esc 3278#ifdef menuBar_esc
3278 case menuBar_esc: 3279 case menuBar_esc:
3279#ifdef MENUBAR 3280#ifdef MENUBAR
3280 map_menuBar (state); 3281 map_menuBar (state);
… …
3300 break; 3301 break;
3301 /* case 66: - application key pad */ 3302 /* case 66: - application key pad */
3302 /* case 67: - backspace key */ 3303 /* case 67: - backspace key */
3303 case 1000: /* X11 mouse reporting */ 3304 case 1000: /* X11 mouse reporting */
3304 if (state) /* orthogonal */ 3305 if (state) /* orthogonal */
3305 PrivateModes &= ~(PrivMode_MouseX10); 3306 PrivateModes &= ~ (PrivMode_MouseX10);
3306 break; 3307 break;
3307#if 0 3308#if 0
3308 case 1001: 3309 case 1001:
3309 break; /* X11 mouse highlighting */ 3310 break; /* X11 mouse highlighting */
3310#endif 3311#endif
… …
3380 break; 3381 break;
3381 } 3382 }
3382 if (rendset != -1) 3383 if (rendset != -1)
3383 { 3384 {
3384 scr_rendition (rendset, rendstyle); 3385 scr_rendition (rendset, rendstyle);
3385 continue; /* for(;i;) */ 3386 continue; /* for (;i;) */
3386 } 3387 }
3387 3388
3388 switch (arg[i]) 3389 switch (arg[i])
3389 { 3390 {
3390 case 30: 3391 case 30:
… …
3393 case 33: 3394 case 33:
3394 case 34: 3395 case 34:
3395 case 35: 3396 case 35:
3396 case 36: 3397 case 36:
3397 case 37: 3398 case 37:
3398 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3399 Color_fg); 3400 Color_fg);
3400 break; 3401 break;
3401#ifdef TTY_256COLOR 3402#ifdef TTY_256COLOR
3402 case 38: 3403 case 38:
3403 if (nargs > i + 2 && arg[i + 1] == 5) 3404 if (nargs > i + 2 && arg[i + 1] == 5)
3404 { 3405 {
3405 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3406 Color_fg); 3407 Color_fg);
3407 i += 2; 3408 i += 2;
3408 } 3409 }
3409 break; 3410 break;
3410#endif 3411#endif
… …
3418 case 43: 3419 case 43:
3419 case 44: 3420 case 44:
3420 case 45: 3421 case 45:
3421 case 46: 3422 case 46:
3422 case 47: 3423 case 47:
3423 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3424 Color_bg); 3425 Color_bg);
3425 break; 3426 break;
3426#ifdef TTY_256COLOR 3427#ifdef TTY_256COLOR
3427 case 48: 3428 case 48:
3428 if (nargs > i + 2 && arg[i + 1] == 5) 3429 if (nargs > i + 2 && arg[i + 1] == 5)
3429 { 3430 {
3430 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3431 Color_bg); 3432 Color_bg);
3432 i += 2; 3433 i += 2;
3433 } 3434 }
3434 break; 3435 break;
3435#endif 3436#endif
… …
3444 case 93: 3445 case 93:
3445 case 94: 3446 case 94:
3446 case 95: 3447 case 95:
3447 case 96: 3448 case 96:
3448 case 97: 3449 case 97:
3449 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3450 Color_fg); 3451 Color_fg);
3451 break; 3452 break;
3452 case 100: 3453 case 100:
3453 case 101: /* set bright bg color */ 3454 case 101: /* set bright bg color */
3454 case 102: 3455 case 102:
3455 case 103: 3456 case 103:
3456 case 104: 3457 case 104:
3457 case 105: 3458 case 105:
3458 case 106: 3459 case 106:
3459 case 107: 3460 case 107:
3460 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3461 Color_bg); 3462 Color_bg);
3462 break; 3463 break;
3463#endif 3464#endif
3464 3465
3465 } 3466 }
… …
3474 unsigned char ch, cmd = cmd_getc (); 3475 unsigned char ch, cmd = cmd_getc ();
3475 3476
3476#ifndef RXVT_GRAPHICS 3477#ifndef RXVT_GRAPHICS
3477 if (cmd == 'Q') 3478 if (cmd == 'Q')
3478 { /* query graphics */ 3479 { /* query graphics */
3479 tt_printf("\033G0\n"); /* no graphics */ 3480 tt_printf ("\033G0\n"); /* no graphics */
3480 return; 3481 return;
3481 } 3482 }
3482 /* swallow other graphics sequences until terminating ':' */ 3483 /* swallow other graphics sequences until terminating ':' */
3483 do 3484 do
3484 ch = cmd_getc (); 3485 ch = cmd_getc ();
… …
3488 int args[NGRX_PTS]; 3489 int args[NGRX_PTS];
3489 unsigned char *text = NULL; 3490 unsigned char *text = NULL;
3490 3491
3491 if (cmd == 'Q') 3492 if (cmd == 'Q')
3492 { /* query graphics */ 3493 { /* query graphics */
3493 tt_printf("\033G1\n"); /* yes, graphics (color) */ 3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3494 return; 3495 return;
3495 } 3496 }
3496 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) 3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3497 { 3498 {
3498 int neg; 3499 int neg;
3499 3500
3500 ch = cmd_getc (); 3501 ch = cmd_getc ();
3501 neg = (ch == '-'); 3502 neg = (ch == '-');
3502 if (neg || ch == '+') 3503 if (neg || ch == '+')
3503 ch = cmd_getc (); 3504 ch = cmd_getc ();
3504 3505
3505 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ()) 3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3506 args[nargs] = args[nargs] * 10 + (ch - '0'); 3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3507 if (neg) 3508 if (neg)
3508 args[nargs] = -args[nargs]; 3509 args[nargs] = -args[nargs];
3509 3510
3510 nargs++; 3511 nargs++;
… …
3515 3516
3516 if ((cmd == 'T') && (nargs >= 5)) 3517 if ((cmd == 'T') && (nargs >= 5))
3517 { 3518 {
3518 int i, len = args[4]; 3519 int i, len = args[4];
3519 3520
3520 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); 3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3521 3522
3522 if (text != NULL) 3523 if (text != NULL)
3523 { 3524 {
3524 for (i = 0; i < len; i++) 3525 for (i = 0; i < len; i++)
3525 text[i] = cmd_getc (); 3526 text[i] = cmd_getc ();
… …
3532/*}}} */ 3533/*}}} */
3533 3534
3534/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3535 3536
3536/* 3537/*
3537 * Send printf() formatted output to the command. 3538 * Send printf () formatted output to the command.
3538 * Only use for small amounts of data. 3539 * Only use for small amounts of data.
3539 */ 3540 */
3540void 3541void
3541rxvt_term::tt_printf (const char *fmt,...) 3542rxvt_term::tt_printf (const char *fmt,...)
3542{ 3543{

Diff Legend

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