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.36 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.45 by pcg, Sat Feb 21 20:33:39 2004 UTC

… …
53 53
54/*----------------------------------------------------------------------*/ 54/*----------------------------------------------------------------------*/
55 55
56/*{{{ Convert the keypress event into a string */ 56/*{{{ Convert the keypress event into a string */
57void 57void
58rxvt_term::lookup_key (XKeyEvent *ev) 58rxvt_term::lookup_key (XKeyEvent &ev)
59{ 59{
60 int ctrl, meta, shft, len; 60 int ctrl, meta, shft, len;
61 unsigned int newlen; 61 unsigned int newlen;
62 KeySym keysym; 62 KeySym keysym;
63#ifdef DEBUG_CMD 63#ifdef DEBUG_CMD
… …
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 71 * escape sequence to toggle the Keypad.
72 * 72 *
73 * Always permit `shift' to override the current setting 73 * Always permit `shift' to override the current setting
74 */ 74 */
75 shft = (ev->state & ShiftMask); 75 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 76 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & ModMetaMask); 77 meta = (ev.state & ModMetaMask);
78 78
79 if (numlock_state || (ev->state & ModNumLockMask)) 79 if (numlock_state || (ev.state & ModNumLockMask))
80 { 80 {
81 numlock_state = (ev->state & ModNumLockMask); 81 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 82 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 83 }
84 84
85 kbuf[0] = 0; 85 kbuf[0] = 0;
86 86
87#ifdef USE_XIM 87#ifdef USE_XIM
… …
89 { 89 {
90 Status status_return; 90 Status status_return;
91 91
92#ifdef X_HAVE_UTF8_STRING 92#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 93 if (enc_utf8 && 0)
94 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 95 KBUFSZ, &keysym, &status_return);
96 else 96 else
97#endif 97#endif
98 98
99 { 99 {
… …
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
… …
126 } 126 }
127 else 127 else
128#endif 128#endif
129 129
130 { 130 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 132 valid_keysym = !len;
133 } 133 }
134 134
135 if (valid_keysym) 135 if (valid_keysym)
136 { 136 {
… …
227 { 227 {
228 switch (keysym) 228 switch (keysym)
229 { 229 {
230 /* normal XTerm key bindings */ 230 /* normal XTerm key bindings */
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 231 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev->time, 0, 0); 232 selection_request (ev.time, 0, 0);
233 return; 233 return;
234 /* rxvt extras */ 234 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 235 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 236 change_font (0, FONT_UP);
237 return; 237 return;
… …
253 { 253 {
254 greek_mode = !greek_mode; 254 greek_mode = !greek_mode;
255 if (greek_mode) 255 if (greek_mode)
256 { 256 {
257 xterm_seq (XTerm_title, 257 xterm_seq (XTerm_title,
258 (greek_getmode() == GREEK_ELOT928 258 (greek_getmode () == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset(); 260 greek_reset ();
261 } 261 }
262 else 262 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return; 264 return;
265 } 265 }
266#endif 266#endif
267 267
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 268 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 { 269 {
270#ifdef KEYSYM_RESOURCE 270#ifdef KEYSYM_RESOURCE
271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 271 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 272 {
273 unsigned int l; 273 unsigned int l;
274 const unsigned char *kbuf0; 274 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC; 275 const unsigned char ch = C0_ESC;
276 276
… …
295 { 295 {
296#ifndef NO_BACKSPACE_KEY 296#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 297 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 298 if (PrivateModes & PrivMode_HaveBackSpace)
299 { 299 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 300 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 301 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 302 kbuf[1] = '\0';
303 } 303 }
304 else 304 else
305 STRCPY(kbuf, key_backspace); 305 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET 306# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0) 307 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 { 308 {
309 int col, row; 309 int col, row;
310 310
311 newlen = STRLEN(kbuf); 311 newlen = STRLEN (kbuf);
312 col = screen.cur.col - 1; 312 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines; 313 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2(screen.rend[row][col])) 314 if (IS_MULTI2 (screen.rend[row][col]))
315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 315 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
316 } 316 }
317# endif 317# endif
318 break; 318 break;
319#endif 319#endif
320#ifndef NO_DELETE_KEY 320#ifndef NO_DELETE_KEY
321 case XK_Delete: 321 case XK_Delete:
322 STRCPY(kbuf, key_delete); 322 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET 323# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack) 324 if (Options & Opt_mc_hack)
325 { 325 {
326 int col, row; 326 int col, row;
327 327
328 newlen = STRLEN(kbuf); 328 newlen = STRLEN (kbuf);
329 col = screen.cur.col; 329 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines; 330 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col])) 331 if (IS_MULTI1 (screen.rend[row][col]))
332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 332 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
333 } 333 }
334# endif 334# endif
335 break; 335 break;
336#endif 336#endif
337 case XK_Tab: 337 case XK_Tab:
338 if (shft) 338 if (shft)
339 STRCPY(kbuf, "\033[Z"); 339 STRCPY (kbuf, "\033[Z");
340 else 340 else
341 { 341 {
342#ifdef CTRL_TAB_MAKES_META 342#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 343 if (ctrl)
344 meta = 1; 344 meta = 1;
345#endif 345#endif
346#ifdef MOD4_TAB_MAKES_META 346#ifdef MOD4_TAB_MAKES_META
347 if (ev->state & Mod4Mask) 347 if (ev.state & Mod4Mask)
348 meta = 1; 348 meta = 1;
349#endif 349#endif
350 newlen = 0; 350 newlen = 0;
351 } 351 }
352 break; 352 break;
… …
357 case XK_KP_Down: /* \033Or or standard */ 357 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 358 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 359 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 361 {
362 STRCPY(kbuf, "\033OZ"); 362 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]);
364 break; 364 break;
365 } 365 }
366 else 366 else
367 /* translate to std. cursor key */ 367 /* translate to std. cursor key */
… …
370#endif 370#endif
371 case XK_Up: /* "\033[A" */ 371 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 372 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 373 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 374 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 375 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 376 kbuf[2] = ("DACB"[keysym - XK_Left]);
377 /* do Shift first */ 377 /* do Shift first */
378 if (shft) 378 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 379 kbuf[2] = ("dacb"[keysym - XK_Left]);
380 else if (ctrl) 380 else if (ctrl)
… …
392 392
393 col = screen.cur.col; 393 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines; 394 row = screen.cur.row + TermWin.saveLines;
395 m = 0; 395 m = 0;
396 if (keysym == XK_Right 396 if (keysym == XK_Right
397 && IS_MULTI1(screen.rend[row][col])) 397 && IS_MULTI1 (screen.rend[row][col]))
398 m = 1; 398 m = 1;
399 else if (keysym == XK_Left) 399 else if (keysym == XK_Left)
400 { 400 {
401 if (col > 0) 401 if (col > 0)
402 { 402 {
403 if (IS_MULTI2(screen.rend[row][col - 1])) 403 if (IS_MULTI2 (screen.rend[row][col - 1]))
404 m = 1; 404 m = 1;
405 } 405 }
406 else if (screen.cur.row > 0) 406 else if (screen.cur.row > 0)
407 { 407 {
408 col = screen.tlen[--row]; 408 col = screen.tlen[--row];
409 if (col == -1) 409 if (col == -1)
410 col = TermWin.ncol - 1; 410 col = TermWin.ncol - 1;
411 else 411 else
412 col--; 412 col--;
413 if (col > 0 413 if (col > 0
414 && IS_MULTI2(screen.rend[row][col])) 414 && IS_MULTI2 (screen.rend[row][col]))
415 m = 1; 415 m = 1;
416 } 416 }
417 } 417 }
418 if (m) 418 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 419 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
420 } 420 }
421#endif 421#endif
422 break; 422 break;
423 423
424#ifndef UNSHIFTED_SCROLLKEYS 424#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 425# ifdef XK_KP_Prior
426 case XK_KP_Prior: 426 case XK_KP_Prior:
427 /* allow shift to override */ 427 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
429 { 429 {
430 STRCPY(kbuf, "\033Oy"); 430 STRCPY (kbuf, "\033Oy");
431 break; 431 break;
432 } 432 }
433 /* FALLTHROUGH */ 433 /* FALLTHROUGH */
434# endif 434# endif
435 case XK_Prior: 435 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 436 STRCPY (kbuf, "\033[5~");
437 break; 437 break;
438# ifdef XK_KP_Next 438# ifdef XK_KP_Next
439 case XK_KP_Next: 439 case XK_KP_Next:
440 /* allow shift to override */ 440 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 { 442 {
443 STRCPY(kbuf, "\033Os"); 443 STRCPY (kbuf, "\033Os");
444 break; 444 break;
445 } 445 }
446 /* FALLTHROUGH */ 446 /* FALLTHROUGH */
447# endif 447# endif
448 case XK_Next: 448 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 449 STRCPY (kbuf, "\033[6~");
450 break; 450 break;
451#endif 451#endif
452 case XK_KP_Enter: 452 case XK_KP_Enter:
453 /* allow shift to override */ 453 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 { 455 {
456 STRCPY(kbuf, "\033OM"); 456 STRCPY (kbuf, "\033OM");
457 } 457 }
458 else 458 else
459 { 459 {
460 kbuf[0] = '\r'; 460 kbuf[0] = '\r';
461 kbuf[1] = '\0'; 461 kbuf[1] = '\0';
462 } 462 }
463 break; 463 break;
464 464
465#ifdef XK_KP_Begin 465#ifdef XK_KP_Begin
466 case XK_KP_Begin: 466 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 467 STRCPY (kbuf, "\033Ou");
468 break; 468 break;
469 469
470 case XK_KP_Insert: 470 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op"); 471 STRCPY (kbuf, "\033Op");
472 break; 472 break;
473 473
474 case XK_KP_Delete: 474 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On"); 475 STRCPY (kbuf, "\033On");
476 break; 476 break;
477#endif 477#endif
478 case XK_KP_F1: /* "\033OP" */ 478 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 479 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 480 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 481 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 482 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 483 kbuf[2] += (keysym - XK_KP_F1);
484 break; 484 break;
485 485
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 486 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 487 case XK_KP_Add: /* "\033Ok" : "+" */
… …
500 case XK_KP_8: /* "\033Ox" : "8" */ 500 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 501 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 502 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
504 { 504 {
505 STRCPY(kbuf, "\033Oj"); 505 STRCPY (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 506 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 507 }
508 else 508 else
509 { 509 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 511 kbuf[1] = '\0';
512 } 512 }
513 break; 513 break;
514 514
515 case XK_Find: 515 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 516 STRCPY (kbuf, "\033[1~");
517 break; 517 break;
518 case XK_Insert: 518 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 519 STRCPY (kbuf, "\033[2~");
520 break; 520 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 521#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 522 case DXK_Remove:
523 /* FALLTHROUGH */ 523 /* FALLTHROUGH */
524#endif 524#endif
525 case XK_Execute: 525 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 526 STRCPY (kbuf, "\033[3~");
527 break; 527 break;
528 case XK_Select: 528 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 529 STRCPY (kbuf, "\033[4~");
530 break; 530 break;
531#ifdef XK_KP_End 531#ifdef XK_KP_End
532 case XK_KP_End: 532 case XK_KP_End:
533 /* allow shift to override */ 533 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
535 { 535 {
536 STRCPY(kbuf, "\033Oq"); 536 STRCPY (kbuf, "\033Oq");
537 break; 537 break;
538 } 538 }
539 /* FALLTHROUGH */ 539 /* FALLTHROUGH */
540#endif 540#endif
541 case XK_End: 541 case XK_End:
542 STRCPY(kbuf, KS_END); 542 STRCPY (kbuf, KS_END);
543 break; 543 break;
544#ifdef XK_KP_Home 544#ifdef XK_KP_Home
545 case XK_KP_Home: 545 case XK_KP_Home:
546 /* allow shift to override */ 546 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
548 { 548 {
549 STRCPY(kbuf, "\033Ow"); 549 STRCPY (kbuf, "\033Ow");
550 break; 550 break;
551 } 551 }
552 /* FALLTHROUGH */ 552 /* FALLTHROUGH */
553#endif 553#endif
554 case XK_Home: 554 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 555 STRCPY (kbuf, KS_HOME);
556 break; 556 break;
557 557
558#define FKEY(n, fkey) \ 558#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 559 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 560
561 case XK_F1: /* "\033[11~" */ 561 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 562 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 563 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 564 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 565 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 566 FKEY (11, XK_F1);
567 break; 567 break;
568 case XK_F6: /* "\033[17~" */ 568 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 569 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 570 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 571 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 572 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 573 FKEY (17, XK_F6);
574 break; 574 break;
575 case XK_F11: /* "\033[23~" */ 575 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 576 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 577 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 578 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 579 FKEY (23, XK_F11);
580 break; 580 break;
581 case XK_F15: /* "\033[28~" */ 581 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 582 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 583 FKEY (28, XK_F15);
584 break; 584 break;
585 case XK_Help: /* "\033[28~" */ 585 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 586 FKEY (28, XK_Help);
587 break; 587 break;
588 case XK_Menu: /* "\033[29~" */ 588 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 589 FKEY (29, XK_Menu);
590 break; 590 break;
591 case XK_F17: /* "\033[31~" */ 591 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 592 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 593 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 594 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 605 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 606 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 607 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 608 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 609 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 610 FKEY (31, XK_F17);
611 break; 611 break;
612#undef FKEY 612#undef FKEY
613 default: 613 default:
614 newlen = 0; 614 newlen = 0;
615 break; 615 break;
616 } 616 }
617 if (newlen) 617 if (newlen)
618 len = STRLEN(kbuf); 618 len = STRLEN (kbuf);
619 } 619 }
620 /* 620 /*
621 * Pass meta for all function keys, if 'meta' option set 621 * Pass meta for all function keys, if 'meta' option set
622 */ 622 */
623#ifdef META8_OPTION 623#ifdef META8_OPTION
… …
644 meta = 0; 644 meta = 0;
645 } 645 }
646#endif 646#endif
647#ifdef GREEK_SUPPORT 647#ifdef GREEK_SUPPORT
648 if (greek_mode) 648 if (greek_mode)
649 len = greek_xlat(kbuf, len); 649 len = greek_xlat (kbuf, len);
650#endif 650#endif
651 /* nil */ ; 651 /* nil */ ;
652 } 652 }
653 } 653 }
654 654
… …
683#endif 683#endif
684 ) 684 )
685 { 685 {
686 const unsigned char ch = C0_ESC; 686 const unsigned char ch = C0_ESC;
687 687
688 tt_write(&ch, 1); 688 tt_write (&ch, 1);
689 } 689 }
690#ifdef DEBUG_CMD 690#ifdef DEBUG_CMD
691 if (debug_key) 691 if (debug_key)
692 { /* Display keyboard buffer contents */ 692 { /* Display keyboard buffer contents */
693 char *p; 693 char *p;
694 int i; 694 int i;
695 695
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 696 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 697 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 698 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 699 fprintf (stderr, "'\n");
700 } 700 }
701#endif /* DEBUG_CMD */ 701#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 702 tt_write (kbuf, (unsigned int)len);
703} 703}
704/*}}} */ 704/*}}} */
705 705
706#if (MENUBAR_MAX) 706#if (MENUBAR_MAX)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 707/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 708/* attempt to `write' count to the input buffer */
709unsigned int 709unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 710rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 711{
712 unsigned int n, s; 712 unsigned int n, s;
713 713
714 n = cmdbuf_ptr - cmdbuf_base; 714 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
716 if (n > 0 && s < count) 716 if (n > 0 && s < count)
717 { 717 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 718 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 719 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 720 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 721 cmdbuf_endp -= n;
722 s += n; 722 s += n;
723 } 723 }
724 if (count > s) 724 if (count > s)
725 { 725 {
726 rxvt_print_error("data loss: cmd_write too large"); 726 rxvt_print_error ("data loss: cmd_write too large");
727 count = s; 727 count = s;
728 } 728 }
729 for (; count--;) 729 for (; count--;)
730 *cmdbuf_endp++ = *str++; 730 *cmdbuf_endp++ = *str++;
731 return 0; 731 return 0;
… …
753 IMSendSpot (); 753 IMSendSpot ();
754#endif 754#endif
755 755
756 } 756 }
757 757
758 XFlush (Xdisplay); 758 display->flush ();
759} 759}
760 760
761void 761void
762rxvt_term::check_cb (check_watcher &w) 762rxvt_term::check_cb (check_watcher &w)
763{ 763{
764 SET_R (this); 764 SET_R (this);
765 SET_LOCALE (locale); 765 SET_LOCALE (locale);
766 766
767 flush (); 767 flush ();
768}
769
770void
771rxvt_term::process_x_events ()
772{
773 do
774 {
775 XEvent xev;
776
777 XNextEvent (Xdisplay, &xev);
778
779#if defined(CURSOR_BLINK)
780 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
781 {
782 if (hidden_cursor)
783 {
784 hidden_cursor = 0;
785 want_refresh = 1;
786 }
787
788 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
789 }
790#endif
791
792#if defined(POINTER_BLANK)
793 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
794 {
795 if (xev.type == MotionNotify
796 || xev.type == ButtonPress
797 || xev.type == ButtonRelease)
798 if (hidden_pointer)
799 pointer_unblank ();
800
801 if (xev.type == KeyPress && hidden_pointer == 0)
802 pointer_blank ();
803 }
804#endif
805
806#ifdef USE_XIM
807 if (!XFilterEvent (&xev, xev.xany.window))
808#endif
809 process_x_event (&xev);
810 }
811 while (XPending (Xdisplay));
812} 768}
813 769
814#ifdef CURSOR_BLINK 770#ifdef CURSOR_BLINK
815void 771void
816rxvt_term::cursor_blink_cb (time_watcher &w) 772rxvt_term::cursor_blink_cb (time_watcher &w)
… …
832 want_refresh = 1; 788 want_refresh = 1;
833 w.start (w.at + TEXT_BLINK_INTERVAL); 789 w.start (w.at + TEXT_BLINK_INTERVAL);
834 } 790 }
835} 791}
836#endif 792#endif
837
838void
839rxvt_term::x_cb (io_watcher &w, short revents)
840{
841 SET_R (this);
842 SET_LOCALE (locale);
843
844 process_x_events ();
845}
846 793
847bool 794bool
848rxvt_term::pty_fill () 795rxvt_term::pty_fill ()
849{ 796{
850 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 797 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
… …
922 if (ch == '\n') 869 if (ch == '\n')
923 { 870 {
924 nlines++; 871 nlines++;
925 refresh_count++; 872 refresh_count++;
926 873
927 if (!(Options & Opt_jumpScroll) 874 if (! (Options & Opt_jumpScroll)
928 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 875 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
929 { 876 {
930 refreshnow = true; 877 refreshnow = true;
931 flag = false; 878 flag = false;
932 ch = NOCHAR; 879 ch = NOCHAR;
933 break; 880 break;
881 }
882
883 // scr_add_lines only works for nlines < TermWin.nrow - 1.
884 if (nlines >= TermWin.nrow - 1)
885 {
886 scr_add_lines (buf, nlines, str - buf);
887 nlines = 0;
888 str = buf;
934 } 889 }
935 } 890 }
936 891
937 if (str >= buf + BUFSIZ) 892 if (str >= buf + BUFSIZ)
938 { 893 {
… …
992 { 947 {
993 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
994 return *cmdbuf_ptr++; 949 return *cmdbuf_ptr++;
995 950
996 wchar_t wc; 951 wchar_t wc;
997 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
998 953
999 if (len == (size_t)-2) 954 if (len == (size_t)-2)
1000 return NOCHAR; 955 return NOCHAR;
1001 956
1002 if (len == (size_t)-1) 957 if (len == (size_t)-1)
… …
1008 } 963 }
1009 964
1010 return NOCHAR; 965 return NOCHAR;
1011} 966}
1012 967
1013/* rxvt_cmd_getc() - Return next input character */ 968/* rxvt_cmd_getc () - Return next input character */
1014/* 969/*
1015 * Return the next input character after first passing any keyboard input 970 * Return the next input character after first passing any keyboard input
1016 * to the command. 971 * to the command.
1017 */ 972 */
1018uint32_t 973uint32_t
… …
1034 989
1035#ifdef POINTER_BLANK 990#ifdef POINTER_BLANK
1036void 991void
1037rxvt_term::pointer_unblank () 992rxvt_term::pointer_unblank ()
1038{ 993{
1039 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 994 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1040 recolour_cursor (); 995 recolour_cursor ();
1041 996
1042 hidden_pointer = 0; 997 hidden_pointer = 0;
1043 998
1044 if (Options & Opt_pointerBlank) 999 if (Options & Opt_pointerBlank)
… …
1046} 1001}
1047 1002
1048void 1003void
1049rxvt_term::pointer_blank () 1004rxvt_term::pointer_blank ()
1050{ 1005{
1051 if (!(Options & Opt_pointerBlank)) 1006 if (! (Options & Opt_pointerBlank))
1052 return; 1007 return;
1053 1008
1054 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1009 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1055 XFlush (Xdisplay); 1010 XFlush (display->display);
1056 1011
1057 hidden_pointer = 1; 1012 hidden_pointer = 1;
1058} 1013}
1059 1014
1060void 1015void
… …
1066 pointer_blank (); 1021 pointer_blank ();
1067} 1022}
1068#endif 1023#endif
1069 1024
1070void 1025void
1071rxvt_term::mouse_report (const XButtonEvent *ev) 1026rxvt_term::mouse_report (const XButtonEvent &ev)
1072{ 1027{
1073 int button_number, key_state = 0; 1028 int button_number, key_state = 0;
1074 int x, y; 1029 int x, y;
1075 1030
1076 x = ev->x; 1031 x = ev.x;
1077 y = ev->y; 1032 y = ev.y;
1078 pixel_position (&x, &y); 1033 pixel_position (&x, &y);
1079 1034
1080 if (MEvent.button == AnyButton) 1035 if (MEvent.button == AnyButton)
1081 { 1036 {
1082 button_number = 3; 1037 button_number = 3;
… …
1116#endif 1071#endif
1117 1072
1118 } 1073 }
1119 1074
1120#ifdef DEBUG_MOUSEREPORT 1075#ifdef DEBUG_MOUSEREPORT
1121 fprintf(stderr, "Mouse ["); 1076 fprintf (stderr, "Mouse [");
1122 if (key_state & 16) 1077 if (key_state & 16)
1123 fputc('C', stderr); 1078 fputc ('C', stderr);
1124 if (key_state & 4) 1079 if (key_state & 4)
1125 fputc('S', stderr); 1080 fputc ('S', stderr);
1126 if (key_state & 8) 1081 if (key_state & 8)
1127 fputc('A', stderr); 1082 fputc ('A', stderr);
1128 if (key_state & 32) 1083 if (key_state & 32)
1129 fputc('2', stderr); 1084 fputc ('2', stderr);
1130 fprintf(stderr, "]: <%d>, %d/%d\n", 1085 fprintf (stderr, "]: <%d>, %d/%d\n",
1131 button_number, 1086 button_number,
1132 x + 1, 1087 x + 1,
1133 y + 1); 1088 y + 1);
1134#else 1089#else
1135 tt_printf("\033[M%c%c%c", 1090 tt_printf ("\033[M%c%c%c",
1136 (32 + button_number + key_state), 1091 (32 + button_number + key_state),
1137 (32 + x + 1), 1092 (32 + x + 1),
1138 (32 + y + 1)); 1093 (32 + y + 1));
1139#endif 1094#endif
1140} 1095}
1141 1096
1142#ifdef USING_W11LIB 1097#ifdef USING_W11LIB
1143void 1098void
1144rxvt_W11_process_x_event(XEvent *ev) 1099rxvt_W11_process_x_event (XEvent *ev)
1145{ 1100{
1146 rxvt_t *r = rxvt_get_r(); 1101 rxvt_t *r = rxvt_get_r ();
1147 1102
1148 process_x_event (ev); 1103 x_cb (*ev);
1149} 1104}
1150#endif 1105#endif
1151 1106
1152/*{{{ process an X event */ 1107/*{{{ process an X event */
1153void 1108void
1154rxvt_term::process_x_event (XEvent *ev) 1109rxvt_term::x_cb (XEvent &ev)
1155{ 1110{
1111 SET_R (this);
1112 SET_LOCALE (locale);
1113
1114#if defined(CURSOR_BLINK)
1115 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1116 {
1117 if (hidden_cursor)
1118 {
1119 hidden_cursor = 0;
1120 want_refresh = 1;
1121 }
1122
1123 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1124 }
1125#endif
1126
1127#if defined(POINTER_BLANK)
1128 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1129 {
1130 if (ev.type == MotionNotify
1131 || ev.type == ButtonPress
1132 || ev.type == ButtonRelease)
1133 if (hidden_pointer)
1134 pointer_unblank ();
1135
1136 if (ev.type == KeyPress && hidden_pointer == 0)
1137 pointer_blank ();
1138 }
1139#endif
1140
1141#ifdef USE_XIM
1142 if (XFilterEvent (&ev, None))
1143 return;
1144#endif
1145
1156 Window unused_root, unused_child; 1146 Window unused_root, unused_child;
1157 int unused_root_x, unused_root_y; 1147 int unused_root_x, unused_root_y;
1158 unsigned int unused_mask; 1148 unsigned int unused_mask;
1159 1149
1160#ifdef DEBUG_X 1150#ifdef DEBUG_X
… …
1199#endif 1189#endif
1200 1190
1201#ifdef DEBUG_X 1191#ifdef DEBUG_X
1202 struct timeval tp; 1192 struct timeval tp;
1203 struct tm *ltt; 1193 struct tm *ltt;
1204 (void)gettimeofday(&tp, NULL); 1194 (void)gettimeofday (&tp, NULL);
1205 ltt = localtime(&(tp.tv_sec)); 1195 ltt = localtime (& (tp.tv_sec));
1206 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == TermWin.parent[0] ? "parent" : (ev->xany.window == TermWin.vt ? "vt" : (ev->xany.window == scrollBar.win ? "scroll" : (ev->xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev->xany.window == TermWin.vt ? TermWin.vt : (ev->xany.window == scrollBar.win ? scrollBar.win : (ev->xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial)); 1196 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1207#endif 1197#endif
1208 1198
1209 switch (ev->type) 1199 switch (ev.type)
1210 { 1200 {
1211 case KeyPress: 1201 case KeyPress:
1212 lookup_key ((XKeyEvent *)ev); 1202 lookup_key (ev.xkey);
1213 break; 1203 break;
1214 1204
1215#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1216 case KeyRelease: 1206 case KeyRelease:
1217 { 1207 {
1218 if (!(ev->xkey.state & ControlMask)) 1208 if (! (ev.xkey.state & ControlMask))
1219 mouse_slip_wheel_speed = 0; 1209 mouse_slip_wheel_speed = 0;
1220 else 1210 else
1221 { 1211 {
1222 KeySym ks; 1212 KeySym ks;
1223 1213
1224 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0); 1214 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1225 if (ks == XK_Control_L || ks == XK_Control_R) 1215 if (ks == XK_Control_L || ks == XK_Control_R)
1226 mouse_slip_wheel_speed = 0; 1216 mouse_slip_wheel_speed = 0;
1227 } 1217 }
1228 break; 1218 break;
1229 } 1219 }
1230#endif 1220#endif
1231 1221
1232 case ButtonPress: 1222 case ButtonPress:
1233 button_press ((XButtonEvent *)ev); 1223 button_press (ev.xbutton);
1234 break; 1224 break;
1235 1225
1236 case ButtonRelease: 1226 case ButtonRelease:
1237 button_release ((XButtonEvent *)ev); 1227 button_release (ev.xbutton);
1238 break; 1228 break;
1239 1229
1240 case ClientMessage: 1230 case ClientMessage:
1241 if (ev->xclient.format == 32 1231 if (ev.xclient.format == 32
1242 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1232 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1243 destroy (); 1233 destroy ();
1244#ifdef OFFIX_DND 1234#ifdef OFFIX_DND
1245 /* OffiX Dnd (drag 'n' drop) protocol */ 1235 /* OffiX Dnd (drag 'n' drop) protocol */
1246 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1236 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1247 && (ev->xclient.data.l[0] == DndFile 1237 && (ev.xclient.data.l[0] == DndFile
1248 || ev->xclient.data.l[0] == DndDir 1238 || ev.xclient.data.l[0] == DndDir
1249 || ev->xclient.data.l[0] == DndLink)) 1239 || ev.xclient.data.l[0] == DndLink))
1250 { 1240 {
1251 /* Get Dnd data */ 1241 /* Get Dnd data */
1252 Atom ActualType; 1242 Atom ActualType;
1253 int ActualFormat; 1243 int ActualFormat;
1254 unsigned char *data; 1244 unsigned char *data;
1255 unsigned long Size, RemainingBytes; 1245 unsigned long Size, RemainingBytes;
1256 1246
1257 XGetWindowProperty(Xdisplay, Xroot, 1247 XGetWindowProperty (display->display, display->root,
1258 xa[XA_DNDSELECTION], 1248 xa[XA_DNDSELECTION],
1259 0L, 1000000L, 1249 0L, 1000000L,
1260 False, AnyPropertyType, 1250 False, AnyPropertyType,
1261 &ActualType, &ActualFormat, 1251 &ActualType, &ActualFormat,
1262 &Size, &RemainingBytes, 1252 &Size, &RemainingBytes,
1263 &data); 1253 &data);
1264 XChangeProperty(Xdisplay, Xroot, 1254 XChangeProperty (display->display, display->root,
1265 XA_CUT_BUFFER0, XA_STRING, 1255 XA_CUT_BUFFER0, XA_STRING,
1266 8, PropModeReplace, 1256 8, PropModeReplace,
1267 data, STRLEN(data)); 1257 data, STRLEN (data));
1268 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1258 selection_paste (display->root, XA_CUT_BUFFER0, True);
1269 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1259 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1270 } 1260 }
1271#endif /* OFFIX_DND */ 1261#endif /* OFFIX_DND */
1272 break; 1262 break;
1273 1263
1274 case MappingNotify: 1264 case MappingNotify:
1275 XRefreshKeyboardMapping(&(ev->xmapping)); 1265 XRefreshKeyboardMapping (& (ev.xmapping));
1276 break; 1266 break;
1277 1267
1278 /* 1268 /*
1279 * XXX: this is not the _current_ arrangement 1269 * XXX: this is not the _current_ arrangement
1280 * Here's my conclusion: 1270 * Here's my conclusion:
… …
1284 * in the GraphicsExpose parts, which means that after each refresh, 1274 * in the GraphicsExpose parts, which means that after each refresh,
1285 * we need to wait for the graphics expose or Noexpose events, 1275 * we need to wait for the graphics expose or Noexpose events,
1286 * which ought to make things real slow! 1276 * which ought to make things real slow!
1287 */ 1277 */
1288 case VisibilityNotify: 1278 case VisibilityNotify:
1289 switch (ev->xvisibility.state) 1279 switch (ev.xvisibility.state)
1290 { 1280 {
1291 case VisibilityUnobscured: 1281 case VisibilityUnobscured:
1292 refresh_type = FAST_REFRESH; 1282 refresh_type = FAST_REFRESH;
1293 break; 1283 break;
1294 case VisibilityPartiallyObscured: 1284 case VisibilityPartiallyObscured:
… …
1305 { 1295 {
1306 TermWin.focus = 1; 1296 TermWin.focus = 1;
1307 want_refresh = 1; 1297 want_refresh = 1;
1308#ifdef USE_XIM 1298#ifdef USE_XIM
1309 if (Input_Context != NULL) 1299 if (Input_Context != NULL)
1310 XSetICFocus(Input_Context); 1300 XSetICFocus (Input_Context);
1311#endif 1301#endif
1312#ifdef CURSOR_BLINK 1302#ifdef CURSOR_BLINK
1313 if (Options & Opt_cursorBlink) 1303 if (Options & Opt_cursorBlink)
1314 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1315#endif 1305#endif
… …
1322 { 1312 {
1323 TermWin.focus = 0; 1313 TermWin.focus = 0;
1324 want_refresh = 1; 1314 want_refresh = 1;
1325#ifdef USE_XIM 1315#ifdef USE_XIM
1326 if (Input_Context != NULL) 1316 if (Input_Context != NULL)
1327 XUnsetICFocus(Input_Context); 1317 XUnsetICFocus (Input_Context);
1328#endif 1318#endif
1329#ifdef CURSOR_BLINK 1319#ifdef CURSOR_BLINK
1330 if (Options & Opt_cursorBlink) 1320 if (Options & Opt_cursorBlink)
1331 cursor_blink_ev.stop (); 1321 cursor_blink_ev.stop ();
1332 hidden_cursor = 0; 1322 hidden_cursor = 0;
… …
1334 1324
1335 } 1325 }
1336 break; 1326 break;
1337 1327
1338 case ConfigureNotify: 1328 case ConfigureNotify:
1339 if (ev->xconfigure.window == TermWin.parent[0]) 1329 if (ev.xconfigure.window == TermWin.parent[0])
1340 { 1330 {
1341 int height, width; 1331 int height, width;
1342 1332
1343 do 1333 do
1344 { /* Wrap lots of configures into one */ 1334 { /* Wrap lots of configures into one */
1345 width = ev->xconfigure.width; 1335 width = ev.xconfigure.width;
1346 height = ev->xconfigure.height; 1336 height = ev.xconfigure.height;
1347 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1337 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1348 } 1338 }
1349 while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1339 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1350 ConfigureNotify, ev)); 1340
1351 if (szHint.width != width || szHint.height != height) 1341 if (szHint.width != width || szHint.height != height)
1352 { 1342 {
1353 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1343 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1354 resize_all_windows (width, height, 1); 1344 resize_all_windows (width, height, 1);
1355 } 1345 }
1356#ifdef DEBUG_SIZE 1346#ifdef DEBUG_SIZE
1357 else 1347 else
1358 { 1348 {
1359 D_SIZE((stderr, "Size: Not resizing")); 1349 D_SIZE ((stderr, "Size: Not resizing"));
1360 } 1350 }
1361#endif 1351#endif
1362#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1363 if (Options & Opt_transparent) 1353 if (Options & Opt_transparent)
1364 { 1354 {
… …
1370 1360
1371 } 1361 }
1372 break; 1362 break;
1373 1363
1374 case SelectionClear: 1364 case SelectionClear:
1375 selection_clear (); 1365 display->set_selection_owner (0);
1376 break; 1366 break;
1377 1367
1378 case SelectionNotify: 1368 case SelectionNotify:
1379 if (selection_wait == Sel_normal) 1369 if (selection_wait == Sel_normal)
1380 selection_paste (ev->xselection.requestor, 1370 selection_paste (ev.xselection.requestor,
1381 ev->xselection.property, True); 1371 ev.xselection.property, True);
1382 break; 1372 break;
1383 1373
1384 case SelectionRequest: 1374 case SelectionRequest:
1385 selection_send (&(ev->xselectionrequest)); 1375 selection_send (ev.xselectionrequest);
1386 break; 1376 break;
1387 1377
1388 case UnmapNotify: 1378 case UnmapNotify:
1389 TermWin.mapped = 0; 1379 TermWin.mapped = 0;
1390#ifdef TEXT_BLINK 1380#ifdef TEXT_BLINK
… …
1397#ifdef TEXT_BLINK 1387#ifdef TEXT_BLINK
1398 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1388 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1399#endif 1389#endif
1400 break; 1390 break;
1401 1391
1402 case PropertyNotify:
1403 if (ev->xproperty.atom == xa[XA_VT_SELECTION])
1404 {
1405 if (ev->xproperty.state == PropertyNewValue)
1406 selection_property (ev->xproperty.window,
1407 ev->xproperty.atom);
1408 break;
1409 }
1410#ifdef TRANSPARENT 1392#ifdef TRANSPARENT
1411 /*
1412 * if user used some Esetroot compatible prog to set the root bg,
1413 * use the property to determine the pixmap. We use it later on.
1414 */
1415 if (xa[XA_XROOTPMAPID] == 0)
1416 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1417 "_XROOTPMAP_ID", False);
1418 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1419 break;
1420 /* FALLTHROUGH */
1421 case ReparentNotify: 1393 case ReparentNotify:
1422 if ((Options & Opt_transparent) && check_our_parents ()) 1394 rootwin_cb (ev);
1423 { 1395 break;
1424 if (am_transparent)
1425 want_full_refresh = 1;
1426 }
1427#endif /* TRANSPARENT */ 1396#endif /* TRANSPARENT */
1428 break;
1429 1397
1430 case GraphicsExpose: 1398 case GraphicsExpose:
1431 case Expose: 1399 case Expose:
1432 if (ev->xany.window == TermWin.vt) 1400 if (ev.xany.window == TermWin.vt)
1433 { 1401 {
1434#ifdef NO_SLOW_LINK_SUPPORT 1402#ifdef NO_SLOW_LINK_SUPPORT
1435 scr_expose (ev->xexpose.x, ev->xexpose.y, 1403 scr_expose (ev.xexpose.x, ev.xexpose.y,
1436 ev->xexpose.width, ev->xexpose.height, False); 1404 ev.xexpose.width, ev.xexpose.height, False);
1437#else 1405#else
1438 // don't understand this, so commented it out 1406 // don't understand this, so commented it out
1439 scr_expose (ev->xexpose.x, ev->xexpose.y, 1407 scr_expose (ev.xexpose.x, ev.xexpose.y,
1440 ev->xexpose.width, ev->xexpose.height, False); 1408 ev.xexpose.width, ev.xexpose.height, False);
1441 //scr_expose (ev->xexpose.x, 0, 1409 //scr_expose (ev.xexpose.x, 0,
1442 // ev->xexpose.width, TermWin.height, False); 1410 // ev.xexpose.width, TermWin.height, False);
1443#endif 1411#endif
1444 want_refresh = 1; 1412 want_refresh = 1;
1445 } 1413 }
1446 else 1414 else
1447 { 1415 {
1448 XEvent unused_xevent; 1416 XEvent unused_event;
1449 1417
1450 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1418 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1451 Expose, 1419 Expose,
1452 &unused_xevent)) ; 1420 &unused_event)) ;
1453 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1421 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1454 GraphicsExpose, 1422 GraphicsExpose,
1455 &unused_xevent)) ; 1423 &unused_event)) ;
1456 if (isScrollbarWindow(ev->xany.window)) 1424 if (isScrollbarWindow (ev.xany.window))
1457 { 1425 {
1458 scrollBar.setIdle(); 1426 scrollBar.setIdle ();
1459 scrollbar_show (0); 1427 scrollbar_show (0);
1460 } 1428 }
1461#ifdef MENUBAR 1429#ifdef MENUBAR
1462 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1430 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1463 menubar_expose (); 1431 menubar_expose ();
1464#endif 1432#endif
1465#ifdef RXVT_GRAPHICS 1433#ifdef RXVT_GRAPHICS
1466 Gr_expose (ev->xany.window); 1434 Gr_expose (ev.xany.window);
1467#endif 1435#endif
1468 1436
1469 } 1437 }
1470 break; 1438 break;
1471 1439
… …
1473#ifdef POINTER_BLANK 1441#ifdef POINTER_BLANK
1474 if (hidden_pointer) 1442 if (hidden_pointer)
1475 pointer_unblank (); 1443 pointer_unblank ();
1476#endif 1444#endif
1477#if MENUBAR 1445#if MENUBAR
1478 if (isMenuBarWindow(ev->xany.window)) 1446 if (isMenuBarWindow (ev.xany.window))
1479 { 1447 {
1480 menubar_control (&(ev->xbutton)); 1448 menubar_control (& (ev.xbutton));
1481 break; 1449 break;
1482 } 1450 }
1483#endif 1451#endif
1484 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1452 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1485 break; 1453 break;
1486 1454
1487 if (ev->xany.window == TermWin.vt) 1455 if (ev.xany.window == TermWin.vt)
1488 { 1456 {
1489 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) 1457 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1490 { 1458 {
1491 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1459 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1492 MotionNotify, ev)) ; 1460 ;
1461
1493 XQueryPointer(Xdisplay, TermWin.vt, 1462 XQueryPointer (display->display, TermWin.vt,
1494 &unused_root, &unused_child, 1463 &unused_root, &unused_child,
1495 &unused_root_x, &unused_root_y, 1464 &unused_root_x, &unused_root_y,
1496 &(ev->xbutton.x), &(ev->xbutton.y), 1465 & (ev.xbutton.x), & (ev.xbutton.y),
1497 &unused_mask); 1466 &unused_mask);
1498#ifdef MOUSE_THRESHOLD 1467#ifdef MOUSE_THRESHOLD
1499 /* deal with a `jumpy' mouse */ 1468 /* deal with a `jumpy' mouse */
1500 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1469 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1501 { 1470 {
1502#endif 1471#endif
1503 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1472 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1504 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1473 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1505#ifdef SELECTION_SCROLLING 1474#ifdef SELECTION_SCROLLING
1506 if (ev->xbutton.y < TermWin.int_bwidth 1475 if (ev.xbutton.y < TermWin.int_bwidth
1507 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) 1476 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1508 { 1477 {
1509 int dist; 1478 int dist;
1510 1479
1511 pending_scroll_selection=1; 1480 pending_scroll_selection=1;
1512 1481
… …
1517 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1486 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1518 1487
1519 /* save the event params so we can highlight 1488 /* save the event params so we can highlight
1520 * the selection in the pending-scroll loop 1489 * the selection in the pending-scroll loop
1521 */ 1490 */
1522 selection_save_x=ev->xbutton.x; 1491 selection_save_x=ev.xbutton.x;
1523 selection_save_y=ev->xbutton.y; 1492 selection_save_y=ev.xbutton.y;
1524 selection_save_state= 1493 selection_save_state=
1525 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1494 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1526 1495
1527 /* calc number of lines to scroll */ 1496 /* calc number of lines to scroll */
1528 if (ev->xbutton.y<TermWin.int_bwidth) 1497 if (ev.xbutton.y<TermWin.int_bwidth)
1529 { 1498 {
1530 scroll_selection_dir = UP; 1499 scroll_selection_dir = UP;
1531 dist = TermWin.int_bwidth - ev->xbutton.y; 1500 dist = TermWin.int_bwidth - ev.xbutton.y;
1532 } 1501 }
1533 else 1502 else
1534 { 1503 {
1535 scroll_selection_dir = DN; 1504 scroll_selection_dir = DN;
1536 dist = ev->xbutton.y - 1505 dist = ev.xbutton.y -
1537 (TermWin.int_bwidth + TermWin.height); 1506 (TermWin.int_bwidth + TermWin.height);
1538 } 1507 }
1539 scroll_selection_lines=(Pixel2Height(dist)/ 1508 scroll_selection_lines= (Pixel2Height (dist)/
1540 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1509 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1541 MIN_IT(scroll_selection_lines, 1510 MIN_IT (scroll_selection_lines,
1542 SELECTION_SCROLL_MAX_LINES); 1511 SELECTION_SCROLL_MAX_LINES);
1543 } 1512 }
1544 else 1513 else
1545 { 1514 {
1546 /* we are within the text window, so we 1515 /* we are within the text window, so we
… …
1554 } 1523 }
1555#endif 1524#endif
1556 1525
1557 } 1526 }
1558 } 1527 }
1559 else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) 1528 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1560 { 1529 {
1561 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win, 1530 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1562 MotionNotify, ev)) ; 1531 MotionNotify, &ev)) ;
1563 XQueryPointer(Xdisplay, scrollBar.win, 1532 XQueryPointer (display->display, scrollBar.win,
1564 &unused_root, &unused_child, 1533 &unused_root, &unused_child,
1565 &unused_root_x, &unused_root_y, 1534 &unused_root_x, &unused_root_y,
1566 &(ev->xbutton.x), &(ev->xbutton.y), 1535 & (ev.xbutton.x), & (ev.xbutton.y),
1567 &unused_mask); 1536 &unused_mask);
1568 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO, 1537 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1569 scrollbar_size()); 1538 scrollbar_size ());
1570 scr_refresh (refresh_type); 1539 scr_refresh (refresh_type);
1571 refresh_limit = 0; 1540 refresh_limit = 0;
1572 scrollbar_show (1); 1541 scrollbar_show (1);
1573 } 1542 }
1574 break; 1543 break;
1575 } 1544 }
1576} 1545}
1577 1546
1578void 1547void
1548rxvt_term::rootwin_cb (XEvent &ev)
1549{
1550 SET_R (this);
1551 SET_LOCALE (locale);
1552
1553 switch (ev.type)
1554 {
1555 case PropertyNotify:
1556 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1557 {
1558 if (ev.xproperty.state == PropertyNewValue)
1559 selection_property (ev.xproperty.window, ev.xproperty.atom);
1560 break;
1561 }
1562#ifdef TRANSPARENT
1563 else
1564 {
1565 /*
1566 * if user used some Esetroot compatible prog to set the root bg,
1567 * use the property to determine the pixmap. We use it later on.
1568 */
1569 if (xa[XA_XROOTPMAPID] == 0)
1570 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1571
1572 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1573 return;
1574 }
1575
1576 /* FALLTHROUGH */
1577 case ReparentNotify:
1578 if ((Options & Opt_transparent) && check_our_parents ())
1579 if (am_transparent)
1580 want_full_refresh = 1;
1581 break;
1582#endif
1583 }
1584}
1585
1586void
1579rxvt_term::button_press (XButtonEvent *ev) 1587rxvt_term::button_press (const XButtonEvent &ev)
1580{ 1588{
1581 int reportmode = 0, clickintime; 1589 int reportmode = 0, clickintime;
1582 1590
1583 bypass_keystate = ev->state & (ModMetaMask | ShiftMask); 1591 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1584 if (!bypass_keystate) 1592 if (!bypass_keystate)
1585 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1593 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1586 /* 1594 /*
1587 * VT window processing of button press 1595 * VT window processing of button press
1588 */ 1596 */
1589 if (ev->window == TermWin.vt) 1597 if (ev.window == TermWin.vt)
1590 { 1598 {
1591#if RXVT_GRAPHICS 1599#if RXVT_GRAPHICS
1592 if (ev->subwindow != None) 1600 if (ev.subwindow != None)
1593 rxvt_Gr_ButtonPress (ev->x, ev->y); 1601 rxvt_Gr_ButtonPress (ev.x, ev.y);
1594 else 1602 else
1595#endif 1603#endif
1596 1604
1597 { 1605 {
1598 clickintime = ev->time - MEvent.time < MULTICLICK_TIME; 1606 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1599 if (reportmode) 1607 if (reportmode)
1600 { 1608 {
1601 /* mouse report from vt window */ 1609 /* mouse report from vt window */
1602 /* save the xbutton state (for ButtonRelease) */ 1610 /* save the xbutton state (for ButtonRelease) */
1603 MEvent.state = ev->state; 1611 MEvent.state = ev.state;
1604#ifdef MOUSE_REPORT_DOUBLECLICK 1612#ifdef MOUSE_REPORT_DOUBLECLICK
1605 if (ev->button == MEvent.button && clickintime) 1613 if (ev.button == MEvent.button && clickintime)
1606 { 1614 {
1607 /* same button, within alloted time */ 1615 /* same button, within alloted time */
1608 MEvent.clicks++; 1616 MEvent.clicks++;
1609 if (MEvent.clicks > 1) 1617 if (MEvent.clicks > 1)
1610 { 1618 {
… …
1619 } 1627 }
1620 else 1628 else
1621 { 1629 {
1622 /* different button, or time expired */ 1630 /* different button, or time expired */
1623 MEvent.clicks = 1; 1631 MEvent.clicks = 1;
1624 MEvent.button = ev->button; 1632 MEvent.button = ev.button;
1625 mouse_report (ev); 1633 mouse_report (ev);
1626 } 1634 }
1627#else 1635#else
1628 MEvent.button = ev->button; 1636 MEvent.button = ev.button;
1629 mouse_report (ev); 1637 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 1638#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 1639
1632 } 1640 }
1633 else 1641 else
1634 { 1642 {
1635 if (ev->button != MEvent.button) 1643 if (ev.button != MEvent.button)
1636 MEvent.clicks = 0; 1644 MEvent.clicks = 0;
1637 switch (ev->button) 1645 switch (ev.button)
1638 { 1646 {
1639 case Button1: 1647 case Button1:
1640 /* allow shift+left click to extend selection */ 1648 /* allow shift+left click to extend selection */
1641 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1649 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1642 { 1650 {
1643 if (MEvent.button == Button1 && clickintime) 1651 if (MEvent.button == Button1 && clickintime)
1644 selection_rotate (ev->x, ev->y); 1652 selection_rotate (ev.x, ev.y);
1645 else 1653 else
1646 selection_extend (ev->x, ev->y, 1); 1654 selection_extend (ev.x, ev.y, 1);
1647 } 1655 }
1648 else 1656 else
1649 { 1657 {
1650 if (MEvent.button == Button1 && clickintime) 1658 if (MEvent.button == Button1 && clickintime)
1651 MEvent.clicks++; 1659 MEvent.clicks++;
1652 else 1660 else
1653 MEvent.clicks = 1; 1661 MEvent.clicks = 1;
1654 1662
1655 selection_click (MEvent.clicks, ev->x, ev->y); 1663 selection_click (MEvent.clicks, ev.x, ev.y);
1656 } 1664 }
1657 1665
1658 MEvent.button = Button1; 1666 MEvent.button = Button1;
1659 break; 1667 break;
1660 1668
1661 case Button3: 1669 case Button3:
1662 if (MEvent.button == Button3 && clickintime) 1670 if (MEvent.button == Button3 && clickintime)
1663 selection_rotate (ev->x, ev->y); 1671 selection_rotate (ev.x, ev.y);
1664 else 1672 else
1665 selection_extend (ev->x, ev->y, 1); 1673 selection_extend (ev.x, ev.y, 1);
1666 MEvent.button = Button3; 1674 MEvent.button = Button3;
1667 break; 1675 break;
1668 } 1676 }
1669 } 1677 }
1670 MEvent.time = ev->time; 1678 MEvent.time = ev.time;
1671 return; 1679 return;
1672 } 1680 }
1673 } 1681 }
1674 1682
1675 /* 1683 /*
1676 * Scrollbar window processing of button press 1684 * Scrollbar window processing of button press
1677 */ 1685 */
1678 if (isScrollbarWindow(ev->window)) 1686 if (isScrollbarWindow (ev.window))
1679 { 1687 {
1680 scrollBar.setIdle (); 1688 scrollBar.setIdle ();
1681 /* 1689 /*
1682 * Rxvt-style scrollbar: 1690 * Rxvt-style scrollbar:
1683 * move up if mouse is above slider 1691 * move up if mouse is above slider
… …
1695 * Mouse report disabled scrollbar: 1703 * Mouse report disabled scrollbar:
1696 * arrow buttons - send up/down 1704 * arrow buttons - send up/down
1697 * click on scrollbar - send pageup/down 1705 * click on scrollbar - send pageup/down
1698 */ 1706 */
1699 if ((scrollBar.style == R_SB_NEXT 1707 if ((scrollBar.style == R_SB_NEXT
1700 && scrollbarnext_upButton(ev->y)) 1708 && scrollbarnext_upButton (ev.y))
1701 || (scrollBar.style == R_SB_RXVT 1709 || (scrollBar.style == R_SB_RXVT
1702 && scrollbarrxvt_upButton(ev->y))) 1710 && scrollbarrxvt_upButton (ev.y)))
1703 tt_printf("\033[A"); 1711 tt_printf ("\033[A");
1704 else if ((scrollBar.style == R_SB_NEXT 1712 else if ((scrollBar.style == R_SB_NEXT
1705 && scrollbarnext_dnButton(ev->y)) 1713 && scrollbarnext_dnButton (ev.y))
1706 || (scrollBar.style == R_SB_RXVT 1714 || (scrollBar.style == R_SB_RXVT
1707 && scrollbarrxvt_dnButton(ev->y))) 1715 && scrollbarrxvt_dnButton (ev.y)))
1708 tt_printf("\033[B"); 1716 tt_printf ("\033[B");
1709 else 1717 else
1710 switch (ev->button) 1718 switch (ev.button)
1711 { 1719 {
1712 case Button2: 1720 case Button2:
1713 tt_printf("\014"); 1721 tt_printf ("\014");
1714 break; 1722 break;
1715 case Button1: 1723 case Button1:
1716 tt_printf("\033[6~"); 1724 tt_printf ("\033[6~");
1717 break; 1725 break;
1718 case Button3: 1726 case Button3:
1719 tt_printf("\033[5~"); 1727 tt_printf ("\033[5~");
1720 break; 1728 break;
1721 } 1729 }
1722 } 1730 }
1723 else 1731 else
1724#endif /* NO_SCROLLBAR_REPORT */ 1732#endif /* NO_SCROLLBAR_REPORT */
… …
1726 { 1734 {
1727 char upordown = 0; 1735 char upordown = 0;
1728 1736
1729 if (scrollBar.style == R_SB_NEXT) 1737 if (scrollBar.style == R_SB_NEXT)
1730 { 1738 {
1731 if (scrollbarnext_upButton(ev->y)) 1739 if (scrollbarnext_upButton (ev.y))
1732 upordown = -1; /* up */ 1740 upordown = -1; /* up */
1733 else if (scrollbarnext_dnButton(ev->y)) 1741 else if (scrollbarnext_dnButton (ev.y))
1734 upordown = 1; /* down */ 1742 upordown = 1; /* down */
1735 } 1743 }
1736 else if (scrollBar.style == R_SB_RXVT) 1744 else if (scrollBar.style == R_SB_RXVT)
1737 { 1745 {
1738 if (scrollbarrxvt_upButton(ev->y)) 1746 if (scrollbarrxvt_upButton (ev.y))
1739 upordown = -1; /* up */ 1747 upordown = -1; /* up */
1740 else if (scrollbarrxvt_dnButton(ev->y)) 1748 else if (scrollbarrxvt_dnButton (ev.y))
1741 upordown = 1; /* down */ 1749 upordown = 1; /* down */
1742 } 1750 }
1743 if (upordown) 1751 if (upordown)
1744 { 1752 {
1745#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
1752 else 1760 else
1753 scrollBar.setDn (); 1761 scrollBar.setDn ();
1754 } 1762 }
1755 } 1763 }
1756 else 1764 else
1757 switch (ev->button) 1765 switch (ev.button)
1758 { 1766 {
1759 case Button2: 1767 case Button2:
1760 switch (scrollbar_align) 1768 switch (scrollbar_align)
1761 { 1769 {
1762 case R_SB_ALIGN_TOP: 1770 case R_SB_ALIGN_TOP:
… …
1768 case R_SB_ALIGN_BOTTOM: 1776 case R_SB_ALIGN_BOTTOM:
1769 csrO = scrollBar.bot - scrollBar.top; 1777 csrO = scrollBar.bot - scrollBar.top;
1770 break; 1778 break;
1771 } 1779 }
1772 if (scrollBar.style == R_SB_XTERM 1780 if (scrollBar.style == R_SB_XTERM
1773 || scrollbar_above_slider(ev->y) 1781 || scrollbar_above_slider (ev.y)
1774 || scrollbar_below_slider(ev->y)) 1782 || scrollbar_below_slider (ev.y))
1775 scr_move_to ( scrollbar_position(ev->y) - csrO, 1783 scr_move_to ( scrollbar_position (ev.y) - csrO,
1776 scrollbar_size()); 1784 scrollbar_size ());
1777 scrollBar.setMotion (); 1785 scrollBar.setMotion ();
1778 break; 1786 break;
1779 1787
1780 case Button1: 1788 case Button1:
1781 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1789 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1782 csrO = ev->y - scrollBar.top; 1790 csrO = ev.y - scrollBar.top;
1783 /* FALLTHROUGH */ 1791 /* FALLTHROUGH */
1784 1792
1785 case Button3: 1793 case Button3:
1786 if (scrollBar.style != R_SB_XTERM) 1794 if (scrollBar.style != R_SB_XTERM)
1787 { 1795 {
1788 if (scrollbar_above_slider(ev->y)) 1796 if (scrollbar_above_slider (ev.y))
1789# ifdef RXVT_SCROLL_FULL 1797# ifdef RXVT_SCROLL_FULL
1790 scr_page (UP, TermWin.nrow - 1); 1798 scr_page (UP, TermWin.nrow - 1);
1791# else 1799# else
1792 scr_page (UP, TermWin.nrow / 4); 1800 scr_page (UP, TermWin.nrow / 4);
1793# endif 1801# endif
1794 else if (scrollbar_below_slider(ev->y)) 1802 else if (scrollbar_below_slider (ev.y))
1795# ifdef RXVT_SCROLL_FULL 1803# ifdef RXVT_SCROLL_FULL
1796 scr_page (DN, TermWin.nrow - 1); 1804 scr_page (DN, TermWin.nrow - 1);
1797# else 1805# else
1798 scr_page (DN, TermWin.nrow / 4); 1806 scr_page (DN, TermWin.nrow / 4);
1799# endif 1807# endif
1800 else 1808 else
1801 scrollBar.setMotion (); 1809 scrollBar.setMotion ();
1802 } 1810 }
1803 else 1811 else
1804 { 1812 {
1805 scr_page ((ev->button == Button1 ? DN : UP), 1813 scr_page ((ev.button == Button1 ? DN : UP),
1806 (TermWin.nrow 1814 (TermWin.nrow
1807 * scrollbar_position(ev->y) 1815 * scrollbar_position (ev.y)
1808 / scrollbar_size())); 1816 / scrollbar_size ()));
1809 } 1817 }
1810 break; 1818 break;
1811 } 1819 }
1812 } 1820 }
1813 return; 1821 return;
1814 } 1822 }
1815#if MENUBAR 1823#if MENUBAR
1816 /* 1824 /*
1817 * Menubar window processing of button press 1825 * Menubar window processing of button press
1818 */ 1826 */
1819 if (isMenuBarWindow(ev->window)) 1827 if (isMenuBarWindow (ev.window))
1820 menubar_control (ev); 1828 menubar_control (ev);
1821#endif 1829#endif
1822} 1830}
1823 1831
1824void 1832void
1825rxvt_term::button_release (XButtonEvent *ev) 1833rxvt_term::button_release (const XButtonEvent &ev)
1826{ 1834{
1827 int reportmode = 0; 1835 int reportmode = 0;
1828 1836
1829 csrO = 0; /* reset csr Offset */ 1837 csrO = 0; /* reset csr Offset */
1830 if (!bypass_keystate) 1838 if (!bypass_keystate)
1831 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1839 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1832 1840
1833 if (scrollbar_isUpDn()) 1841 if (scrollbar_isUpDn ())
1834 { 1842 {
1835 scrollBar.setIdle (); 1843 scrollBar.setIdle ();
1836 scrollbar_show (0); 1844 scrollbar_show (0);
1837#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1845#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1838 refresh_type &= ~SMOOTH_REFRESH; 1846 refresh_type &= ~SMOOTH_REFRESH;
… …
1840 1848
1841 } 1849 }
1842#ifdef SELECTION_SCROLLING 1850#ifdef SELECTION_SCROLLING
1843 pending_scroll_selection=0; 1851 pending_scroll_selection=0;
1844#endif 1852#endif
1845 if (ev->window == TermWin.vt) 1853 if (ev.window == TermWin.vt)
1846 { 1854 {
1847#ifdef RXVT_GRAPHICS 1855#ifdef RXVT_GRAPHICS
1848 if (ev->subwindow != None) 1856 if (ev.subwindow != None)
1849 rxvt_Gr_ButtonRelease(ev->x, ev->y); 1857 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1850 else 1858 else
1851#endif 1859#endif
1852 1860
1853 { 1861 {
1854 if (reportmode) 1862 if (reportmode)
1855 { 1863 {
1856 /* mouse report from vt window */ 1864 /* mouse report from vt window */
1857 /* don't report release of wheel "buttons" */ 1865 /* don't report release of wheel "buttons" */
1858 if (ev->button >= 4) 1866 if (ev.button >= 4)
1859 return; 1867 return;
1860#ifdef MOUSE_REPORT_DOUBLECLICK 1868#ifdef MOUSE_REPORT_DOUBLECLICK
1861 /* only report the release of 'slow' single clicks */ 1869 /* only report the release of 'slow' single clicks */
1862 if (MEvent.button != AnyButton 1870 if (MEvent.button != AnyButton
1863 && (ev->button != MEvent.button 1871 && (ev.button != MEvent.button
1864 || (ev->time - MEvent.time 1872 || (ev.time - MEvent.time
1865 > MULTICLICK_TIME / 2))) 1873 > MULTICLICK_TIME / 2)))
1866 { 1874 {
1867 MEvent.clicks = 0; 1875 MEvent.clicks = 0;
1868 MEvent.button = AnyButton; 1876 MEvent.button = AnyButton;
1869 mouse_report (ev); 1877 mouse_report (ev);
… …
1878 * dumb hack to compensate for the failure of click-and-drag 1886 * dumb hack to compensate for the failure of click-and-drag
1879 * when overriding mouse reporting 1887 * when overriding mouse reporting
1880 */ 1888 */
1881 if (PrivateModes & PrivMode_mouse_report 1889 if (PrivateModes & PrivMode_mouse_report
1882 && bypass_keystate 1890 && bypass_keystate
1883 && ev->button == Button1 && MEvent.clicks <= 1) 1891 && ev.button == Button1 && MEvent.clicks <= 1)
1884 selection_extend (ev->x, ev->y, 0); 1892 selection_extend (ev.x, ev.y, 0);
1885 1893
1886 switch (ev->button) 1894 switch (ev.button)
1887 { 1895 {
1888 case Button1: 1896 case Button1:
1889 case Button3: 1897 case Button3:
1890 selection_make (ev->time); 1898 selection_make (ev.time);
1891 break; 1899 break;
1892 case Button2: 1900 case Button2:
1893 selection_request (ev->time, ev->x, ev->y); 1901 selection_request (ev.time, ev.x, ev.y);
1894 break; 1902 break;
1895#ifdef MOUSE_WHEEL 1903#ifdef MOUSE_WHEEL
1896 case Button4: 1904 case Button4:
1897 case Button5: 1905 case Button5:
1898 { 1906 {
1899 int i; 1907 int i;
1900 page_dirn v; 1908 page_dirn v;
1901 1909
1902 v = (ev->button == Button4) ? UP : DN; 1910 v = (ev.button == Button4) ? UP : DN;
1903 if (ev->state & ShiftMask) 1911 if (ev.state & ShiftMask)
1904 i = 1; 1912 i = 1;
1905 else if ((Options & Opt_mouseWheelScrollPage)) 1913 else if ((Options & Opt_mouseWheelScrollPage))
1906 i = TermWin.nrow - 1; 1914 i = TermWin.nrow - 1;
1907 else 1915 else
1908 i = 5; 1916 i = 5;
1909# ifdef MOUSE_SLIP_WHEELING 1917# ifdef MOUSE_SLIP_WHEELING
1910 if (ev->state & ControlMask) 1918 if (ev.state & ControlMask)
1911 { 1919 {
1912 mouse_slip_wheel_speed += (v ? -1 : 1); 1920 mouse_slip_wheel_speed += (v ? -1 : 1);
1913 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1921 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1914 } 1922 }
1915# endif 1923# endif
… …
1932 1940
1933 } 1941 }
1934 } 1942 }
1935 } 1943 }
1936#ifdef MENUBAR 1944#ifdef MENUBAR
1937 else if (isMenuBarWindow(ev->window)) 1945 else if (isMenuBarWindow (ev.window))
1938 menubar_control (ev); 1946 menubar_control (ev);
1939#endif 1947#endif
1940} 1948}
1941 1949
1942 1950
… …
1956 Pixmap rootpixmap = None; 1964 Pixmap rootpixmap = None;
1957 XWindowAttributes wattr, wrootattr; 1965 XWindowAttributes wattr, wrootattr;
1958 1966
1959 pchanged = 0; 1967 pchanged = 0;
1960 1968
1961 if (!(Options & Opt_transparent)) 1969 if (! (Options & Opt_transparent))
1962 return pchanged; /* Don't try any more */ 1970 return pchanged; /* Don't try any more */
1963 1971
1964 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1972 XGetWindowAttributes (display->display, display->root, &wrootattr);
1965 rootdepth = wrootattr.depth; 1973 rootdepth = wrootattr.depth;
1966 1974
1967 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1975 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1968 if (rootdepth != wattr.depth) 1976 if (rootdepth != wattr.depth)
1969 { 1977 {
1970 if (am_transparent) 1978 if (am_transparent)
1971 { 1979 {
1972 pchanged = 1; 1980 pchanged = 1;
1973 XSetWindowBackground(Xdisplay, TermWin.vt, 1981 XSetWindowBackground (display->display, TermWin.vt,
1974 PixColors[Color_bg]); 1982 PixColors[Color_bg]);
1975 am_transparent = am_pixmap_trans = 0; 1983 am_transparent = am_pixmap_trans = 0;
1976 } 1984 }
1977 return pchanged; /* Don't try any more */ 1985 return pchanged; /* Don't try any more */
1978 } 1986 }
1979 1987
1980 /* Get all X ops out of the queue so that our information is up-to-date. */ 1988 /* Get all X ops out of the queue so that our information is up-to-date. */
1981 XSync(Xdisplay, False); 1989 XSync (display->display, False);
1982 1990
1983 /* 1991 /*
1984 * Make the frame window set by the window manager have 1992 * Make the frame window set by the window manager have
1985 * the root background. Some window managers put multiple nested frame 1993 * the root background. Some window managers put multiple nested frame
1986 * windows for each client, so we have to take care about that. 1994 * windows for each client, so we have to take care about that.
1987 */ 1995 */
1988 i = (xa[XA_XROOTPMAPID] != 0 1996 i = (xa[XA_XROOTPMAPID] != 0
1989 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1997 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1990 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1998 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1991 &nitems, &bytes_after, &prop) == Success)); 1999 &nitems, &bytes_after, &prop) == Success));
1992 if (!i || prop == NULL) 2000 if (!i || prop == NULL)
1993 have_pixmap = 0; 2001 have_pixmap = 0;
1994 else 2002 else
1995 { 2003 {
1996 have_pixmap = 1; 2004 have_pixmap = 1;
1997 rootpixmap = *((Pixmap *)prop); 2005 rootpixmap = * ((Pixmap *)prop);
1998 XFree(prop); 2006 XFree (prop);
1999 } 2007 }
2000 if (have_pixmap) 2008 if (have_pixmap)
2001 { 2009 {
2002 /* 2010 /*
2003 * Copy Xroot pixmap transparency 2011 * Copy display->root pixmap transparency
2004 */ 2012 */
2005 int sx, sy, nx, ny; 2013 int sx, sy, nx, ny;
2006 unsigned int nw, nh; 2014 unsigned int nw, nh;
2007 Window cr; 2015 Window cr;
2008 XImage *image; 2016 XImage *image;
2009 GC gc; 2017 GC gc;
2010 XGCValues gcvalue; 2018 XGCValues gcvalue;
2011 2019
2012 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 2020 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2013 0, 0, &sx, &sy, &cr); 2021 0, 0, &sx, &sy, &cr);
2014 nw = (unsigned int)szHint.width; 2022 nw = (unsigned int)szHint.width;
2015 nh = (unsigned int)szHint.height; 2023 nh = (unsigned int)szHint.height;
2016 nx = ny = 0; 2024 nx = ny = 0;
2017 if (sx < 0) 2025 if (sx < 0)
… …
2024 { 2032 {
2025 nh += sy; 2033 nh += sy;
2026 ny = -sy; 2034 ny = -sy;
2027 sy = 0; 2035 sy = 0;
2028 } 2036 }
2029 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2031 allowedxerror = -1; 2039 allowedxerror = -1;
2032 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2033 ZPixmap); 2041 ZPixmap);
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 2043 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 2044 allowedxerror = 0;
2037 if (image == NULL) 2045 if (image == NULL)
… …
2039 if (am_transparent && am_pixmap_trans) 2047 if (am_transparent && am_pixmap_trans)
2040 { 2048 {
2041 pchanged = 1; 2049 pchanged = 1;
2042 if (TermWin.pixmap != None) 2050 if (TermWin.pixmap != None)
2043 { 2051 {
2044 XFreePixmap(Xdisplay, TermWin.pixmap); 2052 XFreePixmap (display->display, TermWin.pixmap);
2045 TermWin.pixmap = None; 2053 TermWin.pixmap = None;
2046 } 2054 }
2047 } 2055 }
2048 am_pixmap_trans = 0; 2056 am_pixmap_trans = 0;
2049 } 2057 }
2050 else 2058 else
2051 { 2059 {
2052 if (TermWin.pixmap != None) 2060 if (TermWin.pixmap != None)
2053 XFreePixmap(Xdisplay, TermWin.pixmap); 2061 XFreePixmap (display->display, TermWin.pixmap);
2054 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2062 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2055 (unsigned int)szHint.width, 2063 (unsigned int)szHint.width,
2056 (unsigned int)szHint.height, 2064 (unsigned int)szHint.height,
2057 (unsigned int)image->depth); 2065 (unsigned int)image->depth);
2058 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2066 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2059 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2067 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2060 nx, ny, (unsigned int)image->width, 2068 nx, ny, (unsigned int)image->width,
2061 (unsigned int)image->height); 2069 (unsigned int)image->height);
2062 XFreeGC(Xdisplay, gc); 2070 XFreeGC (display->display, gc);
2063 XDestroyImage(image); 2071 XDestroyImage (image);
2064 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2072 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2065 TermWin.pixmap); 2073 TermWin.pixmap);
2066 if (!am_transparent || !am_pixmap_trans) 2074 if (!am_transparent || !am_pixmap_trans)
2067 pchanged = 1; 2075 pchanged = 1;
2068 am_transparent = am_pixmap_trans = 1; 2076 am_transparent = am_pixmap_trans = 1;
2069 } 2077 }
… …
2072 { 2080 {
2073 unsigned int n; 2081 unsigned int n;
2074 /* 2082 /*
2075 * InheritPixmap transparency 2083 * InheritPixmap transparency
2076 */ 2084 */
2077 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2085 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2078 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2086 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2079 i++) 2087 i++)
2080 { 2088 {
2081 oldp = TermWin.parent[i]; 2089 oldp = TermWin.parent[i];
2082 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2090 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2083 &TermWin.parent[i], &list, &n); 2091 &TermWin.parent[i], &list, &n);
2084 XFree(list); 2092 XFree (list);
2085 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2093 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2086 if (TermWin.parent[i] == Xroot) 2094 if (TermWin.parent[i] == display->root)
2087 { 2095 {
2088 if (oldp != None) 2096 if (oldp != None)
2089 pchanged = 1; 2097 pchanged = 1;
2090 break; 2098 break;
2091 } 2099 }
… …
2095 n = 0; 2103 n = 0;
2096 if (pchanged) 2104 if (pchanged)
2097 { 2105 {
2098 for (; n < (unsigned int)i; n++) 2106 for (; n < (unsigned int)i; n++)
2099 { 2107 {
2100 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2108 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2101 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2109 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2102 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2110 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2103 { 2111 {
2104 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2112 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2105 break; 2113 break;
2106 } 2114 }
2107 } 2115 }
2108 } 2116 }
2109 if (n > (int)(sizeof(TermWin.parent) 2117 if (n > (int) (sizeof (TermWin.parent)
2110 / sizeof(TermWin.parent[0]))) 2118 / sizeof (TermWin.parent[0])))
2111 { 2119 {
2112 D_X((stderr, "InheritPixmap Turning off")); 2120 D_X ((stderr, "InheritPixmap Turning off"));
2113 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2121 XSetWindowBackground (display->display, TermWin.parent[0],
2114 PixColors[Color_fg]); 2122 PixColors[Color_fg]);
2115 XSetWindowBackground(Xdisplay, TermWin.vt, 2123 XSetWindowBackground (display->display, TermWin.vt,
2116 PixColors[Color_bg]); 2124 PixColors[Color_bg]);
2117 am_transparent = 0; 2125 am_transparent = 0;
2118 /* XXX: also turn off Opt_transparent? */ 2126 /* XXX: also turn off Opt_transparent? */
2119 } 2127 }
2120 else 2128 else
… …
2124# ifdef HAVE_NANOSLEEP 2132# ifdef HAVE_NANOSLEEP
2125 struct timespec rqt; 2133 struct timespec rqt;
2126 2134
2127 rqt.tv_sec = 1; 2135 rqt.tv_sec = 1;
2128 rqt.tv_nsec = 0; 2136 rqt.tv_nsec = 0;
2129 nanosleep(&rqt, NULL); 2137 nanosleep (&rqt, NULL);
2130# else 2138# else
2131 sleep(1); 2139 sleep (1);
2132# endif 2140# endif
2133 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2141 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2134 for (n = 0; n < (unsigned int)i; n++) 2142 for (n = 0; n < (unsigned int)i; n++)
2135 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2143 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2136 ParentRelative); 2144 ParentRelative);
2137 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2145 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2138 ParentRelative); 2146 ParentRelative);
2139 am_transparent = 1; 2147 am_transparent = 1;
2140 } 2148 }
2141 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2149 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2142 TermWin.parent[i] = None; 2150 TermWin.parent[i] = None;
2143 } 2151 }
2144 return pchanged; 2152 return pchanged;
2145} 2153}
2146#endif 2154#endif
… …
2151/*----------------------------------------------------------------------*/ 2159/*----------------------------------------------------------------------*/
2152#ifdef PRINTPIPE 2160#ifdef PRINTPIPE
2153FILE * 2161FILE *
2154rxvt_term::popen_printer () 2162rxvt_term::popen_printer ()
2155{ 2163{
2156 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2164 FILE *stream = popen (rs[Rs_print_pipe], "w");
2157 2165
2158 if (stream == NULL) 2166 if (stream == NULL)
2159 rxvt_print_error("can't open printer pipe"); 2167 rxvt_print_error ("can't open printer pipe");
2160 return stream; 2168 return stream;
2161} 2169}
2162 2170
2163int 2171int
2164rxvt_term::pclose_printer (FILE *stream) 2172rxvt_term::pclose_printer (FILE *stream)
2165{ 2173{
2166 fflush (stream); 2174 fflush (stream);
2167 /* pclose() reported not to work on SunOS 4.1.3 */ 2175 /* pclose () reported not to work on SunOS 4.1.3 */
2168# if defined (__sun__) /* TODO: RESOLVE THIS */ 2176# if defined (__sun__) /* TODO: RESOLVE THIS */
2169 /* pclose works provided SIGCHLD handler uses waitpid */ 2177 /* pclose works provided SIGCHLD handler uses waitpid */
2170 return pclose (stream); /* return fclose (stream); */ 2178 return pclose (stream); /* return fclose (stream); */
2171# else 2179# else
2172 return pclose (stream); 2180 return pclose (stream);
… …
2195 unsigned char ch; 2203 unsigned char ch;
2196 unsigned int i, len; 2204 unsigned int i, len;
2197 2205
2198 if ((ch = cmd_getc ()) != C0_ESC) 2206 if ((ch = cmd_getc ()) != C0_ESC)
2199 { 2207 {
2200 if (putc(ch, fd) == EOF) 2208 if (putc (ch, fd) == EOF)
2201 break; /* done = 1 */ 2209 break; /* done = 1 */
2202 } 2210 }
2203 else 2211 else
2204 { 2212 {
2205 len = 0; 2213 len = 0;
… …
2217 if ((buf[len++] = cmd_getc ()) == 'i') 2225 if ((buf[len++] = cmd_getc ()) == 'i')
2218 break; /* done = 1 */ 2226 break; /* done = 1 */
2219 } 2227 }
2220 } 2228 }
2221 for (i = 0; i < len; i++) 2229 for (i = 0; i < len; i++)
2222 if (putc(buf[i], fd) == EOF) 2230 if (putc (buf[i], fd) == EOF)
2223 { 2231 {
2224 done = 1; 2232 done = 1;
2225 break; 2233 break;
2226 } 2234 }
2227 } 2235 }
… …
2247{ 2255{
2248 switch (ch) 2256 switch (ch)
2249 { 2257 {
2250 case C0_ENQ: /* terminal Status */ 2258 case C0_ENQ: /* terminal Status */
2251 if (rs[Rs_answerbackstring]) 2259 if (rs[Rs_answerbackstring])
2252 tt_write( 2260 tt_write (
2253 (const unsigned char *)rs[Rs_answerbackstring], 2261 (const unsigned char *)rs[Rs_answerbackstring],
2254 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2262 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2255 else 2263 else
2256 tt_write((unsigned char *)VT100_ANS, 2264 tt_write ((unsigned char *)VT100_ANS,
2257 (unsigned int)STRLEN(VT100_ANS)); 2265 (unsigned int)STRLEN (VT100_ANS));
2258 break; 2266 break;
2259 case C0_BEL: /* bell */ 2267 case C0_BEL: /* bell */
2260 scr_bell (); 2268 scr_bell ();
2261 break; 2269 break;
2262 case C0_BS: /* backspace */ 2270 case C0_BS: /* backspace */
… …
2324 row = cmd_getc () - ' '; 2332 row = cmd_getc () - ' ';
2325 col = cmd_getc () - ' '; 2333 col = cmd_getc () - ' ';
2326 scr_gotorc (row, col, 0); 2334 scr_gotorc (row, col, 0);
2327 break; 2335 break;
2328 case 'Z': /* identify the terminal type */ 2336 case 'Z': /* identify the terminal type */
2329 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2337 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2330 break; 2338 break;
2331 case '<': /* turn off VT52 mode */ 2339 case '<': /* turn off VT52 mode */
2332 PrivMode(0, PrivMode_vt52); 2340 PrivMode (0, PrivMode_vt52);
2333 break; 2341 break;
2334 case 'F': /* use special graphics character set */ 2342 case 'F': /* use special graphics character set */
2335 case 'G': /* use regular character set */ 2343 case 'G': /* use regular character set */
2336 /* unimplemented */ 2344 /* unimplemented */
2337 break; 2345 break;
… …
2396 scr_forwardindex (); 2404 scr_forwardindex ();
2397 break; 2405 break;
2398#endif 2406#endif
2399 case '=': 2407 case '=':
2400 case '>': 2408 case '>':
2401 PrivMode((ch == '='), PrivMode_aplKP); 2409 PrivMode ((ch == '='), PrivMode_aplKP);
2402 break; 2410 break;
2403 2411
2404 case C1_40: 2412 case C1_40:
2405 cmd_getc (); 2413 cmd_getc ();
2406 break; 2414 break;
… …
2442 process_dcs_seq (); 2450 process_dcs_seq ();
2443 break; 2451 break;
2444 2452
2445 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2453 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2446 case C1_SCI: /* ESC Z */ 2454 case C1_SCI: /* ESC Z */
2447 tt_write((const unsigned char *)ESCZ_ANSWER, 2455 tt_write ((const unsigned char *)ESCZ_ANSWER,
2448 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2456 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2449 break; /* steal obsolete ESC [ c */ 2457 break; /* steal obsolete ESC [ c */
2450 2458
2451 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2459 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2452 case C1_CSI: /* ESC [ */ 2460 case C1_CSI: /* ESC [ */
2453 process_csi_seq (); 2461 process_csi_seq ();
… …
2493 2501
2494#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2502#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2495 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2503 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2496 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2504 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2497#define get_byte_array_bit(array, bit) \ 2505#define get_byte_array_bit(array, bit) \
2498 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2506 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2499 2507
2500const unsigned char csi_defaults[] = 2508const unsigned char csi_defaults[] =
2501 { 2509 {
2502 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2510 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2503 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2511 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2504 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2512 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2505 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2513 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2506 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2514 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2507 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2515 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2508 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2516 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2509 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2517 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2510 }; 2518 };
2511/* *INDENT-ON* */ 2519/* *INDENT-ON* */
2512 2520
2513void 2521void
2514rxvt_term::process_csi_seq () 2522rxvt_term::process_csi_seq ()
… …
2529 ch = cmd_getc (); 2537 ch = cmd_getc ();
2530 } 2538 }
2531 /* read any numerical arguments */ 2539 /* read any numerical arguments */
2532 for (n = -1; ch < CSI_ICH; ) 2540 for (n = -1; ch < CSI_ICH; )
2533 { 2541 {
2534 if (isdigit(ch)) 2542 if (isdigit (ch))
2535 { 2543 {
2536 if (n < 0) 2544 if (n < 0)
2537 n = ch - '0'; 2545 n = ch - '0';
2538 else 2546 else
2539 n = n * 10 + ch - '0'; 2547 n = n * 10 + ch - '0';
… …
2565 2573
2566 if (nargs < ESC_ARGS) 2574 if (nargs < ESC_ARGS)
2567 arg[nargs++] = n; 2575 arg[nargs++] = n;
2568 2576
2569 i = ch - CSI_ICH; 2577 i = ch - CSI_ICH;
2570 ndef = get_byte_array_bit(csi_defaults, i); 2578 ndef = get_byte_array_bit (csi_defaults, i);
2571 for (p = 0; p < nargs; p++) 2579 for (p = 0; p < nargs; p++)
2572 if (arg[p] == -1) 2580 if (arg[p] == -1)
2573 arg[p] = ndef; 2581 arg[p] = ndef;
2574 2582
2575#ifdef DEBUG_CMD 2583#ifdef DEBUG_CMD
2576 fprintf(stderr, "CSI "); 2584 fprintf (stderr, "CSI ");
2577 for (p = 0; p < nargs; p++) 2585 for (p = 0; p < nargs; p++)
2578 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2586 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2579 fprintf(stderr, "%c\n", ch); 2587 fprintf (stderr, "%c\n", ch);
2580#endif 2588#endif
2581 2589
2582 /* 2590 /*
2583 * private mode handling 2591 * private mode handling
2584 */ 2592 */
… …
2586 { 2594 {
2587 switch (priv) 2595 switch (priv)
2588 { 2596 {
2589 case '>': 2597 case '>':
2590 if (ch == CSI_DA) /* secondary device attributes */ 2598 if (ch == CSI_DA) /* secondary device attributes */
2591 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2599 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2592 break; 2600 break;
2593 case '?': 2601 case '?':
2594 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2602 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2595 process_terminal_mode (ch, priv, nargs, arg); 2603 process_terminal_mode (ch, priv, nargs, arg);
2596 break; 2604 break;
… …
2599 } 2607 }
2600 2608
2601 switch (ch) 2609 switch (ch)
2602 { 2610 {
2603 /* 2611 /*
2604 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2612 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2605 */ 2613 */
2606#ifdef PRINTPIPE 2614#ifdef PRINTPIPE
2607 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2615 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2608 switch (arg[0]) 2616 switch (arg[0])
2609 { 2617 {
… …
2705 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2713 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2706 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2714 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2707 break; 2715 break;
2708 2716
2709 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2717 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2710 tt_write((const unsigned char *)VT100_ANS, 2718 tt_write ((const unsigned char *)VT100_ANS,
2711 (unsigned int)(sizeof(VT100_ANS) - 1)); 2719 (unsigned int) (sizeof (VT100_ANS) - 1));
2712 break; 2720 break;
2713 2721
2714 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2722 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2715 process_sgr_mode (nargs, arg); 2723 process_sgr_mode (nargs, arg);
2716 break; 2724 break;
2717 2725
2718 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2726 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2719 switch (arg[0]) 2727 switch (arg[0])
2720 { 2728 {
2721 case 5: /* DSR requested */ 2729 case 5: /* DSR requested */
2722 tt_printf("\033[0n"); 2730 tt_printf ("\033[0n");
2723 break; 2731 break;
2724 case 6: /* CPR requested */ 2732 case 6: /* CPR requested */
2725 scr_report_position (); 2733 scr_report_position ();
2726 break; 2734 break;
2727#if defined (ENABLE_DISPLAY_ANSWER) 2735#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 2736 case 7: /* unofficial extension */
2729 tt_printf("%-.250s\n", rs[Rs_display_name]); 2737 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2730 break; 2738 break;
2731#endif 2739#endif
2732 case 8: /* unofficial extension */ 2740 case 8: /* unofficial extension */
2733 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2741 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2734 break; 2742 break;
… …
2805 break; 2813 break;
2806#endif 2814#endif
2807 2815
2808 case CSI_78: /* DECREQTPARM */ 2816 case CSI_78: /* DECREQTPARM */
2809 if (arg[0] == 0 || arg[0] == 1) 2817 if (arg[0] == 0 || arg[0] == 1)
2810 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2818 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2811 /* FALLTHROUGH */ 2819 /* FALLTHROUGH */
2812 2820
2813 default: 2821 default:
2814 break; 2822 break;
2815 } 2823 }
… …
2834 { 2842 {
2835 /* 2843 /*
2836 * commands 2844 * commands
2837 */ 2845 */
2838 case 1: /* deiconify window */ 2846 case 1: /* deiconify window */
2839 XMapWindow(Xdisplay, TermWin.parent[0]); 2847 XMapWindow (display->display, TermWin.parent[0]);
2840 break; 2848 break;
2841 case 2: /* iconify window */ 2849 case 2: /* iconify window */
2842 XIconifyWindow(Xdisplay, TermWin.parent[0], 2850 XIconifyWindow (display->display, TermWin.parent[0],
2843 DefaultScreen(Xdisplay)); 2851 DefaultScreen (display->display));
2844 break; 2852 break;
2845 case 3: /* set position (pixels) */ 2853 case 3: /* set position (pixels) */
2846 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2854 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2847 break; 2855 break;
2848 case 4: /* set size (pixels) */ 2856 case 4: /* set size (pixels) */
2849 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2857 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2850 break; 2858 break;
2851 case 5: /* raise window */ 2859 case 5: /* raise window */
2852 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2860 XRaiseWindow (display->display, TermWin.parent[0]);
2853 break; 2861 break;
2854 case 6: /* lower window */ 2862 case 6: /* lower window */
2855 XLowerWindow(Xdisplay, TermWin.parent[0]); 2863 XLowerWindow (display->display, TermWin.parent[0]);
2856 break; 2864 break;
2857 case 7: /* refresh window */ 2865 case 7: /* refresh window */
2858 scr_touch (true); 2866 scr_touch (true);
2859 break; 2867 break;
2860 case 8: /* set size (chars) */ 2868 case 8: /* set size (chars) */
2861 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2869 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2862 (unsigned int)(args[1] * TermWin.fheight)); 2870 (unsigned int) (args[1] * TermWin.fheight));
2863 break; 2871 break;
2864 default: 2872 default:
2865 if (args[0] >= 24) /* set height (chars) */ 2873 if (args[0] >= 24) /* set height (chars) */
2866 set_widthheight ((unsigned int)TermWin.width, 2874 set_widthheight ((unsigned int)TermWin.width,
2867 (unsigned int)(args[1] * TermWin.fheight)); 2875 (unsigned int) (args[1] * TermWin.fheight));
2868 break; 2876 break;
2869 /* 2877 /*
2870 * reports - some output format copied from XTerm 2878 * reports - some output format copied from XTerm
2871 */ 2879 */
2872 case 11: /* report window state */ 2880 case 11: /* report window state */
2873 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2874 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2882 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2875 break; 2883 break;
2876 case 13: /* report window position */ 2884 case 13: /* report window position */
2877 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2885 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2878 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2886 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2879 -wattr.border_width, -wattr.border_width, 2887 -wattr.border_width, -wattr.border_width,
2880 &x, &y, &wdummy); 2888 &x, &y, &wdummy);
2881 tt_printf("\033[3;%d;%dt", x, y); 2889 tt_printf ("\033[3;%d;%dt", x, y);
2882 break; 2890 break;
2883 case 14: /* report window size (pixels) */ 2891 case 14: /* report window size (pixels) */
2884 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2892 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2885 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2893 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2886 break; 2894 break;
2887 case 18: /* report window size (chars) */ 2895 case 18: /* report window size (chars) */
2888 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2896 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2889 break; 2897 break;
2890#if 0 /* XXX: currently disabled due to security concerns */ 2898#if 0 /* XXX: currently disabled due to security concerns */
2891 case 20: /* report icon label */ 2899 case 20: /* report icon label */
2892 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2900 XGetIconName (display->display, TermWin.parent[0], &s);
2893 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2901 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2894 break; 2902 break;
2895 case 21: /* report window title */ 2903 case 21: /* report window title */
2896 XFetchName(Xdisplay, TermWin.parent[0], &s); 2904 XFetchName (display->display, TermWin.parent[0], &s);
2897 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2905 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2898 break; 2906 break;
2899#endif 2907#endif
2900 2908
2901 } 2909 }
2902} 2910}
2903#endif 2911#endif
2904 2912
2905/*----------------------------------------------------------------------*/ 2913/*----------------------------------------------------------------------*/
2906/* 2914/*
2907 * get input up until STRING TERMINATOR (or BEL) 2915 * get input up until STRING TERMINATOR (or BEL)
2908 * ends_how is terminator used. returned input must be free()d 2916 * ends_how is terminator used. returned input must be free ()d
2909 */ 2917 */
2910unsigned char * 2918unsigned char *
2911rxvt_term::get_to_st (unsigned char *ends_how) 2919rxvt_term::get_to_st (unsigned char *ends_how)
2912{ 2920{
2913 int seen_esc = 0; /* seen escape? */ 2921 int seen_esc = 0; /* seen escape? */
… …
2928 } 2936 }
2929 else if (ch == '\t') 2937 else if (ch == '\t')
2930 ch = ' '; /* translate '\t' to space */ 2938 ch = ' '; /* translate '\t' to space */
2931 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2939 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2932 return NULL; /* other control character - exit */ 2940 return NULL; /* other control character - exit */
2933 if (n < sizeof(string) - 1) 2941 if (n < sizeof (string) - 1)
2934 string[n++] = ch; 2942 string[n++] = ch;
2935 seen_esc = 0; 2943 seen_esc = 0;
2936 } 2944 }
2937 string[n++] = '\0'; 2945 string[n++] = '\0';
2938 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2946 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2939 return NULL; 2947 return NULL;
2940 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2948 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2941 STRNCPY(s, string, n); 2949 STRNCPY (s, string, n);
2942 return s; 2950 return s;
2943} 2951}
2944 2952
2945/*----------------------------------------------------------------------*/ 2953/*----------------------------------------------------------------------*/
2946/* 2954/*
… …
2953 /* 2961 /*
2954 * Not handled yet 2962 * Not handled yet
2955 */ 2963 */
2956 s = get_to_st (&eh); 2964 s = get_to_st (&eh);
2957 if (s) 2965 if (s)
2958 free(s); 2966 free (s);
2959 return; 2967 return;
2960} 2968}
2961 2969
2962/*----------------------------------------------------------------------*/ 2970/*----------------------------------------------------------------------*/
2963/* 2971/*
… …
2968{ 2976{
2969 unsigned char ch, eh, *s; 2977 unsigned char ch, eh, *s;
2970 int arg; 2978 int arg;
2971 2979
2972 ch = cmd_getc (); 2980 ch = cmd_getc ();
2973 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2981 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2974 arg = arg * 10 + (ch - '0'); 2982 arg = arg * 10 + (ch - '0');
2975 2983
2976 if (ch == ';') 2984 if (ch == ';')
2977 { 2985 {
2978 s = get_to_st (&eh); 2986 s = get_to_st (&eh);
2979 if (s) 2987 if (s)
2980 { 2988 {
2981 /* 2989 /*
2982 * rxvt_menubar_dispatch() violates the constness of the string, 2990 * rxvt_menubar_dispatch () violates the constness of the string,
2983 * so do it here 2991 * so do it here
2984 */ 2992 */
2985 if (arg == XTerm_Menu) 2993 if (arg == XTerm_Menu)
2986#if 0 /* XXX: currently disabled due to security concerns */ 2994#if 0 /* XXX: currently disabled due to security concerns */
2987 menubar_dispatch ((char *)s); 2995 menubar_dispatch ((char *)s);
2988#else 2996#else
2989 (void)0; 2997 (void)0;
2990#endif 2998#endif
2991 else 2999 else
2992 xterm_seq (arg, (char *)s, eh); 3000 xterm_seq (arg, (char *)s, eh);
2993 free(s); 3001 free (s);
2994 } 3002 }
2995 } 3003 }
2996} 3004}
2997/* 3005/*
2998 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3006 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
… …
3014 * 39 = change default fg color 3022 * 39 = change default fg color
3015 * 49 = change default bg color 3023 * 49 = change default bg color
3016 * 55 = dump scrollback buffer and all of screen 3024 * 55 = dump scrollback buffer and all of screen
3017 */ 3025 */
3018void 3026void
3019rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3027rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
3020{ 3028{
3021 int changed = 0; 3029 int changed = 0;
3022 int color; 3030 int color;
3023 char *buf, *name; 3031 char *buf, *name;
3024 3032
3025 assert(str != NULL); 3033 assert (str != NULL);
3026 switch (op) 3034 switch (op)
3027 { 3035 {
3028 case XTerm_name: 3036 case XTerm_name:
3029 set_title (str); 3037 set_title (str);
3030 /* FALLTHROUGH */ 3038 /* FALLTHROUGH */
… …
3035 set_title (str); 3043 set_title (str);
3036 break; 3044 break;
3037 case XTerm_Color: 3045 case XTerm_Color:
3038 for (buf = (char *)str; buf && *buf;) 3046 for (buf = (char *)str; buf && *buf;)
3039 { 3047 {
3040 if ((name = STRCHR(buf, ';')) == NULL) 3048 if ((name = STRCHR (buf, ';')) == NULL)
3041 break; 3049 break;
3042 *name++ = '\0'; 3050 *name++ = '\0';
3043 color = atoi(buf); 3051 color = atoi (buf);
3044 if (color < 0 || color >= TOTAL_COLORS) 3052 if (color < 0 || color >= TOTAL_COLORS)
3045 break; 3053 break;
3046 if ((buf = STRCHR(name, ';')) != NULL) 3054 if ((buf = STRCHR (name, ';')) != NULL)
3047 *buf++ = '\0'; 3055 *buf++ = '\0';
3048 set_window_color (color + minCOLOR, name); 3056 set_window_color (color + minCOLOR, name);
3049 } 3057 }
3050 break; 3058 break;
3051#ifndef NO_CURSORCOLOR 3059#ifndef NO_CURSORCOLOR
… …
3068 break; 3076 break;
3069#endif 3077#endif
3070 3078
3071 case XTerm_Menu: 3079 case XTerm_Menu:
3072 /* 3080 /*
3073 * rxvt_menubar_dispatch() violates the constness of the string, 3081 * rxvt_menubar_dispatch () violates the constness of the string,
3074 * so DON'T do it here 3082 * so DON'T do it here
3075 */ 3083 */
3076 break; 3084 break;
3077 case XTerm_Pixmap: 3085 case XTerm_Pixmap:
3078 if (*str != ';') 3086 if (*str != ';')
… …
3081 scale_pixmap (""); /* reset to default scaling */ 3089 scale_pixmap (""); /* reset to default scaling */
3082 set_bgPixmap (str); /* change pixmap */ 3090 set_bgPixmap (str); /* change pixmap */
3083#endif 3091#endif
3084 scr_touch (true); 3092 scr_touch (true);
3085 } 3093 }
3086 while ((str = STRCHR(str, ';')) != NULL) 3094 while ((str = STRCHR (str, ';')) != NULL)
3087 { 3095 {
3088 str++; 3096 str++;
3089#if XPM_BACKGROUND 3097#if XPM_BACKGROUND
3090 changed += scale_pixmap (str); 3098 changed += scale_pixmap (str);
3091#endif 3099#endif
… …
3113 break; 3121 break;
3114#if 0 3122#if 0
3115 case XTerm_dumpscreen: /* no error notices */ 3123 case XTerm_dumpscreen: /* no error notices */
3116 { 3124 {
3117 int fd; 3125 int fd;
3118 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3126 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3119 { 3127 {
3120 scr_dump (fd); 3128 scr_dump (fd);
3121 close(fd); 3129 close (fd);
3122 } 3130 }
3123 } 3131 }
3124 break; 3132 break;
3125#endif 3133#endif
3126 3134
… …
3151 else 3159 else
3152 { 3160 {
3153 if (mode == 'r') 3161 if (mode == 'r')
3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3162 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3155 else 3163 else
3156 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3164 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3157 PrivMode(state, bit); 3165 PrivMode (state, bit);
3158 } 3166 }
3159 return state; 3167 return state;
3160} 3168}
3161 3169
3162/* we're not using priv _yet_ */ 3170/* we're not using priv _yet_ */
3163void 3171void
3164rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3172rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3165{ 3173{
3166 unsigned int i, j; 3174 unsigned int i, j;
3167 int state; 3175 int state;
3168 static const struct 3176 static const struct
3169 { 3177 {
… …
3212 for (i = 0; i < nargs; i++) 3220 for (i = 0; i < nargs; i++)
3213 { 3221 {
3214 state = -1; 3222 state = -1;
3215 3223
3216 /* basic handling */ 3224 /* basic handling */
3217 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3225 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3218 if (argtopriv[j].argval == arg[i]) 3226 if (argtopriv[j].argval == arg[i])
3219 { 3227 {
3220 state = privcases (mode, argtopriv[j].bit); 3228 state = privcases (mode, argtopriv[j].bit);
3221 break; 3229 break;
3222 } 3230 }
… …
3230 scr_cursor (RESTORE); 3238 scr_cursor (RESTORE);
3231 else if (mode == 1) 3239 else if (mode == 1)
3232 scr_cursor (SAVE); 3240 scr_cursor (SAVE);
3233 /* FALLTHROUGH */ 3241 /* FALLTHROUGH */
3234 default: 3242 default:
3235 continue; /* for(;i;) */ 3243 continue; /* for (;i;) */
3236 } 3244 }
3237 3245
3238 /* extra handling for values with valid 0 or 1 state */ 3246 /* extra handling for values with valid 0 or 1 state */
3239 switch (arg[i]) 3247 switch (arg[i])
3240 { 3248 {
… …
3242 case 2: /* VT52 mode */ 3250 case 2: /* VT52 mode */
3243 /* oddball mode. should be set regardless of set/reset 3251 /* oddball mode. should be set regardless of set/reset
3244 * parameter. Return from VT52 mode with an ESC < from 3252 * parameter. Return from VT52 mode with an ESC < from
3245 * within VT52 mode 3253 * within VT52 mode
3246 */ 3254 */
3247 PrivMode(1, PrivMode_vt52); 3255 PrivMode (1, PrivMode_vt52);
3248 break; 3256 break;
3249 case 3: /* 80/132 */ 3257 case 3: /* 80/132 */
3250 if (PrivateModes & PrivMode_132OK) 3258 if (PrivateModes & PrivMode_132OK)
3251 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3259 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3252 (unsigned int)TermWin.height); 3260 (unsigned int)TermWin.height);
3253 break; 3261 break;
3254 case 4: /* smooth scrolling */ 3262 case 4: /* smooth scrolling */
3255 if (state) 3263 if (state)
3256 Options &= ~Opt_jumpScroll; 3264 Options &= ~Opt_jumpScroll;
… …
3267 scr_autowrap (state); 3275 scr_autowrap (state);
3268 break; 3276 break;
3269 /* case 8: - auto repeat, can't do on a per window basis */ 3277 /* case 8: - auto repeat, can't do on a per window basis */
3270 case 9: /* X10 mouse reporting */ 3278 case 9: /* X10 mouse reporting */
3271 if (state) /* orthogonal */ 3279 if (state) /* orthogonal */
3272 PrivateModes &= ~(PrivMode_MouseX11); 3280 PrivateModes &= ~ (PrivMode_MouseX11);
3273 break; 3281 break;
3274#ifdef menuBar_esc 3282#ifdef menuBar_esc
3275 case menuBar_esc: 3283 case menuBar_esc:
3276#ifdef MENUBAR 3284#ifdef MENUBAR
3277 map_menuBar (state); 3285 map_menuBar (state);
… …
3297 break; 3305 break;
3298 /* case 66: - application key pad */ 3306 /* case 66: - application key pad */
3299 /* case 67: - backspace key */ 3307 /* case 67: - backspace key */
3300 case 1000: /* X11 mouse reporting */ 3308 case 1000: /* X11 mouse reporting */
3301 if (state) /* orthogonal */ 3309 if (state) /* orthogonal */
3302 PrivateModes &= ~(PrivMode_MouseX10); 3310 PrivateModes &= ~ (PrivMode_MouseX10);
3303 break; 3311 break;
3304#if 0 3312#if 0
3305 case 1001: 3313 case 1001:
3306 break; /* X11 mouse highlighting */ 3314 break; /* X11 mouse highlighting */
3307#endif 3315#endif
… …
3377 break; 3385 break;
3378 } 3386 }
3379 if (rendset != -1) 3387 if (rendset != -1)
3380 { 3388 {
3381 scr_rendition (rendset, rendstyle); 3389 scr_rendition (rendset, rendstyle);
3382 continue; /* for(;i;) */ 3390 continue; /* for (;i;) */
3383 } 3391 }
3384 3392
3385 switch (arg[i]) 3393 switch (arg[i])
3386 { 3394 {
3387 case 30: 3395 case 30:
… …
3390 case 33: 3398 case 33:
3391 case 34: 3399 case 34:
3392 case 35: 3400 case 35:
3393 case 36: 3401 case 36:
3394 case 37: 3402 case 37:
3395 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3403 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3396 Color_fg); 3404 Color_fg);
3397 break; 3405 break;
3398#ifdef TTY_256COLOR 3406#ifdef TTY_256COLOR
3399 case 38: 3407 case 38:
3400 if (nargs > i + 2 && arg[i + 1] == 5) 3408 if (nargs > i + 2 && arg[i + 1] == 5)
3401 { 3409 {
3402 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3410 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3403 Color_fg); 3411 Color_fg);
3404 i += 2; 3412 i += 2;
3405 } 3413 }
3406 break; 3414 break;
3407#endif 3415#endif
… …
3415 case 43: 3423 case 43:
3416 case 44: 3424 case 44:
3417 case 45: 3425 case 45:
3418 case 46: 3426 case 46:
3419 case 47: 3427 case 47:
3420 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3428 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3421 Color_bg); 3429 Color_bg);
3422 break; 3430 break;
3423#ifdef TTY_256COLOR 3431#ifdef TTY_256COLOR
3424 case 48: 3432 case 48:
3425 if (nargs > i + 2 && arg[i + 1] == 5) 3433 if (nargs > i + 2 && arg[i + 1] == 5)
3426 { 3434 {
3427 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3435 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3428 Color_bg); 3436 Color_bg);
3429 i += 2; 3437 i += 2;
3430 } 3438 }
3431 break; 3439 break;
3432#endif 3440#endif
… …
3441 case 93: 3449 case 93:
3442 case 94: 3450 case 94:
3443 case 95: 3451 case 95:
3444 case 96: 3452 case 96:
3445 case 97: 3453 case 97:
3446 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3454 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3447 Color_fg); 3455 Color_fg);
3448 break; 3456 break;
3449 case 100: 3457 case 100:
3450 case 101: /* set bright bg color */ 3458 case 101: /* set bright bg color */
3451 case 102: 3459 case 102:
3452 case 103: 3460 case 103:
3453 case 104: 3461 case 104:
3454 case 105: 3462 case 105:
3455 case 106: 3463 case 106:
3456 case 107: 3464 case 107:
3457 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3465 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3458 Color_bg); 3466 Color_bg);
3459 break; 3467 break;
3460#endif 3468#endif
3461 3469
3462 } 3470 }
… …
3471 unsigned char ch, cmd = cmd_getc (); 3479 unsigned char ch, cmd = cmd_getc ();
3472 3480
3473#ifndef RXVT_GRAPHICS 3481#ifndef RXVT_GRAPHICS
3474 if (cmd == 'Q') 3482 if (cmd == 'Q')
3475 { /* query graphics */ 3483 { /* query graphics */
3476 tt_printf("\033G0\n"); /* no graphics */ 3484 tt_printf ("\033G0\n"); /* no graphics */
3477 return; 3485 return;
3478 } 3486 }
3479 /* swallow other graphics sequences until terminating ':' */ 3487 /* swallow other graphics sequences until terminating ':' */
3480 do 3488 do
3481 ch = cmd_getc (); 3489 ch = cmd_getc ();
… …
3485 int args[NGRX_PTS]; 3493 int args[NGRX_PTS];
3486 unsigned char *text = NULL; 3494 unsigned char *text = NULL;
3487 3495
3488 if (cmd == 'Q') 3496 if (cmd == 'Q')
3489 { /* query graphics */ 3497 { /* query graphics */
3490 tt_printf("\033G1\n"); /* yes, graphics (color) */ 3498 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3491 return; 3499 return;
3492 } 3500 }
3493 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) 3501 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3494 { 3502 {
3495 int neg; 3503 int neg;
3496 3504
3497 ch = cmd_getc (); 3505 ch = cmd_getc ();
3498 neg = (ch == '-'); 3506 neg = (ch == '-');
3499 if (neg || ch == '+') 3507 if (neg || ch == '+')
3500 ch = cmd_getc (); 3508 ch = cmd_getc ();
3501 3509
3502 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ()) 3510 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3503 args[nargs] = args[nargs] * 10 + (ch - '0'); 3511 args[nargs] = args[nargs] * 10 + (ch - '0');
3504 if (neg) 3512 if (neg)
3505 args[nargs] = -args[nargs]; 3513 args[nargs] = -args[nargs];
3506 3514
3507 nargs++; 3515 nargs++;
… …
3512 3520
3513 if ((cmd == 'T') && (nargs >= 5)) 3521 if ((cmd == 'T') && (nargs >= 5))
3514 { 3522 {
3515 int i, len = args[4]; 3523 int i, len = args[4];
3516 3524
3517 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); 3525 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3518 3526
3519 if (text != NULL) 3527 if (text != NULL)
3520 { 3528 {
3521 for (i = 0; i < len; i++) 3529 for (i = 0; i < len; i++)
3522 text[i] = cmd_getc (); 3530 text[i] = cmd_getc ();
… …
3529/*}}} */ 3537/*}}} */
3530 3538
3531/* ------------------------------------------------------------------------- */ 3539/* ------------------------------------------------------------------------- */
3532 3540
3533/* 3541/*
3534 * Send printf() formatted output to the command. 3542 * Send printf () formatted output to the command.
3535 * Only use for small amounts of data. 3543 * Only use for small amounts of data.
3536 */ 3544 */
3537void 3545void
3538rxvt_term::tt_printf (const char *fmt,...) 3546rxvt_term::tt_printf (const char *fmt,...)
3539{ 3547{

Diff Legend

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