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.131 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.210 by root, Tue Dec 20 20:58:31 2005 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
57#include <csignal>
54 58
55/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
59// exception thrown when the command parser runs out of input data 63// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 64class out_of_input { } out_of_input;
61 65
62#ifndef NO_FRILLS 66#if ENABLE_FRILLS || ISO_14755
63 67
64#define ISO_14755_KEYCODE_VALID 0x80000000UL
65#define ISO_14755_ACTIVE 0x40000000UL 68#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_ESCAPE_NEXT 0x20000000UL 69#define ISO_14755_51 0x40000000UL // basic (section 5.1)
70#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
71#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
72#define ISO_14755_MASK 0x0fffffffUL
67 73
74#if ISO_14755
68static unsigned short iso14755_symtab[] = { 75static unsigned short iso14755_symtab[] = {
69 // keysym, unicode 76 // keysym, unicode
70 XK_Left, 0x2190, 77 XK_Left, 0x2190,
71 XK_KP_Left, 0x2190, 78 XK_KP_Left, 0x2190,
72 XK_Up, 0x2191, 79 XK_Up, 0x2191,
… …
110 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
111 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
112 XK_Print, 0x2399, 119 XK_Print, 0x2399,
113 120
114 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
115 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
116 0, 131 0,
117}; 132};
118 133
119void 134void
135rxvt_term::iso14755_54 (int x, int y)
136{
137 x = Pixel2Col (x);
138 y = Pixel2Row (y);
139
140 if (x < 0 || x >= ncol
141 || y < 0 || y >= nrow)
142 return;
143
144 for (;;)
145 {
146 const line_t &l = save[y + saveLines - view_start];
147
148 text_t t = l.t[x];
149
150 if (t != NOCHAR || !x)
151 {
152 iso14755_51 (l.t[x], l.r[x]);
153 iso14755buf = ISO_14755_54;
154 break;
155 }
156
157 x--;
158 }
159
160}
161#endif
162
163#if ENABLE_OVERLAY
164void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
166{
167 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname;
170 int len;
171
172 fname = rxvt_utf8towcs (f->name);
173
174#if ENABLE_COMBINING
175 if (IS_COMPOSE (ch))
176 {
177 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr);
180 }
181 else
182#endif
183 {
184 ch2 = ch;
185
186 alloc = 0;
187 chr = &ch2;
188 len = 1;
189 }
190
191 int width = wcswidth (fname, wcslen (fname));
192
193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
194
195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
196
197 for (int y = 0; y < len; y++)
198 {
199 char buf[9];
200
201 ch = *chr++;
202
203 sprintf (buf, "%8x", ch);
204 scr_overlay_set (0, y, buf);
205 scr_overlay_set (9, y, '=');
206#if !UNICODE3
207 if (ch >= 0x10000)
208 ch = 0xfffd;
209#endif
210 scr_overlay_set (11, y, ch, r);
211 scr_overlay_set (12, y, NOCHAR, r);
212 }
213
214 scr_overlay_set (0, len, fname);
215
216 free (fname);
217
218#if ENABLE_COMBINING
219 if (alloc)
220 delete [] alloc;
221#endif
222}
223#endif
224
225void
120rxvt_term::commit_iso14755 () 226rxvt_term::commit_iso14755 ()
121{ 227{
122 wchar_t ch[2]; 228 wchar_t ch[2];
123 229
124 ch[0] = iso14755buf & 0x1fffffffUL; // actually, unicode needs a 0x1fffff mask 230 ch[0] = iso14755buf & ISO_14755_MASK;
125 ch[1] = 0; 231 ch[1] = 0;
126 232
127 if (iso14755buf & ISO_14755_KEYCODE_VALID) 233 if (iso14755buf & ISO_14755_51)
128 { 234 {
129 char mb[16]; 235 char mb[16];
130 int len; 236 int len;
131 237
132 // allow verbatim 0-bytes and control-bytes to be entered 238 // allow verbatim 0-bytes and control-bytes to be entered
… …
183 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 289 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
184 * escape sequence to toggle the Keypad. 290 * escape sequence to toggle the Keypad.
185 * 291 *
186 * Always permit `shift' to override the current setting 292 * Always permit `shift' to override the current setting
187 */ 293 */
188 shft = (ev.state & ShiftMask); 294 shft = ev.state & ShiftMask;
189 ctrl = (ev.state & ControlMask); 295 ctrl = ev.state & ControlMask;
190 meta = (ev.state & ModMetaMask); 296 meta = ev.state & ModMetaMask;
191 297
192 if (numlock_state || (ev.state & ModNumLockMask)) 298 if (numlock_state || (ev.state & ModNumLockMask))
193 { 299 {
194 numlock_state = (ev.state & ModNumLockMask); 300 numlock_state = (ev.state & ModNumLockMask);
195 PrivMode ((!numlock_state), PrivMode_aplKP); 301 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
215 321
216 // the XOpenIM manpage lies about hardcoding the locale 322 // the XOpenIM manpage lies about hardcoding the locale
217 // at the point of XOpenIM, so temporarily switch locales 323 // at the point of XOpenIM, so temporarily switch locales
218 if (rs[Rs_imLocale]) 324 if (rs[Rs_imLocale])
219 SET_LOCALE (rs[Rs_imLocale]); 325 SET_LOCALE (rs[Rs_imLocale]);
326
220 // assume wchar_t == unicode or better 327 // assume wchar_t == unicode or better
221 len = XwcLookupString (Input_Context, &ev, wkbuf, 328 len = XwcLookupString (Input_Context, &ev, wkbuf,
222 KBUFSZ, &keysym, &status_return); 329 KBUFSZ, &keysym, &status_return);
330
223 if (rs[Rs_imLocale]) 331 if (rs[Rs_imLocale])
224 SET_LOCALE (locale); 332 SET_LOCALE (locale);
225 333
226 if (status_return == XLookupChars 334 if (status_return == XLookupChars
227 || status_return == XLookupBoth) 335 || status_return == XLookupBoth)
… …
254 valid_keysym = keysym != NoSymbol; 362 valid_keysym = keysym != NoSymbol;
255 } 363 }
256 364
257 if (valid_keysym) 365 if (valid_keysym)
258 { 366 {
367#ifdef KEYSYM_RESOURCE
368 if (keyboard->dispatch (this, keysym, ev.state))
369 return;
370#endif
371
259 if (TermWin.saveLines) 372 if (saveLines)
260 { 373 {
261#ifdef UNSHIFTED_SCROLLKEYS 374#ifdef UNSHIFTED_SCROLLKEYS
262 if (!ctrl && !meta) 375 if (!ctrl && !meta)
263#else 376#else
264 if (IS_SCROLL_MOD) 377 if (IS_SCROLL_MOD)
265#endif 378#endif
266 { 379 {
267 int lnsppg; 380 int lnsppg;
268 381
269#ifdef PAGING_CONTEXT_LINES 382#ifdef PAGING_CONTEXT_LINES
270 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 383 lnsppg = nrow - PAGING_CONTEXT_LINES;
271#else 384#else
272 lnsppg = TermWin.nrow * 4 / 5; 385 lnsppg = nrow * 4 / 5;
273#endif 386#endif
274 if (keysym == XK_Prior) 387 if (keysym == XK_Prior)
275 { 388 {
276 scr_page (UP, lnsppg); 389 scr_page (UP, lnsppg);
277 return; 390 return;
… …
320 if (keysym >= XK_F1 && keysym <= XK_F10) 433 if (keysym >= XK_F1 && keysym <= XK_F10)
321 { 434 {
322 keysym += (XK_F11 - XK_F1); 435 keysym += (XK_F11 - XK_F1);
323 shft = 0; /* turn off Shift */ 436 shft = 0; /* turn off Shift */
324 } 437 }
325 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 438 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
326 { 439 {
327 switch (keysym) 440 switch (keysym)
328 { 441 {
329 /* normal XTerm key bindings */ 442 /* normal XTerm key bindings */
330 case XK_Insert: /* Shift+Insert = paste mouse selection */ 443 case XK_Insert: /* Shift+Insert = paste mouse selection */
331 selection_request (ev.time, 0, 0); 444 selection_request (ev.time, 0, 0);
332 return; 445 return;
333#if TODO // TODO 446#if TODO
334 /* rxvt extras */ 447 /* rxvt extras */
335 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 448 case XK_KP_Add: /* Shift+KP_Add = bigger font */
336 change_font (FONT_UP); 449 change_font (FONT_UP);
337 return; 450 return;
338 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 451 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
341#endif 454#endif
342 } 455 }
343 } 456 }
344 } 457 }
345 458
346#ifndef NO_FRILLS 459#if ENABLE_FRILLS || ISO_14755
347 // ISO 14755 support 460 // ISO 14755 support
348 if (shft && ctrl) 461 if (shft && ctrl)
349 { 462 {
350 int hv; 463 int hv;
351 464
465 if (iso14755buf & ISO_14755_51
352 if (keysym == XK_space || keysym == XK_KP_Space 466 && (keysym == XK_space || keysym == XK_KP_Space
353 || keysym == XK_Return || keysym == XK_KP_Enter) 467 || keysym == XK_Return || keysym == XK_KP_Enter))
354 { 468 {
355 commit_iso14755 (); 469 commit_iso14755 ();
470 iso14755buf = ISO_14755_51;
471# if ISO_14755
472 iso14755_51 (0);
473# endif
356 return; 474 return;
357 } 475 }
358 else if ((hv = hex_keyval (ev)) >= 0) 476 else if ((hv = hex_keyval (ev)) >= 0)
359 { 477 {
360 iso14755buf = (iso14755buf << 4) | hv | ISO_14755_KEYCODE_VALID; 478 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
479 | hv | ISO_14755_51;
480# if ISO_14755
481 iso14755_51 (iso14755buf & ISO_14755_MASK);
482# endif
361 return; 483 return;
362 } 484 }
363 else 485 else
486 {
487# if ENABLE_OVERLAY
488 scr_overlay_off ();
489# endif
364 iso14755buf = 0; 490 iso14755buf = 0;
491 }
365 } 492 }
366 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 493 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
367 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 494 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
495 if (!(iso14755buf & ISO_14755_STARTED))
496 {
368 iso14755buf |= ISO_14755_ACTIVE; 497 iso14755buf |= ISO_14755_STARTED;
498# if ENABLE_OVERLAY
499 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
500 scr_overlay_set (0, 0, "ISO 14755 mode");
501# endif
502 }
369#endif 503#endif
370 504
371#ifdef PRINTPIPE 505#ifdef PRINTPIPE
372 if (keysym == XK_Print) 506 if (keysym == XK_Print)
373 { 507 {
… …
376 } 510 }
377#endif 511#endif
378 512
379 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 513 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
380 { 514 {
381#ifdef KEYSYM_RESOURCE
382 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
383 {
384 unsigned int l;
385 const unsigned char *kbuf0;
386
387 kbuf0 = (Keysym_map[keysym & 0xFF]);
388 l = (unsigned int)*kbuf0++;
389
390 /* escape prefix */
391 if (meta
392# ifdef META8_OPTION
393 && meta_char == C0_ESC
394# endif
395 )
396 {
397 const unsigned char ch = C0_ESC;
398 tt_write (&ch, 1);
399 }
400
401 tt_write (kbuf0, l);
402 return;
403 }
404 else
405#endif
406 { 515 {
407 newlen = 1; 516 newlen = 1;
408 switch (keysym) 517 switch (keysym)
409 { 518 {
410#ifndef NO_BACKSPACE_KEY 519#ifndef NO_BACKSPACE_KEY
411 case XK_BackSpace: 520 case XK_BackSpace:
412 if (PrivateModes & PrivMode_HaveBackSpace) 521 if (priv_modes & PrivMode_HaveBackSpace)
413 { 522 {
414 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 523 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
415 ^ !!ctrl) ? '\b' : '\177'; 524 ^ !!ctrl) ? '\b' : '\177';
416 kbuf[1] = '\0'; 525 kbuf[1] = '\0';
417 } 526 }
418 else 527 else
419 STRCPY (kbuf, key_backspace); 528 strcpy (kbuf, key_backspace);
420 break; 529 break;
421#endif 530#endif
422#ifndef NO_DELETE_KEY 531#ifndef NO_DELETE_KEY
532# ifdef XK_KP_Prior
533 case XK_KP_Delete:
534 /* allow shift to override */
535 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
536 {
537 strcpy (kbuf, "\033On");
538 break;
539 }
540 /* FALLTHROUGH */
541# endif
423 case XK_Delete: 542 case XK_Delete:
424 STRCPY (kbuf, key_delete); 543 strcpy (kbuf, key_delete);
425 break; 544 break;
426#endif 545#endif
427 case XK_Tab: 546 case XK_Tab:
428 if (shft) 547 if (shft)
429 STRCPY (kbuf, "\033[Z"); 548 strcpy (kbuf, "\033[Z");
430 else 549 else
431 { 550 {
432#ifdef CTRL_TAB_MAKES_META 551#ifdef CTRL_TAB_MAKES_META
433 if (ctrl) 552 if (ctrl)
434 meta = 1; 553 meta = 1;
… …
444#ifdef XK_KP_Left 563#ifdef XK_KP_Left
445 case XK_KP_Up: /* \033Ox or standard */ 564 case XK_KP_Up: /* \033Ox or standard */
446 case XK_KP_Down: /* \033Or or standard */ 565 case XK_KP_Down: /* \033Or or standard */
447 case XK_KP_Right: /* \033Ov or standard */ 566 case XK_KP_Right: /* \033Ov or standard */
448 case XK_KP_Left: /* \033Ot or standard */ 567 case XK_KP_Left: /* \033Ot or standard */
449 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 568 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
450 { 569 {
451 STRCPY (kbuf, "\033OZ"); 570 strcpy (kbuf, "\033OZ");
452 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 571 kbuf[2] = "txvr"[keysym - XK_KP_Left];
453 break; 572 break;
454 } 573 }
455 else 574 else
456 /* translate to std. cursor key */ 575 /* translate to std. cursor key */
… …
459#endif 578#endif
460 case XK_Up: /* "\033[A" */ 579 case XK_Up: /* "\033[A" */
461 case XK_Down: /* "\033[B" */ 580 case XK_Down: /* "\033[B" */
462 case XK_Right: /* "\033[C" */ 581 case XK_Right: /* "\033[C" */
463 case XK_Left: /* "\033[D" */ 582 case XK_Left: /* "\033[D" */
464 STRCPY (kbuf, "\033[Z"); 583 strcpy (kbuf, "\033[Z");
465 kbuf[2] = "DACB"[keysym - XK_Left]; 584 kbuf[2] = "DACB"[keysym - XK_Left];
466 /* do Shift first */ 585 /* do Shift first */
467 if (shft) 586 if (shft)
468 kbuf[2] = "dacb"[keysym - XK_Left]; 587 kbuf[2] = "dacb"[keysym - XK_Left];
469 else if (ctrl) 588 else if (ctrl)
470 { 589 {
471 kbuf[1] = 'O'; 590 kbuf[1] = 'O';
472 kbuf[2] = "dacb"[keysym - XK_Left]; 591 kbuf[2] = "dacb"[keysym - XK_Left];
473 } 592 }
474 else if (PrivateModes & PrivMode_aplCUR) 593 else if (priv_modes & PrivMode_aplCUR)
475 kbuf[1] = 'O'; 594 kbuf[1] = 'O';
476 break; 595 break;
477 596
478#ifndef UNSHIFTED_SCROLLKEYS 597#ifndef UNSHIFTED_SCROLLKEYS
479# ifdef XK_KP_Prior 598# ifdef XK_KP_Prior
480 case XK_KP_Prior: 599 case XK_KP_Prior:
481 /* allow shift to override */ 600 /* allow shift to override */
482 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 601 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
483 { 602 {
484 STRCPY (kbuf, "\033Oy"); 603 strcpy (kbuf, "\033Oy");
485 break; 604 break;
486 } 605 }
487 /* FALLTHROUGH */ 606 /* FALLTHROUGH */
488# endif 607# endif
489 case XK_Prior: 608 case XK_Prior:
490 STRCPY (kbuf, "\033[5~"); 609 strcpy (kbuf, "\033[5~");
491 break; 610 break;
492# ifdef XK_KP_Next 611# ifdef XK_KP_Next
493 case XK_KP_Next: 612 case XK_KP_Next:
494 /* allow shift to override */ 613 /* allow shift to override */
495 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 614 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
496 { 615 {
497 STRCPY (kbuf, "\033Os"); 616 strcpy (kbuf, "\033Os");
498 break; 617 break;
499 } 618 }
500 /* FALLTHROUGH */ 619 /* FALLTHROUGH */
501# endif 620# endif
502 case XK_Next: 621 case XK_Next:
503 STRCPY (kbuf, "\033[6~"); 622 strcpy (kbuf, "\033[6~");
504 break; 623 break;
505#endif 624#endif
506 case XK_KP_Enter: 625 case XK_KP_Enter:
507 /* allow shift to override */ 626 /* allow shift to override */
508 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 627 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
509 { 628 {
510 STRCPY (kbuf, "\033OM"); 629 strcpy (kbuf, "\033OM");
630 break;
631 }
632
633 /* FALLTHROUGH */
634
635 case XK_Return:
636 if (priv_modes & PrivMode_LFNL)
637 {
638 kbuf[0] = '\015';
639 kbuf[1] = '\012';
640 kbuf[2] = '\0';
511 } 641 }
512 else 642 else
513 { 643 {
514 kbuf[0] = '\r'; 644 kbuf[0] = '\015';
515 kbuf[1] = '\0'; 645 kbuf[1] = '\0';
516 } 646 }
517 break; 647 break;
518 648
519#ifdef XK_KP_Begin 649#ifdef XK_KP_Begin
520 case XK_KP_Begin: 650 case XK_KP_Begin:
521 STRCPY (kbuf, "\033Ou"); 651 strcpy (kbuf, "\033Ou");
522 break; 652 break;
523 653
524 case XK_KP_Insert:
525 STRCPY (kbuf, "\033Op");
526 break;
527
528 case XK_KP_Delete:
529 STRCPY (kbuf, "\033On");
530 break;
531#endif 654#endif
532 case XK_KP_F1: /* "\033OP" */ 655 case XK_KP_F1: /* "\033OP" */
533 case XK_KP_F2: /* "\033OQ" */ 656 case XK_KP_F2: /* "\033OQ" */
534 case XK_KP_F3: /* "\033OR" */ 657 case XK_KP_F3: /* "\033OR" */
535 case XK_KP_F4: /* "\033OS" */ 658 case XK_KP_F4: /* "\033OS" */
536 STRCPY (kbuf, "\033OP"); 659 strcpy (kbuf, "\033OP");
537 kbuf[2] += (keysym - XK_KP_F1); 660 kbuf[2] += (keysym - XK_KP_F1);
538 break; 661 break;
539 662
540 case XK_KP_Multiply: /* "\033Oj" : "*" */ 663 case XK_KP_Multiply: /* "\033Oj" : "*" */
541 case XK_KP_Add: /* "\033Ok" : "+" */ 664 case XK_KP_Add: /* "\033Ok" : "+" */
… …
552 case XK_KP_6: /* "\033Ov" : "6" */ 675 case XK_KP_6: /* "\033Ov" : "6" */
553 case XK_KP_7: /* "\033Ow" : "7" */ 676 case XK_KP_7: /* "\033Ow" : "7" */
554 case XK_KP_8: /* "\033Ox" : "8" */ 677 case XK_KP_8: /* "\033Ox" : "8" */
555 case XK_KP_9: /* "\033Oy" : "9" */ 678 case XK_KP_9: /* "\033Oy" : "9" */
556 /* allow shift to override */ 679 /* allow shift to override */
557 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 680 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 { 681 {
559 STRCPY (kbuf, "\033Oj"); 682 strcpy (kbuf, "\033Oj");
560 kbuf[2] += (keysym - XK_KP_Multiply); 683 kbuf[2] += (keysym - XK_KP_Multiply);
561 } 684 }
562 else 685 else
563 { 686 {
564 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 687 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
565 kbuf[1] = '\0'; 688 kbuf[1] = '\0';
566 } 689 }
567 break; 690 break;
568 691
569 case XK_Find: 692 case XK_Find:
570 STRCPY (kbuf, "\033[1~"); 693 strcpy (kbuf, "\033[1~");
571 break; 694 break;
695
696#ifdef XK_KP_End
697 case XK_KP_Insert:
698 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
700 {
701 strcpy (kbuf, "\033Op");
702 break;
703 }
704 /* FALLTHROUGH */
705#endif
572 case XK_Insert: 706 case XK_Insert:
573 STRCPY (kbuf, "\033[2~"); 707 strcpy (kbuf, "\033[2~");
574 break; 708 break;
575#ifdef DXK_Remove /* support for DEC remove like key */ 709#ifdef DXK_Remove /* support for DEC remove like key */
576 case DXK_Remove: 710 case DXK_Remove:
577 /* FALLTHROUGH */ 711 /* FALLTHROUGH */
578#endif 712#endif
579 case XK_Execute: 713 case XK_Execute:
580 STRCPY (kbuf, "\033[3~"); 714 strcpy (kbuf, "\033[3~");
581 break; 715 break;
582 case XK_Select: 716 case XK_Select:
583 STRCPY (kbuf, "\033[4~"); 717 strcpy (kbuf, "\033[4~");
584 break; 718 break;
585#ifdef XK_KP_End 719#ifdef XK_KP_End
586 case XK_KP_End: 720 case XK_KP_End:
587 /* allow shift to override */ 721 /* allow shift to override */
588 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
589 { 723 {
590 STRCPY (kbuf, "\033Oq"); 724 strcpy (kbuf, "\033Oq");
591 break; 725 break;
592 } 726 }
593 /* FALLTHROUGH */ 727 /* FALLTHROUGH */
594#endif 728#endif
595 case XK_End: 729 case XK_End:
596 STRCPY (kbuf, KS_END); 730 strcpy (kbuf, KS_END);
597 break; 731 break;
598#ifdef XK_KP_Home 732#ifdef XK_KP_Home
599 case XK_KP_Home: 733 case XK_KP_Home:
600 /* allow shift to override */ 734 /* allow shift to override */
601 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
602 { 736 {
603 STRCPY (kbuf, "\033Ow"); 737 strcpy (kbuf, "\033Ow");
604 break; 738 break;
605 } 739 }
606 /* FALLTHROUGH */ 740 /* FALLTHROUGH */
607#endif 741#endif
608 case XK_Home: 742 case XK_Home:
609 STRCPY (kbuf, KS_HOME); 743 strcpy (kbuf, KS_HOME);
610 break; 744 break;
611 745
612#define FKEY(n, fkey) \ 746#define FKEY(n, fkey) \
613 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 747 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
614 748
… …
666#undef FKEY 800#undef FKEY
667 default: 801 default:
668 newlen = 0; 802 newlen = 0;
669 break; 803 break;
670 } 804 }
805
671 if (newlen) 806 if (newlen)
672 len = STRLEN (kbuf); 807 len = strlen (kbuf);
673 } 808 }
674 809
675 /* 810 /*
676 * Pass meta for all function keys, if 'meta' option set 811 * Pass meta for all function keys, if 'meta' option set
677 */ 812 */
… …
684 else if (ctrl && keysym == XK_minus) 819 else if (ctrl && keysym == XK_minus)
685 { 820 {
686 len = 1; 821 len = 1;
687 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 822 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
688 } 823 }
824 else if (keysym == XK_ISO_Left_Tab)
825 {
826 strcpy (kbuf, "\033[Z");
827 len = 3;
828 }
689 else 829 else
690 { 830 {
691#ifdef META8_OPTION 831#ifdef META8_OPTION
692 /* set 8-bit on */ 832 /* set 8-bit on */
693 if (meta && (meta_char == 0x80)) 833 if (meta && (meta_char == 0x80))
… …
705 } 845 }
706 846
707 if (len <= 0) 847 if (len <= 0)
708 return; /* not mapped */ 848 return; /* not mapped */
709 849
710 if (Options & Opt_scrollTtyKeypress) 850 if (options & Opt_scrollTtyKeypress)
711 if (TermWin.view_start) 851 if (view_start)
712 { 852 {
713 TermWin.view_start = 0; 853 view_start = 0;
714 want_refresh = 1; 854 want_refresh = 1;
715 } 855 }
716 856
717 /* 857 /*
718 * these modifications only affect the static keybuffer 858 * these modifications only affect the static keybuffer
… …
751#endif /* DEBUG_CMD */ 891#endif /* DEBUG_CMD */
752 tt_write (kbuf, (unsigned int)len); 892 tt_write (kbuf, (unsigned int)len);
753} 893}
754/*}}} */ 894/*}}} */
755 895
756#if (MENUBAR_MAX) 896#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
757/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 897/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
758/* attempt to `write' count to the input buffer */ 898/* attempt to `write' count to the input buffer */
759unsigned int 899unsigned int
760rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 900rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
761{ 901{
… …
764 n = cmdbuf_ptr - cmdbuf_base; 904 n = cmdbuf_ptr - cmdbuf_base;
765 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 905 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
766 906
767 if (n > 0 && s < count) 907 if (n > 0 && s < count)
768 { 908 {
769 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 909 memmove (cmdbuf_base, cmdbuf_ptr,
770 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 910 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
771 cmdbuf_ptr = cmdbuf_base; 911 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp -= n; 912 cmdbuf_endp -= n;
773 s += n; 913 s += n;
774 } 914 }
… …
784 924
785 cmd_parse (); 925 cmd_parse ();
786 926
787 return 0; 927 return 0;
788} 928}
789#endif /* MENUBAR_MAX */ 929#endif
790 930
791void 931void
792rxvt_term::flush () 932rxvt_term::flush ()
793{ 933{
934 flush_ev.stop ();
935
794#ifdef TRANSPARENT 936#ifdef TRANSPARENT
795 if (want_full_refresh) 937 if (want_full_refresh)
796 { 938 {
797 want_full_refresh = 0; 939 want_full_refresh = 0;
798 scr_clear (); 940 scr_clear ();
… …
808 IMSendSpot (); 950 IMSendSpot ();
809#endif 951#endif
810 } 952 }
811 953
812 display->flush (); 954 display->flush ();
813
814 flush_ev.stop ();
815} 955}
816 956
817void 957void
818rxvt_term::check_cb (check_watcher &w) 958rxvt_term::check_cb (check_watcher &w)
819{ 959{
… …
895{ 1035{
896 if (mouse_slip_wheel_speed == 0 1036 if (mouse_slip_wheel_speed == 0
897 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1037 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
898 : scr_page (UP, mouse_slip_wheel_speed)) 1038 : scr_page (UP, mouse_slip_wheel_speed))
899 { 1039 {
1040 if (view_start == nsaved ||
1041 view_start == 0)
1042 mouse_slip_wheel_speed = 0;
1043
900 refresh_type |= SMOOTH_REFRESH; 1044 refresh_type |= SMOOTH_REFRESH;
901 want_refresh = 1; 1045 want_refresh = 1;
902 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
903 } 1047 }
904} 1048}
… …
917 1061
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1062 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1063 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1064 cmdbuf_endp = cmdbuf_ptr + n;
921 1065
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1066 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
923 1067
924 if (n > 0) 1068 if (n > 0)
925 { 1069 {
926 cmdbuf_endp += n; 1070 cmdbuf_endp += n;
927 return true; 1071 return true;
… …
936rxvt_term::pty_cb (io_watcher &w, short revents) 1080rxvt_term::pty_cb (io_watcher &w, short revents)
937{ 1081{
938 SET_R (this); 1082 SET_R (this);
939 SET_LOCALE (locale); 1083 SET_LOCALE (locale);
940 1084
941 if (revents & EVENT_WRITE)
942 tt_write (0, 0);
943 else if (revents & EVENT_READ) 1085 if (revents & EVENT_READ)
944 // loop, but don't allow a single term to monopolize us 1086 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1087 while (pty_fill ())
946 if (cmd_parse ()) 1088 if (cmd_parse ())
947 break; 1089 break;
1090
1091 if (revents & EVENT_WRITE)
1092 pty_write ();
948} 1093}
949 1094
950void 1095void
951rxvt_term::pointer_unblank () 1096rxvt_term::pointer_unblank ()
952{ 1097{
953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1098 XDefineCursor (display->display, vt, TermWin_cursor);
954 recolour_cursor (); 1099 recolour_cursor ();
955 1100
956#ifdef POINTER_BLANK 1101#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1102 hidden_pointer = 0;
958 1103
959 if (Options & Opt_pointerBlank) 1104 if (options & Opt_pointerBlank)
960 pointer_ev.start (NOW + pointerBlankDelay); 1105 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1106#endif
962} 1107}
963 1108
964#ifdef POINTER_BLANK 1109#ifdef POINTER_BLANK
965void 1110void
966rxvt_term::pointer_blank () 1111rxvt_term::pointer_blank ()
967{ 1112{
968 if (! (Options & Opt_pointerBlank)) 1113 if (! (options & Opt_pointerBlank))
969 return; 1114 return;
970 1115
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1116 XDefineCursor (display->display, vt, display->blank_cursor);
972 XFlush (display->display); 1117 XFlush (display->display);
973 1118
974 hidden_pointer = 1; 1119 hidden_pointer = 1;
975} 1120}
976 1121
… …
993 x = ev.x; 1138 x = ev.x;
994 y = ev.y; 1139 y = ev.y;
995 pixel_position (&x, &y); 1140 pixel_position (&x, &y);
996 1141
997 if (MEvent.button == AnyButton) 1142 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1143 button_number = 3;
1000 }
1001 else 1144 else
1002 { 1145 {
1003 button_number = MEvent.button - Button1; 1146 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1147 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1148 if (button_number >= 3)
1006 button_number += (64 - 3); 1149 button_number += (64 - 3);
1007 } 1150 }
1008 1151
1009 if (PrivateModes & PrivMode_MouseX10) 1152 if (priv_modes & PrivMode_MouseX10)
1010 { 1153 {
1011 /* 1154 /*
1012 * do not report ButtonRelease 1155 * do not report ButtonRelease
1013 * no state info allowed 1156 * no state info allowed
1014 */ 1157 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1172 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1173 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1174#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1175 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1176#endif
1034
1035 } 1177 }
1036 1178
1037#ifdef DEBUG_MOUSEREPORT 1179#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1180 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1181 if (key_state & 16)
1040 fputc ('C', stderr); 1182 fputc ('C', stderr);
1041 if (key_state & 4) 1183 if (key_state & 4)
1042 fputc ('S', stderr); 1184 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1188 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1189 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1190 button_number,
1049 x + 1, 1191 x + 1,
1050 y + 1); 1192 y + 1);
1051#else 1193#endif
1194
1052 tt_printf ("\033[M%c%c%c", 1195 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1196 (32 + button_number + key_state),
1054 (32 + x + 1), 1197 (32 + x + 1),
1055 (32 + y + 1)); 1198 (32 + y + 1));
1056#endif
1057} 1199}
1058 1200
1059#ifdef USING_W11LIB 1201#ifdef USING_W11LIB
1060void 1202void
1061rxvt_W11_process_x_event (XEvent *ev) 1203rxvt_W11_process_x_event (XEvent *ev)
… …
1068 1210
1069/*{{{ process an X event */ 1211/*{{{ process an X event */
1070void 1212void
1071rxvt_term::x_cb (XEvent &ev) 1213rxvt_term::x_cb (XEvent &ev)
1072{ 1214{
1215 dDisp;
1216
1073 SET_R (this); 1217 SET_R (this);
1074 SET_LOCALE (locale); 1218 SET_LOCALE (locale);
1075 1219
1076#if defined(CURSOR_BLINK) 1220#if defined(CURSOR_BLINK)
1077 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1078 { 1222 {
1079 if (hidden_cursor) 1223 if (hidden_cursor)
1080 { 1224 {
1081 hidden_cursor = 0; 1225 hidden_cursor = 0;
1082 want_refresh = 1; 1226 want_refresh = 1;
… …
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1229 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1086 } 1230 }
1087#endif 1231#endif
1088 1232
1089#if defined(POINTER_BLANK) 1233#if defined(POINTER_BLANK)
1090 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1234 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1091 { 1235 {
1092 if (ev.type == MotionNotify 1236 if (ev.type == MotionNotify
1093 || ev.type == ButtonPress 1237 || ev.type == ButtonPress
1094 || ev.type == ButtonRelease) 1238 || ev.type == ButtonRelease)
1095 if (hidden_pointer) 1239 if (hidden_pointer)
… …
1098 if (ev.type == KeyPress && hidden_pointer == 0) 1242 if (ev.type == KeyPress && hidden_pointer == 0)
1099 pointer_blank (); 1243 pointer_blank ();
1100 } 1244 }
1101#endif 1245#endif
1102 1246
1103#ifdef USE_XIM
1104 if (XFilterEvent (&ev, None))
1105 return;
1106#endif
1107
1108 Window unused_root, unused_child; 1247 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1248 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1249 unsigned int unused_mask;
1111
1112#ifdef DEBUG_X
1113 const char *const eventnames[] =
1114 { /* mason - this matches my system */
1115 "",
1116 "",
1117 "KeyPress",
1118 "KeyRelease",
1119 "ButtonPress",
1120 "ButtonRelease",
1121 "MotionNotify",
1122 "EnterNotify",
1123 "LeaveNotify",
1124 "FocusIn",
1125 "FocusOut",
1126 "KeymapNotify",
1127 "Expose",
1128 "GraphicsExpose",
1129 "NoExpose",
1130 "VisibilityNotify",
1131 "CreateNotify",
1132 "DestroyNotify",
1133 "UnmapNotify",
1134 "MapNotify",
1135 "MapRequest",
1136 "ReparentNotify",
1137 "ConfigureNotify",
1138 "ConfigureRequest",
1139 "GravityNotify",
1140 "ResizeRequest",
1141 "CirculateNotify",
1142 "CirculateRequest",
1143 "PropertyNotify",
1144 "SelectionClear",
1145 "SelectionRequest",
1146 "SelectionNotify",
1147 "ColormapNotify",
1148 "ClientMessage",
1149 "MappingNotify"
1150 };
1151#endif
1152
1153#ifdef DEBUG_X
1154 struct timeval tp;
1155 struct tm *ltt;
1156 (void)gettimeofday (&tp, NULL);
1157 ltt = localtime (& (tp.tv_sec));
1158 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));
1159#endif
1160 1250
1161 switch (ev.type) 1251 switch (ev.type)
1162 { 1252 {
1163 case KeyPress: 1253 case KeyPress:
1254#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1255 if (!(iso14755buf & ISO_14755_52))
1256#endif
1165 lookup_key (ev.xkey); 1257 lookup_key (ev.xkey);
1166 1258
1167 break; 1259 break;
1168 1260
1169 case KeyRelease: 1261 case KeyRelease:
1170 { 1262 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1263#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1172 KeySym ks; 1264 KeySym ks;
1173 1265
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1266 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1267#endif
1176 1268
1177#ifndef NO_FRILLS 1269#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1270 // ISO 14755 support
1179 if (iso14755buf) 1271 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1272 if (iso14755buf & ISO_14755_52)
1181 { 1273 {
1274# if ENABLE_OVERLAY
1275 scr_overlay_off ();
1276# endif
1277# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1278 // iso14755 part 5.2 handling: release time
1183 // first: controls 1279 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1280 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1281 && ((ks >= 0x40 && ks <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1282 || (ks >= 0x61 && ks <= 0x7f)))
1187 { 1283 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1284 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1189 commit_iso14755 (); 1285 commit_iso14755 ();
1190 return; // case-break; 1286 return; // case-break;
1191 } 1287 }
1192 1288
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1289 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1290 if (i[0] == ks)
1195 { 1291 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1292 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1293 commit_iso14755 ();
1198 return; // case-break; 1294 return; // case-break;
1199 } 1295 }
1200 1296
1297 scr_bell ();
1298# endif
1201 iso14755buf = 0; 1299 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1300 break;
1204 } 1301 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1302 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1303 {
1304# if ENABLE_OVERLAY
1305 scr_overlay_off ();
1306# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1307 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1308 commit_iso14755 ();
1309#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1310 else if (iso14755buf & ISO_14755_STARTED)
1311 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 1312 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1313
1314 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1315 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1316 }
1317# endif
1318 else
1319 iso14755buf = 0;
1211 } 1320 }
1212#endif 1321#endif
1213 1322
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1323#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1324 if (!(ev.xkey.state & ControlMask))
… …
1228 button_release (ev.xbutton); 1337 button_release (ev.xbutton);
1229 break; 1338 break;
1230 1339
1231 case ClientMessage: 1340 case ClientMessage:
1232 if (ev.xclient.format == 32 1341 if (ev.xclient.format == 32
1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1343 {
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1344 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1234 destroy (); 1345 destroy ();
1346#if ENABLE_EWMH
1347 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1348 XSendEvent (disp, ev.xclient.window = display->root,
1349 False, SubstructureRedirectMask | SubstructureNotifyMask,
1350 &ev);
1351#endif
1352 }
1353#if ENABLE_XEMBED
1354 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1355 {
1356 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1357 focus_in ();
1358 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1359 focus_out ();
1360 }
1361#endif
1235#ifdef OFFIX_DND 1362#ifdef OFFIX_DND
1236 /* OffiX Dnd (drag 'n' drop) protocol */ 1363 /* OffiX Dnd (drag 'n' drop) protocol */
1237 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1364 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1238 && (ev.xclient.data.l[0] == DndFile 1365 && (ev.xclient.data.l[0] == DndFile
1239 || ev.xclient.data.l[0] == DndDir 1366 || ev.xclient.data.l[0] == DndDir
1240 || ev.xclient.data.l[0] == DndLink)) 1367 || ev.xclient.data.l[0] == DndLink))
1241 { 1368 {
1242 /* Get Dnd data */ 1369 /* Get Dnd data */
1243 Atom ActualType; 1370 Atom ActualType;
1244 int ActualFormat; 1371 int ActualFormat;
1245 unsigned char *data; 1372 unsigned char *data;
1246 unsigned long Size, RemainingBytes; 1373 unsigned long Size, RemainingBytes;
1247 1374
1248 XGetWindowProperty (display->display, display->root, 1375 XGetWindowProperty (disp, display->root,
1249 xa[XA_DNDSELECTION], 1376 xa[XA_DNDSELECTION],
1250 0L, 1000000L, 1377 0L, 1000000L,
1251 False, AnyPropertyType, 1378 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1379 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1380 &Size, &RemainingBytes,
1254 &data); 1381 &data);
1255 XChangeProperty (display->display, display->root, 1382 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1383 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1384 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1385 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1262 } 1386 }
1263#endif /* OFFIX_DND */ 1387#endif /* OFFIX_DND */
1264 break; 1388 break;
1265 1389
1266 case MappingNotify: 1390 case MappingNotify:
… …
1291 break; 1415 break;
1292 } 1416 }
1293 break; 1417 break;
1294 1418
1295 case FocusIn: 1419 case FocusIn:
1296 if (!TermWin.focus) 1420 focus_in ();
1421 break;
1422
1423 case FocusOut:
1424 focus_out ();
1425 break;
1426
1427 case ConfigureNotify:
1428 if (ev.xconfigure.window == parent[0])
1297 { 1429 {
1298 TermWin.focus = 1; 1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1299 want_refresh = 1; 1431 ;
1300#ifdef USE_XIM 1432
1301 if (Input_Context != NULL) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1302 XSetICFocus (Input_Context);
1303#endif
1304#ifdef CURSOR_BLINK
1305 if (Options & Opt_cursorBlink)
1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1307#endif
1308#ifdef OFF_FOCUS_FADING
1309 if (rs[Rs_fade])
1310 { 1434 {
1311 PixColors = PixColorsFocused; 1435 seen_resize = 1;
1312 set_colorfgbg (); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1313 scr_clear ();
1314 scr_touch (true);
1315 } 1437 }
1316#endif
1317
1318 }
1319 break;
1320
1321 case FocusOut:
1322 if (TermWin.focus)
1323 {
1324 TermWin.focus = 0;
1325 want_refresh = 1;
1326#ifdef USE_XIM
1327 if (Input_Context != NULL)
1328 XUnsetICFocus (Input_Context);
1329#endif
1330#ifdef CURSOR_BLINK
1331 if (Options & Opt_cursorBlink)
1332 cursor_blink_ev.stop ();
1333 hidden_cursor = 0;
1334#endif
1335#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade])
1337 {
1338 PixColors = PixColorsUnFocused;
1339 set_colorfgbg ();
1340 scr_clear ();
1341 scr_touch (true);
1342 }
1343#endif
1344
1345 }
1346 break;
1347
1348 case ConfigureNotify:
1349 if (ev.xconfigure.window == TermWin.parent[0])
1350 {
1351 int height, width;
1352
1353 do
1354 { /* Wrap lots of configures into one */
1355 width = ev.xconfigure.width;
1356 height = ev.xconfigure.height;
1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1358 }
1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1360
1361 if (szHint.width != width || szHint.height != height)
1362 resize_all_windows (width, height, 1);
1363 1438
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1440 if (options & Opt_transparent)
1366 {
1367 check_our_parents (); 1441 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1442#endif
1372 } 1443 }
1373 break; 1444 break;
1374 1445
1375 case PropertyNotify: 1446 case PropertyNotify:
… …
1383 selection_clear (); 1454 selection_clear ();
1384 break; 1455 break;
1385 1456
1386 case SelectionNotify: 1457 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1458 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1459 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1460 break;
1391 1461
1392 case SelectionRequest: 1462 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1463 selection_send (ev.xselectionrequest);
1394 break; 1464 break;
1395 1465
1396 case UnmapNotify: 1466 case UnmapNotify:
1397 TermWin.mapped = 0; 1467 mapped = 0;
1398#ifdef TEXT_BLINK 1468#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1469 text_blink_ev.stop ();
1400#endif 1470#endif
1401 break; 1471 break;
1402 1472
1403 case MapNotify: 1473 case MapNotify:
1404 TermWin.mapped = 1; 1474 mapped = 1;
1405#ifdef TEXT_BLINK 1475#ifdef TEXT_BLINK
1406 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1407#endif 1477#endif
1408 break; 1478 break;
1409 1479
… …
1413 break; 1483 break;
1414#endif /* TRANSPARENT */ 1484#endif /* TRANSPARENT */
1415 1485
1416 case GraphicsExpose: 1486 case GraphicsExpose:
1417 case Expose: 1487 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == vt)
1419 { 1489 {
1420 do 1490 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1424 1494
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1496
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1430 1500
1431 scr_refresh (refresh_type); 1501 scr_refresh (refresh_type);
1432 } 1502 }
1433 else 1503 else
1434 { 1504 {
1435 XEvent unused_event; 1505 XEvent unused_event;
1436 1506
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1438 ; 1508 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1510 ;
1441 1511
1442 if (isScrollbarWindow (ev.xany.window)) 1512 if (isScrollbarWindow (ev.xany.window))
1443 { 1513 {
1444 scrollBar.setIdle (); 1514 scrollBar.setIdle ();
… …
1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1449 menubar_expose (); 1519 menubar_expose ();
1450#endif 1520#endif
1451 1521
1452#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1523 if (am_transparent && ev.xany.window == parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1524 XClearWindow (disp, ev.xany.window);
1455#endif 1525#endif
1456 } 1526 }
1457 break; 1527 break;
1458 1528
1459 case MotionNotify: 1529 case MotionNotify:
… …
1466 { 1536 {
1467 menubar_control (ev.xbutton); 1537 menubar_control (ev.xbutton);
1468 break; 1538 break;
1469 } 1539 }
1470#endif 1540#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1472 break; 1542 break;
1473 1543
1474 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == vt)
1475 { 1545 {
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1547 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1479 ; 1549 ;
1480 1550
1481 XQueryPointer (display->display, TermWin.vt, 1551 XQueryPointer (disp, vt,
1482 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1554 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1555 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1557 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1558 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1559 {
1490#endif 1560#endif
1561#if ISO_14755
1562 // 5.4
1563 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1564 {
1565 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1566 break;
1567 }
1568#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1571
1493#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1575 {
1497 int dist; 1576 int dist;
1498 1577
1499 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1582 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1583
1505 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1507 */ 1586 */
1508 selection_save_x=ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1590
1513 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1515 { 1593 {
1516 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1518 } 1596 }
1519 else 1597 else
1520 { 1598 {
1521 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1600 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1601 }
1602
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1603 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1;
1527 MIN_IT (scroll_selection_lines, 1606 MIN_IT (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1607 SELECTION_SCROLL_MAX_LINES);
1529 } 1608 }
1530 else 1609 else
1531 { 1610 {
1532 /* we are within the text window, so we 1611 /* we are within the text window, so we
1533 * shouldn't be scrolling 1612 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1614 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1615 sel_scroll_ev.stop();
1537 } 1616 }
1538#endif 1617#endif
1539#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1540
1541 } 1619 }
1542#endif 1620#endif
1543
1544 } 1621 }
1545 } 1622 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1624 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1625 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1549 MotionNotify, &ev)) ; 1626 MotionNotify, &ev))
1627 ;
1628
1550 XQueryPointer (display->display, scrollBar.win, 1629 XQueryPointer (disp, scrollBar.win,
1551 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1633 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1635 scrollbar_size ());
1557 scr_refresh (refresh_type); 1636 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1637 refresh_limit = 0;
… …
1560 } 1639 }
1561 break; 1640 break;
1562 } 1641 }
1563} 1642}
1564 1643
1644void
1645rxvt_term::focus_in ()
1646{
1647 if (!focus)
1648 {
1649 focus = 1;
1650 want_refresh = 1;
1651#if USE_XIM
1652 if (Input_Context != NULL)
1653 {
1654 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context);
1656 }
1657#endif
1658#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink)
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif
1662#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade])
1664 {
1665 pix_colors = pix_colors_focused;
1666 scr_recolour ();
1667 }
1668#endif
1669 }
1670}
1671
1672void
1673rxvt_term::focus_out ()
1674{
1675 if (focus)
1676 {
1677 focus = 0;
1678 want_refresh = 1;
1679
1680#if ENABLE_FRILLS || ISO_14755
1681 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY
1684 scr_overlay_off ();
1685#endif
1686#if USE_XIM
1687 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context);
1689#endif
1690#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink)
1692 cursor_blink_ev.stop ();
1693 hidden_cursor = 0;
1694#endif
1695#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade])
1697 {
1698 pix_colors = pix_colors_unfocused;
1699 scr_recolour ();
1700 }
1701#endif
1702 }
1703}
1704
1565#if TRANSPARENT 1705#if TRANSPARENT
1566void 1706void
1567rxvt_term::rootwin_cb (XEvent &ev) 1707rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1708{
1569 SET_R (this); 1709 SET_R (this);
… …
1574 case PropertyNotify: 1714 case PropertyNotify:
1575 /* 1715 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1716 * if user used some Esetroot compatible prog to set the root bg,
1577 * use the property to determine the pixmap. We use it later on. 1717 * use the property to determine the pixmap. We use it later on.
1578 */ 1718 */
1579 if (xa[XA_XROOTPMAPID] == 0)
1580 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1581
1582 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1719 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1721 return;
1584 1722
1585 /* FALLTHROUGH */ 1723 /* FALLTHROUGH */
1586 case ReparentNotify: 1724 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1726 want_refresh = want_full_refresh = 1;
1589 break; 1727 break;
1590 } 1728 }
1591} 1729}
1592#endif 1730#endif
… …
1596{ 1734{
1597 int reportmode = 0, clickintime; 1735 int reportmode = 0, clickintime;
1598 1736
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1600 if (!bypass_keystate) 1738 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740
1602 /* 1741 /*
1603 * VT window processing of button press 1742 * VT window processing of button press
1604 */ 1743 */
1605 if (ev.window == TermWin.vt) 1744 if (ev.window == vt)
1606 { 1745 {
1746#if ISO_14755
1747 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 {
1750 iso14755_54 (ev.x, ev.y);
1751 return;
1752 }
1753#endif
1754
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1755 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1756
1608 if (reportmode) 1757 if (reportmode)
1609 { 1758 {
1610 /* mouse report from vt window */ 1759 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1760 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1761 MEvent.state = ev.state;
… …
1641 } 1790 }
1642 else 1791 else
1643 { 1792 {
1644 if (ev.button != MEvent.button) 1793 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1794 MEvent.clicks = 0;
1795
1646 switch (ev.button) 1796 switch (ev.button)
1647 { 1797 {
1648 case Button1: 1798 case Button1:
1799 /* allow meta + click to select rectangular areas */
1800 /* should be done in screen.C */
1801#if ENABLE_FRILLS
1802 selection.rect = !!(ev.state & ModMetaMask);
1803#else
1804 selection.rect = false;
1805#endif
1806
1649 /* allow shift+left click to extend selection */ 1807 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1651 { 1809 {
1652 if (MEvent.button == Button1 && clickintime) 1810 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1811 selection_rotate (ev.x, ev.y);
1654 else 1812 else
1655 selection_extend (ev.x, ev.y, 1); 1813 selection_extend (ev.x, ev.y, 1);
… …
1670 case Button3: 1828 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1829 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1830 selection_rotate (ev.x, ev.y);
1673 else 1831 else
1674 selection_extend (ev.x, ev.y, 1); 1832 selection_extend (ev.x, ev.y, 1);
1833
1675 MEvent.button = Button3; 1834 MEvent.button = Button3;
1676 break; 1835 break;
1677 } 1836 }
1678 } 1837 }
1838
1679 MEvent.time = ev.time; 1839 MEvent.time = ev.time;
1680 return; 1840 return;
1681 } 1841 }
1682 1842
1683 /* 1843 /*
… …
1794 case Button3: 1954 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 1955 if (scrollBar.style != R_SB_XTERM)
1796 { 1956 {
1797 if (scrollbar_above_slider (ev.y)) 1957 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 1958# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 1959 scr_page (UP, nrow - 1);
1800# else 1960# else
1801 scr_page (UP, TermWin.nrow / 4); 1961 scr_page (UP, nrow / 4);
1802# endif 1962# endif
1803 else if (scrollbar_below_slider (ev.y)) 1963 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 1964# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 1965 scr_page (DN, nrow - 1);
1806# else 1966# else
1807 scr_page (DN, TermWin.nrow / 4); 1967 scr_page (DN, nrow / 4);
1808# endif 1968# endif
1809 else 1969 else
1810 scrollBar.setMotion (); 1970 scrollBar.setMotion ();
1811 } 1971 }
1812 else 1972 else
1813 { 1973 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 1974 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 1975 (nrow
1816 * scrollbar_position (ev.y) 1976 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 1977 / scrollbar_size ()));
1818 } 1978 }
1819 1979
1820 break; 1980 break;
… …
1836{ 1996{
1837 int reportmode = 0; 1997 int reportmode = 0;
1838 1998
1839 csrO = 0; /* reset csr Offset */ 1999 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2000 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2001 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2002
1843 if (scrollbar_isUpDn ()) 2003 if (scrollbar_isUpDn ())
1844 { 2004 {
1845 scrollBar.setIdle (); 2005 scrollBar.setIdle ();
1846 scrollbar_show (0); 2006 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH; 2008 refresh_type &= ~SMOOTH_REFRESH;
1849#endif 2009#endif
1850
1851 } 2010 }
2011
1852#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2013 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2014 sel_scroll_ev.stop();
1855#endif 2015#endif
2016
1856 if (ev.window == TermWin.vt) 2017 if (ev.window == vt)
1857 { 2018 {
2019#if ISO_14755
2020 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return;
2023#endif
1858 if (reportmode) 2024 if (reportmode)
1859 { 2025 {
1860 /* mouse report from vt window */ 2026 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2027 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2028 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2042 MEvent.button = AnyButton;
1877 mouse_report (ev); 2043 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2044#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2045 return;
1880 } 2046 }
2047
1881 /* 2048 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2049 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2050 * when overriding mouse reporting
1884 */ 2051 */
1885 if (PrivateModes & PrivMode_mouse_report 2052 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2053 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2054 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2055 selection_extend (ev.x, ev.y, 0);
1889 2056
1890 switch (ev.button) 2057 switch (ev.button)
… …
1905 2072
1906 v = ev.button == Button4 ? UP : DN; 2073 v = ev.button == Button4 ? UP : DN;
1907 2074
1908 if (ev.state & ShiftMask) 2075 if (ev.state & ShiftMask)
1909 i = 1; 2076 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2077 else if (options & Opt_mouseWheelScrollPage)
1911 i = TermWin.nrow - 1; 2078 i = nrow - 1;
1912 else 2079 else
1913 i = 5; 2080 i = 5;
1914 2081
1915# ifdef MOUSE_SLIP_WHEELING 2082# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2083 if (ev.state & ControlMask)
1917 { 2084 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2085 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2086 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1920 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2087 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1921 2088
1922 if (slip_wheel_ev.at < NOW) 2089 if (slip_wheel_ev.at < NOW)
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924 2091
1925 slip_wheel_ev.start (); 2092 slip_wheel_ev.start ();
… …
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i; 2136 int i;
1970 2137
1971 Visual* visual = display->visual; 2138 Visual *visual = display->visual;
1972 2139
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974 2141
1975 /* for convenience */ 2142 /* for convenience */
1976 mask_r = visual->red_mask; 2143 mask_r = visual->red_mask;
… …
2197 Atom atype; 2364 Atom atype;
2198 unsigned char *prop = NULL; 2365 unsigned char *prop = NULL;
2199 Window root, oldp, *list; 2366 Window root, oldp, *list;
2200 Pixmap rootpixmap = None; 2367 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2368 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2202 2370
2203 pchanged = 0; 2371 pchanged = 0;
2204 2372
2205 if (!(Options & Opt_transparent)) 2373 if (!(options & Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
2207 2375
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
2210 2378
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, parent[0], &wattr);
2212 2380
2213 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
2214 { 2382 {
2215 if (am_transparent) 2383 if (am_transparent)
2216 { 2384 {
2217 pchanged = 1; 2385 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
2220 } 2388 }
2221 2389
2222 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
2223 } 2391 }
2224 2392
2225 /* Get all X ops out of the queue so that our information is up-to-date. */ 2393 /* Get all X ops out of the queue so that our information is up-to-date. */
2226 XSync (display->display, False); 2394 XSync (disp, False);
2227 2395
2228 /* 2396 /*
2229 * Make the frame window set by the window manager have 2397 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2398 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that. 2399 * windows for each client, so we have to take care about that.
2232 */ 2400 */
2233 i = (xa[XA_XROOTPMAPID] 2401 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2404 &nitems, &bytes_after, &prop) == Success);
2237 2405
2238 if (!i || prop == NULL) 2406 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2407 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2243 2411
2244 if (!i || prop == NULL 2412 if (!i || prop == NULL
2245#if TINTING 2413#if TINTING
… …
2264 Window cr; 2432 Window cr;
2265 XImage *image; 2433 XImage *image;
2266 GC gc; 2434 GC gc;
2267 XGCValues gcvalue; 2435 XGCValues gcvalue;
2268 2436
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, parent[0], display->root,
2270 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
2273 nx = ny = 0; 2441 nx = ny = 0;
2274 2442
… …
2286 sy = 0; 2454 sy = 0;
2287 } 2455 }
2288 2456
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2459
2460 XSync (disp, False);
2291 allowedxerror = -1; 2461 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2463
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2465 /* XXX: may need a delay here? */
2296 allowedxerror = 0; 2466 allowedxerror = 0;
2297 2467
2298 if (image == NULL) 2468 if (image == NULL)
2299 { 2469 {
2300 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
2301 { 2471 {
2302 pchanged = 1; 2472 pchanged = 1;
2303 if (TermWin.pixmap != None) 2473 if (pixmap != None)
2304 { 2474 {
2305 XFreePixmap (display->display, TermWin.pixmap); 2475 XFreePixmap (disp, pixmap);
2306 TermWin.pixmap = None; 2476 pixmap = None;
2307 } 2477 }
2308 } 2478 }
2309 2479
2310 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
2311 } 2481 }
2312 else 2482 else
2313 { 2483 {
2314 if (TermWin.pixmap != None) 2484 if (pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap); 2485 XFreePixmap (disp, pixmap);
2316 2486
2317#if TINTING 2487#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint)) 2488 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2489 {
2320 unsigned short rm, gm, bm; 2490 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2491 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2492
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2493 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2494
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2495 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2496 }
2327#endif 2497#endif
2328 2498
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2499 pixmap = XCreatePixmap (disp, vt,
2330 szHint.width, szHint.height, image->depth); 2500 szHint.width, szHint.height, image->depth);
2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height); 2503 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc); 2504 XFreeGC (disp, gc);
2335 XDestroyImage (image); 2505 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]); 2507 XClearWindow (disp, parent[0]);
2338 2508
2339 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1; 2510 pchanged = 1;
2341 2511
2342 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
2343 } 2513 }
2344 } 2514 }
2345 2515
2346 if (!am_pixmap_trans) 2516 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518 else
2347 { 2519 {
2348 unsigned int n; 2520 unsigned int n;
2349 /* 2521 /*
2350 * InheritPixmap transparency 2522 * InheritPixmap transparency
2351 */ 2523 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2354 { 2525 {
2355 oldp = TermWin.parent[i]; 2526 oldp = parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2528 &parent[i], &list, &n);
2358 XFree (list); 2529 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2530
2361 if (TermWin.parent[i] == display->root) 2531 if (parent[i] == display->root)
2362 { 2532 {
2363 if (oldp != None) 2533 if (oldp != None)
2364 pchanged = 1; 2534 pchanged = 1;
2365 2535
2366 break; 2536 break;
2367 } 2537 }
2368 2538
2369 if (oldp != TermWin.parent[i]) 2539 if (oldp != parent[i])
2370 pchanged = 1; 2540 pchanged = 1;
2371 } 2541 }
2372 2542
2373 n = 0; 2543 n = 0;
2374 2544
2375 if (pchanged) 2545 if (pchanged)
2376 { 2546 {
2377 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
2378 { 2548 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, parent[n], &wattr);
2380 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2381 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2551 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2384 break; 2553 break;
2385 } 2554 }
2386 } 2555 }
2387 } 2556 }
2388 2557
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2558 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2390 { 2559 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2562 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
2396 } 2564 }
2397 else 2565 else
2398 { 2566 {
2399#if WAIT_FOR_WM 2567#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2568 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2570 sleep (1);
2403#endif 2571#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2406 { 2573 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2575 XClearWindow (disp, parent[n]);
2409 } 2576 }
2410 2577
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2412 am_transparent = 1; 2579 am_transparent = 1;
2413 } 2580 }
2414 2581
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2583 parent[i] = None;
2417 } 2584 }
2418 2585
2419 // this is experimental
2420 if (scrollBar.win) 2586 if (scrollBar.win)
2421 { 2587 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2589 scrollBar.setIdle ();
2425 scrollbar_show (0); 2590 scrollbar_show (0);
2591 }
2592
2593 if (am_transparent)
2594 {
2595 want_refresh = want_full_refresh = 1;
2596 if (am_pixmap_trans)
2597 flush ();
2426 } 2598 }
2427 2599
2428 return pchanged; 2600 return pchanged;
2429} 2601}
2430#endif 2602#endif
… …
2449 if (ch == NOCHAR) // TODO: improve 2621 if (ch == NOCHAR) // TODO: improve
2450 break; 2622 break;
2451 2623
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2625 {
2626 if (!seen_input)
2627 {
2628 seen_input = 1;
2629 // many badly-written programs (e.g. jed) contain a race condition:
2630 // they first read the screensize and then install a SIGWINCH handler.
2631 // some window managers resize the window early, and these programs
2632 // then sometimes get the size wrong.
2633 // unfortunately other programs are even more buggy and dislike
2634 // being sent SIGWINCH, so only do it when we were in fact being
2635 // resized.
2636 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH);
2638 }
2639
2454 /* Read a text string from the input buffer */ 2640 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2641 unicode_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2642 bool refreshnow = false;
2457 int nlines = 0; 2643 int nlines = 0;
2458 unicode_t *str = buf; 2644 unicode_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ);
2459 2646
2460 for (;;) 2647 for (;;)
2461 { 2648 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2463 break; 2650 break;
2464 2651
2465 *str++ = ch; 2652 *str++ = ch;
2466 2653
2467 if (ch == C0_LF) 2654 if (ch == C0_LF || str >= eol)
2468 { 2655 {
2656 if (ch == C0_LF)
2469 nlines++; 2657 nlines++;
2658
2470 refresh_count++; 2659 refresh_count++;
2471 2660
2472 if (!(Options & Opt_jumpScroll) 2661 if (!(options & Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2662 || (refresh_count >= refresh_limit * (nrow - 1)))
2474 { 2663 {
2475 refreshnow = true; 2664 refreshnow = true;
2476 ch = NOCHAR; 2665 ch = NOCHAR;
2477 break; 2666 break;
2478 } 2667 }
2479 2668
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2669 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2670 if (nlines >= nrow - 1)
2482 { 2671 {
2483 scr_add_lines (buf, nlines, str - buf); 2672 scr_add_lines (buf, nlines, str - buf);
2484 nlines = 0; 2673 nlines = 0;
2485 str = buf; 2674 str = buf;
2675 eol = str + min (ncol, UBUFSIZ);
2486 } 2676 }
2487 }
2488 2677
2489 if (str >= buf + UBUFSIZ) 2678 if (str >= eol)
2490 { 2679 {
2680 if (eol >= buf + UBUFSIZ)
2681 {
2491 ch = NOCHAR; 2682 ch = NOCHAR;
2492 break; 2683 break;
2684 }
2685 else
2686 eol = min (eol + ncol, buf + UBUFSIZ);
2687 }
2688
2493 } 2689 }
2494 2690
2495 seq_begin = cmdbuf_ptr; 2691 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2692 ch = next_char ();
2497 } 2693 }
… …
2504 * the number of pages between refreshes is refresh_limit, which 2700 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2701 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2702 */
2507 if (refreshnow) 2703 if (refreshnow)
2508 { 2704 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2705 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2706 refresh_limit++;
2511 else 2707 else
2512 { 2708 {
2513 flag = true; 2709 flag = true;
2514 scr_refresh (refresh_type); 2710 scr_refresh (refresh_type);
… …
2568 if (len == (size_t)-1) 2764 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2765 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2766
2571 // assume wchar == unicode 2767 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2768 cmdbuf_ptr += len;
2573 return wc; 2769 return wc & UNICODE_MASK;
2574 } 2770 }
2575 2771
2576 return NOCHAR; 2772 return NOCHAR;
2577} 2773}
2578 2774
… …
2704 process_escape_seq (); 2900 process_escape_seq ();
2705 break; 2901 break;
2706 case C0_ENQ: /* terminal Status */ 2902 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 2903 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2904 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2905 (unsigned int)strlen (rs[Rs_answerbackstring]));
2710 else 2906 else
2711 tt_write ((unsigned char *)VT100_ANS, 2907 tt_write ((unsigned char *)VT100_ANS,
2712 (unsigned int)STRLEN (VT100_ANS)); 2908 (unsigned int)strlen (VT100_ANS));
2713 break; 2909 break;
2714 case C0_BEL: /* bell */ 2910 case C0_BEL: /* bell */
2715 scr_bell (); 2911 scr_bell ();
2716 break; 2912 break;
2717 case C0_BS: /* backspace */ 2913 case C0_BS: /* backspace */
… …
2816void 3012void
2817rxvt_term::process_escape_seq () 3013rxvt_term::process_escape_seq ()
2818{ 3014{
2819 unicode_t ch = cmd_getc (); 3015 unicode_t ch = cmd_getc ();
2820 3016
2821 if (PrivateModes & PrivMode_vt52) 3017 if (priv_modes & PrivMode_vt52)
2822 { 3018 {
2823 process_escape_vt52 (ch); 3019 process_escape_vt52 (ch);
2824 return; 3020 return;
2825 } 3021 }
2826 3022
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 3037 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 3038 break;
2843 case '+': 3039 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 3040 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 3041 break;
2846#ifndef NO_FRILLS 3042#if ENABLE_FRILLS
2847 case '6': 3043 case '6':
2848 scr_backindex (); 3044 scr_backindex ();
2849 break; 3045 break;
2850#endif 3046#endif
2851 case '7': 3047 case '7':
2852 scr_cursor (SAVE); 3048 scr_cursor (SAVE);
2853 break; 3049 break;
2854 case '8': 3050 case '8':
2855 scr_cursor (RESTORE); 3051 scr_cursor (RESTORE);
2856 break; 3052 break;
2857#ifndef NO_FRILLS 3053#if ENABLE_FRILLS
2858 case '9': 3054 case '9':
2859 scr_forwardindex (); 3055 scr_forwardindex ();
2860 break; 3056 break;
2861#endif 3057#endif
2862 case '=': 3058 case '=':
… …
3041 { 3237 {
3042 switch (priv) 3238 switch (priv)
3043 { 3239 {
3044 case '>': 3240 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 3241 if (ch == CSI_DA) /* secondary device attributes */
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3242 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3047 break; 3243 break;
3048 case '?': 3244 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3245 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 3246 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 3247 break;
… …
3156 3352
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3353 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 3354 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 3355 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3356 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3357 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 3358 break;
3163 3359
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3360 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3361 tt_write ((const unsigned char *)VT100_ANS,
3166 (unsigned int) (sizeof (VT100_ANS) - 1)); 3362 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3363 break;
3168 3364
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3365 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3366 process_sgr_mode (nargs, arg);
3171 break; 3367 break;
… …
3178 break; 3374 break;
3179 case 6: /* CPR requested */ 3375 case 6: /* CPR requested */
3180 scr_report_position (); 3376 scr_report_position ();
3181 break; 3377 break;
3182 case 7: /* unofficial extension */ 3378 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3379 if (options & Opt_insecure)
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3380 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3381 break;
3186 case 8: /* unofficial extension */ 3382 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3383 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3384 break;
3189 } 3385 }
… …
3225 break; 3421 break;
3226 3422
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3423 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3424 if (arg[0] == 4)
3229 scr_insert_mode (0); 3425 scr_insert_mode (0);
3426 else if (arg[0] == 20)
3427 priv_modes &= ~PrivMode_LFNL;
3230 break; 3428 break;
3231 3429
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3430 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3431 if (arg[0] == 4)
3234 scr_insert_mode (1); 3432 scr_insert_mode (1);
3433 else if (arg[0] == 20)
3434 priv_modes |= PrivMode_LFNL;
3235 break; 3435 break;
3236 3436
3237 /* 3437 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3438 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3439 */
… …
3251 break; 3451 break;
3252 case CSI_75: 3452 case CSI_75:
3253 scr_cursor (RESTORE); 3453 scr_cursor (RESTORE);
3254 break; 3454 break;
3255 3455
3256#ifndef NO_FRILLS 3456#if ENABLE_FRILLS
3257 case CSI_74: 3457 case CSI_74:
3258 process_window_ops (arg, nargs); 3458 process_window_ops (arg, nargs);
3259 break; 3459 break;
3260#endif 3460#endif
3261 3461
… …
3268 break; 3468 break;
3269 } 3469 }
3270} 3470}
3271/*}}} */ 3471/*}}} */
3272 3472
3273#ifndef NO_FRILLS 3473#if ENABLE_FRILLS
3274/* ARGSUSED */ 3474/* ARGSUSED */
3275void 3475void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3476rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3477{
3278 int x, y; 3478 int x, y;
3279 XWindowAttributes wattr; 3479 XWindowAttributes wattr;
3280 Window wdummy; 3480 Window wdummy;
3481 dDisp;
3281 3482
3282 if (nargs == 0) 3483 if (nargs == 0)
3283 return; 3484 return;
3284 3485
3285 switch (args[0]) 3486 switch (args[0])
3286 { 3487 {
3287 /* 3488 /*
3288 * commands 3489 * commands
3289 */ 3490 */
3290 case 1: /* deiconify window */ 3491 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3492 XMapWindow (disp, parent[0]);
3292 break; 3493 break;
3293 case 2: /* iconify window */ 3494 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3495 XIconifyWindow (disp, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3496 break;
3297 case 3: /* set position (pixels) */ 3497 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3498 XMoveWindow (disp, parent[0], args[1], args[2]);
3299 break; 3499 break;
3300 case 4: /* set size (pixels) */ 3500 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3502 break;
3303 case 5: /* raise window */ 3503 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3504 XRaiseWindow (disp, parent[0]);
3305 break; 3505 break;
3306 case 6: /* lower window */ 3506 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3507 XLowerWindow (disp, parent[0]);
3308 break; 3508 break;
3309 case 7: /* refresh window */ 3509 case 7: /* refresh window */
3310 scr_touch (true); 3510 scr_touch (true);
3311 break; 3511 break;
3312 case 8: /* set size (chars) */ 3512 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3513 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3514 (unsigned int) (args[1] * fheight));
3315 break; 3515 break;
3316 3516
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3517 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3518 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3519 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3520 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3521 (unsigned int) (args[1] * fheight));
3322 break; 3522 break;
3323 3523
3324 3524
3325 /* 3525 /*
3326 * reports - some output format copied from XTerm 3526 * reports - some output format copied from XTerm
3327 */ 3527 */
3328 case 11: /* report window state */ 3528 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3529 XGetWindowAttributes (disp, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3531 break;
3332 case 13: /* report window position */ 3532 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3534 XTranslateCoordinates (disp, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3535 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3536 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3537 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3538 break;
3339 case 14: /* report window size (pixels) */ 3539 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3540 XGetWindowAttributes (disp, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3542 break;
3343 case 18: /* report text area size (chars) */ 3543 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3544 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3545 break;
3346 case 19: /* report window size (chars) */ 3546 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3547 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3548 break;
3349 case 20: /* report icon label */ 3549 case 20: /* report icon label */
3350 { 3550 {
3351 char *s; 3551 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3552 XGetIconName (disp, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3554 XFree (s);
3355 } 3555 }
3356 break; 3556 break;
3357 case 21: /* report window title */ 3557 case 21: /* report window title */
3358 { 3558 {
3359 char *s; 3559 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3560 XFetchName (disp, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3562 XFree (s);
3363 } 3563 }
3364 break; 3564 break;
3365 } 3565 }
3366} 3566}
… …
3372 * ends_how is terminator used. returned input must be free()'d 3572 * ends_how is terminator used. returned input must be free()'d
3373 */ 3573 */
3374unsigned char * 3574unsigned char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3575rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3576{
3377 unicode_t prev = 0, ch; 3577 unicode_t ch;
3578 bool seen_esc = false;
3378 unsigned int n = 0; 3579 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3580 wchar_t string[STRING_MAX];
3381 3581
3382 while ((ch = cmd_getc ()) != NOCHAR) 3582 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3583 {
3384 if (prev == C0_ESC) 3584 if (seen_esc)
3385 { 3585 {
3386 if (ch == 0x5c) /* 7bit ST */ 3586 if (ch == 0x5c) /* 7bit ST */
3387 break; 3587 break;
3388 else 3588 else
3389 return NULL; 3589 return NULL;
3390 } 3590 }
3591 else if (ch == C0_ESC)
3592 {
3593 seen_esc = true;
3594 continue;
3595 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3596 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3597 break;
3393 else if (ch < 0x20) 3598 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3599 return NULL; /* other control character - exit */
3395 3600
3396 if (n >= sizeof (string) - 1) 3601 seen_esc = false;
3602
3603 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3604 // stop at some sane length
3398 return NULL; 3605 return NULL;
3399 3606
3400 if (ch == C0_SYN) 3607 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3608 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3609 else
3406 string[n++] = prev = ch; 3610 string[n++] = ch;
3407 } 3611 }
3408 3612
3409 string[n++] = '\0'; 3613 string[n++] = '\0';
3410 3614
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3615 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3616
3416 return s; 3617 return (unsigned char *)rxvt_wcstombs (string);
3417} 3618}
3418 3619
3419/*----------------------------------------------------------------------*/ 3620/*----------------------------------------------------------------------*/
3420/* 3621/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3622 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3667rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3467{ 3668{
3468 if (str[0] == '?' && !str[1]) 3669 if (str[0] == '?' && !str[1])
3469 { 3670 {
3470 unsigned short r, g, b; 3671 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3672 pix_colors_focused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3673 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 } 3674 }
3474 else 3675 else
3475 set_window_color (color, str); 3676 set_window_color (color, str);
3476} 3677}
3477 3678
3478/* 3679/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3480 * 0 = change iconName/title
3481 * 1 = change iconName
3482 * 2 = change title
3483 * 4 = change color
3484 * 10 = change fg color
3485 * 11 = change bg color
3486 * 12 = change text color
3487 * 13 = change mouse foreground color
3488 * 17 = change highlight character colour
3489 * 18 = change bold character color
3490 * 19 = change underlined character color
3491 * 46 = change logfile (not implemented)
3492 * 50 = change font
3493 *
3494 * rxvt extensions:
3495 * 20 = bg pixmap
3496 * 39 = change default fg color
3497 * 49 = change default bg color
3498 * 55 = dump scrollback buffer and all of screen
3499 * 701 = change locale
3500 * 702 = find font
3501 * 703 = menu
3502 */ 3681 */
3503void 3682void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3505{ 3684{
3506 int changed = 0; 3685 int changed = 0;
3507 int color; 3686 int color;
3508 char *buf, *name; 3687 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3688 bool query = str[0] == '?' && !str[1];
3689 int saveop = op;
3690 dDisp;
3510 3691
3511 assert (str != NULL); 3692 assert (str != NULL);
3512 switch (op) 3693 switch (op)
3513 { 3694 {
3514 case XTerm_name: 3695 case XTerm_name:
… …
3521 set_title (str); 3702 set_title (str);
3522 break; 3703 break;
3523 case XTerm_property: 3704 case XTerm_property:
3524 if (str[0] == '?') 3705 if (str[0] == '?')
3525 { 3706 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3707 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3708 Atom actual_type;
3528 int actual_format; 3709 int actual_format;
3529 unsigned long nitems; 3710 unsigned long nitems;
3530 unsigned long bytes_after; 3711 unsigned long bytes_after;
3531 unsigned char *value = 0; 3712 unsigned char *value = 0;
3532 const char *str = ""; 3713 const char *str = "";
3533 3714
3534 if (prop 3715 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3716 && XGetWindowProperty (disp, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3717 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3718 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3719 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3720 && actual_type != None
3540 && actual_format == 8) 3721 && actual_format == 8)
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3730 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3731
3551 if (eq) 3732 if (eq)
3552 { 3733 {
3553 *eq = 0; 3734 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3735 set_utf8_property (display->atom (str), eq + 1);
3555 display->atom (str), XA_STRING, 8,
3556 PropModeReplace, (unsigned char *)eq + 1,
3557 strlen (eq + 1));
3558 } 3736 }
3559 else 3737 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3738 XDeleteProperty (disp, parent[0],
3561 display->atom (str)); 3739 display->atom (str));
3562 } 3740 }
3563 break; 3741 break;
3564 3742
3565 case XTerm_Color: 3743 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3744 for (buf = (char *)str; buf && *buf;)
3567 { 3745 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3746 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3747 break;
3570 3748
3571 *name++ = '\0'; 3749 *name++ = '\0';
3572 color = atoi (buf); 3750 color = atoi (buf);
3573 3751
3574 if (color < 0 || color >= TOTAL_COLORS) 3752 if (color < 0 || color >= TOTAL_COLORS)
3575 break; 3753 break;
3576 3754
3577 if ((buf = STRCHR (name, ';')) != NULL) 3755 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3756 *buf++ = '\0';
3579 3757
3580 if (name[0] == '?' && !name[1]) 3758 if (name[0] == '?' && !name[1])
3581 { 3759 {
3582 unsigned short r, g, b; 3760 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3761 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3584 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3762 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 } 3763 }
3586 else 3764 else
3587 set_window_color (color + minCOLOR, name); 3765 set_window_color (color + minCOLOR, name);
3588 } 3766 }
… …
3611 case XTerm_Color_UL: 3789 case XTerm_Color_UL:
3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3613 break; 3791 break;
3614 case XTerm_Color_RV: 3792 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3794 break;
3795 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3797 break;
3798#endif
3799#if TRANSPARENT && TINTING
3800 case URxvt_Color_tint:
3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3802 check_our_parents ();
3803 if (am_transparent)
3804 want_full_refresh = want_refresh = 1;
3616 break; 3805 break;
3617#endif 3806#endif
3618 3807
3619 case XTerm_Pixmap: 3808 case XTerm_Pixmap:
3620 if (*str != ';') 3809 if (*str != ';')
… …
3623 scale_pixmap (""); /* reset to default scaling */ 3812 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3813 set_bgPixmap (str); /* change pixmap */
3625#endif 3814#endif
3626 scr_touch (true); 3815 scr_touch (true);
3627 } 3816 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3817 while ((str = strchr (str, ';')) != NULL)
3629 { 3818 {
3630 str++; 3819 str++;
3631#if XPM_BACKGROUND 3820#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3821 changed += scale_pixmap (str);
3633#endif 3822#endif
3634
3635 } 3823 }
3824
3636 if (changed) 3825 if (changed)
3637 { 3826 {
3638#ifdef XPM_BACKGROUND 3827#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3828 resize_pixmap ();
3640#endif 3829#endif
… …
3651 3840
3652 case XTerm_logfile: 3841 case XTerm_logfile:
3653 // TODO, when secure mode? 3842 // TODO, when secure mode?
3654 break; 3843 break;
3655 3844
3656 case XTerm_font:
3657 if (query)
3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc
3660 ? TermWin.fontset->fontdesc : "",
3661 resp);
3662 else
3663 change_font (str);
3664 break;
3665
3666#ifndef NO_FRILLS
3667 case XTerm_locale:
3668 if (query)
3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp);
3670 else
3671 {
3672 set_locale (str);
3673# ifdef USE_XIM
3674 im_cb ();
3675# endif
3676 }
3677 break;
3678
3679 case XTerm_findfont:
3680 {
3681 int fid = TermWin.fontset->find_font (atoi (str));
3682 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3683 fid,
3684 (Options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3685 resp);
3686 }
3687 break;
3688#endif
3689
3690#ifdef MENUBAR 3845#ifdef MENUBAR
3691 case XTerm_Menu: 3846 case URxvt_Menu:
3692 if (Options & Opt_insecure) 3847 if (options & Opt_insecure)
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3694 break; 3849 break;
3695#endif 3850#endif
3696#if 0 3851#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3852 case XTerm_dumpscreen: /* no error notices */
… …
3701 { 3856 {
3702 scr_dump (fd); 3857 scr_dump (fd);
3703 close (fd); 3858 close (fd);
3704 } 3859 }
3705 } 3860 }
3861 break;
3862#endif
3863 case XTerm_font:
3864 op = URxvt_font;
3865 case URxvt_font:
3866#if ENABLE_STYLES
3867 case URxvt_boldFont:
3868 case URxvt_italicFont:
3869 case URxvt_boldItalicFont:
3870#endif
3871 if (query)
3872 tt_printf ("\33]%d;%-.250s%c", saveop,
3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3874 ? fontset[op - URxvt_font]->fontdesc : "",
3875 resp);
3876 else
3877 {
3878 const char *&res = rs[Rs_font + (op - URxvt_font)];
3879
3880 res = strdup (str);
3881 allocated.push_back ((void *)res);
3882 set_fonts ();
3883 }
3884 break;
3885
3886#if ENABLE_FRILLS
3887 case URxvt_locale:
3888 if (query)
3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3890 else
3891 {
3892 set_locale (str);
3893 pty.set_utf8_mode (enc_utf8);
3894 init_xlocale ();
3895 }
3896 break;
3897
3898 case URxvt_view_up:
3899 case URxvt_view_down:
3900 int lines = atoi (str);
3901
3902 if (lines)
3903 scr_page (op == URxvt_view_up ? UP : DN, lines);
3904 else
3905 {
3906 scr_erase_savelines ();
3907 }
3908
3706 break; 3909 break;
3707#endif 3910#endif
3708 } 3911 }
3709} 3912}
3710/*----------------------------------------------------------------------*/ 3913/*----------------------------------------------------------------------*/
… …
3724{ 3927{
3725 int state; 3928 int state;
3726 3929
3727 if (mode == 's') 3930 if (mode == 's')
3728 { 3931 {
3729 SavedModes |= (PrivateModes & bit); 3932 SavedModes |= (priv_modes & bit);
3730 return -1; 3933 return -1;
3731 } 3934 }
3732 else 3935 else
3733 { 3936 {
3734 if (mode == 'r') 3937 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3938 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 3939 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3940 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 3941 PrivMode (state, bit);
3739 } 3942 }
3740 3943
3741 return state; 3944 return state;
3742} 3945}
… …
3760 { 3, PrivMode_132 }, 3963 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 3964 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 3965 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 3966 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 3967 { 7, PrivMode_Autowrap },
3968 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 3969 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 3970#ifdef menuBar_esc
3767 { menuBar_esc, PrivMode_menuBar }, 3971 { menuBar_esc, PrivMode_menuBar },
3768#endif 3972#endif
3973 // 18, 19 printing-related
3974 { 25, PrivMode_VisibleCursor },
3769#ifdef scrollBar_esc 3975#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 3976 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 3977#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 3978 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 3979 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 3980 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 3981 // 45 margin bell NYI
3779 // 46 start logging 3982 // 46 start logging
… …
3820 4023
3821 /* extra handling for values with state unkept */ 4024 /* extra handling for values with state unkept */
3822 switch (arg[i]) 4025 switch (arg[i])
3823 { 4026 {
3824 case 1048: /* alternative cursor save */ 4027 case 1048: /* alternative cursor save */
4028 case 1049:
3825 if (Options & Opt_secondaryScreen) 4029 if (options & Opt_secondaryScreen)
3826 if (mode == 0) 4030 if (mode == 0)
3827 scr_cursor (RESTORE); 4031 scr_cursor (RESTORE);
3828 else if (mode == 1) 4032 else if (mode == 1)
3829 scr_cursor (SAVE); 4033 scr_cursor (SAVE);
3830 break; 4034 break;
… …
3841 * within VT52 mode 4045 * within VT52 mode
3842 */ 4046 */
3843 PrivMode (1, PrivMode_vt52); 4047 PrivMode (1, PrivMode_vt52);
3844 break; 4048 break;
3845 case 3: /* 80/132 */ 4049 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4050 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4051 set_widthheight (((state ? 132 : 80) * fwidth), height);
3848 break; 4052 break;
3849 case 4: /* smooth scrolling */ 4053 case 4: /* smooth scrolling */
3850 if (state) 4054 if (state)
3851 Options &= ~Opt_jumpScroll; 4055 options &= ~Opt_jumpScroll;
3852 else 4056 else
3853 Options |= Opt_jumpScroll; 4057 options |= Opt_jumpScroll;
3854 break; 4058 break;
3855 case 5: /* reverse video */ 4059 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4060 scr_rvideo_mode (state);
3857 break; 4061 break;
3858 case 6: /* relative/absolute origins */ 4062 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4066 scr_autowrap (state);
3863 break; 4067 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4068 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4069 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4070 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4071 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4072 break;
3869#ifdef menuBar_esc 4073#ifdef menuBar_esc
3870 case menuBar_esc: 4074 case menuBar_esc:
3871#ifdef MENUBAR 4075#ifdef MENUBAR
3872 map_menuBar (state); 4076 map_menuBar (state);
… …
3892 break; 4096 break;
3893 /* case 66: - application key pad */ 4097 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4098 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4099 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4100 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4101 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4102 break;
3899#if 0 4103#if 0
3900 case 1001: 4104 case 1001:
3901 break; /* X11 mouse highlighting */ 4105 break; /* X11 mouse highlighting */
3902#endif 4106#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4107 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state) 4108 if (state)
3905 Options &= ~Opt_scrollTtyOutput; 4109 options &= ~Opt_scrollTtyOutput;
3906 else 4110 else
3907 Options |= Opt_scrollTtyOutput; 4111 options |= Opt_scrollTtyOutput;
3908 break; 4112 break;
3909 case 1011: /* scroll to bottom on key press */ 4113 case 1011: /* scroll to bottom on key press */
3910 if (state) 4114 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4115 options |= Opt_scrollTtyKeypress;
3912 else 4116 else
3913 Options &= ~Opt_scrollTtyKeypress; 4117 options &= ~Opt_scrollTtyKeypress;
3914 break; 4118 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4119 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4120 if (options & Opt_secondaryScreen)
3917 if (current_screen != PRIMARY) 4121 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4122 scr_erase_screen (2);
3919 scr_change_screen (state); 4123 scr_change_screen (state);
3920 break; 4124 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4125 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4126 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4127 if (options & Opt_secondaryScreen)
3924 if (current_screen != PRIMARY) 4128 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4129 scr_erase_screen (2);
3926 break; 4130 break;
3927 default: 4131 default:
3928 break; 4132 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4158 rendset = 0, rendstyle = ~RS_None;
3955 break; 4159 break;
3956 case 1: 4160 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4161 rendset = 1, rendstyle = RS_Bold;
3958 break; 4162 break;
3959 //case 2: // faint or second colour 4163 //case 2: // low intensity
4164 case 3:
4165 rendset = 1, rendstyle = RS_Italic;
4166 break;
3960 case 4: 4167 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4168 rendset = 1, rendstyle = RS_Uline;
3962 break; 4169 break;
3963 case 5: // slowly blinking 4170 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4171 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4183 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4184 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4185 //...
3979 //case 19: // ninth alt font 4186 //case 19: // ninth alt font
3980 //case 20: // gothic 4187 //case 20: // gothic
3981 case 21: // disable bold, faint 4188 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4189 rendset = 0, rendstyle = RS_Bold;
3983 break; 4190 break;
3984 case 22: 4191 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4192 rendset = 0, rendstyle = RS_Bold;
3986 break; 4193 break;
3987 //case 23: disable italic 4194 case 23: // disable italic
4195 rendset = 0, rendstyle = RS_Italic;
4196 break;
3988 case 24: 4197 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4198 rendset = 0, rendstyle = RS_Uline;
3990 break; 4199 break;
3991 case 25: 4200 case 25:
4201 rendset = 0, rendstyle = RS_Blink;
4202 break;
4203 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4204 rendset = 0, rendstyle = RS_Blink;
3993 break; 4205 break;
3994 case 27: 4206 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4207 rendset = 0, rendstyle = RS_RVid;
3996 break; 4208 break;
… …
4014 case 35: 4226 case 35:
4015 case 36: 4227 case 36:
4016 case 37: 4228 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4229 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4230 break;
4019#ifdef TTY_256COLOR 4231 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4232 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4233 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4234 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4235 i += 2;
4025 } 4236 }
4026 break; 4237 break;
4027#endif
4028 case 39: /* default fg */ 4238 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4239 scr_color (Color_fg, Color_fg);
4030 break; 4240 break;
4031 4241
4032 case 40: 4242 case 40:
… …
4037 case 45: 4247 case 45:
4038 case 46: 4248 case 46:
4039 case 47: 4249 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4250 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4251 break;
4042#ifdef TTY_256COLOR 4252 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4253 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4254 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4255 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4256 i += 2;
4048 } 4257 }
4049 break; 4258 break;
4050#endif
4051 case 49: /* default bg */ 4259 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4260 scr_color (Color_bg, Color_bg);
4053 break; 4261 break;
4262
4263 //case 50: // not variable spacing
4054 4264
4055#ifndef NO_BRIGHTCOLOR 4265#ifndef NO_BRIGHTCOLOR
4056 case 90: 4266 case 90:
4057 case 91: /* set bright fg color */ 4267 case 91: /* set bright fg color */
4058 case 92: 4268 case 92:
4059 case 93: 4269 case 93:
4060 case 94: 4270 case 94:
4061 case 95: 4271 case 95:
4062 case 96: 4272 case 96:
4063 case 97: 4273 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4274 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4275 break;
4067 case 100: 4276 case 100:
4068 case 101: /* set bright bg color */ 4277 case 101: /* set bright bg color */
4069 case 102: 4278 case 102:
4070 case 103: 4279 case 103:
4071 case 104: 4280 case 104:
4072 case 105: 4281 case 105:
4073 case 106: 4282 case 106:
4074 case 107: 4283 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4285 break;
4078#endif 4286#endif
4079 4287
4080 } 4288 }
4081 } 4289 }
… …
4088{ 4296{
4089 unicode_t ch, cmd = cmd_getc (); 4297 unicode_t ch, cmd = cmd_getc ();
4090 4298
4091 if (cmd == 'Q') 4299 if (cmd == 'Q')
4092 { /* query graphics */ 4300 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4301 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4302 return;
4095 } 4303 }
4096 /* swallow other graphics sequences until terminating ':' */ 4304 /* swallow other graphics sequences until terminating ':' */
4097 do 4305 do
4098 ch = cmd_getc (); 4306 ch = cmd_getc ();
… …
4113 unsigned char buf[256]; 4321 unsigned char buf[256];
4114 4322
4115 va_start (arg_ptr, fmt); 4323 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4324 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4325 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4326 tt_write (buf, strlen (buf));
4119} 4327}
4120 4328
4121/* ---------------------------------------------------------------------- */ 4329/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4330/* Write data to the pty as typed by the user, pasted with the mouse,
4123 * or generated by us in response to a query ESC sequence. 4331 * or generated by us in response to a query ESC sequence.
4124 */ 4332 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334
4125void 4335void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4336rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4127{ 4337{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4338 if (v_buflen == 0)
4339 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4129 4341
4130 if (len) 4342 if ((unsigned int)written == len)
4343 return;
4344
4345 data += written;
4346 len -= written;
4131 { 4347 }
4348
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4350
4351 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len;
4353
4354 pty_ev.set (EVENT_READ | EVENT_WRITE);
4355}
4356
4357void rxvt_term::pty_write ()
4358{
4359 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4360
4361 if (written > 0)
4362 {
4363 v_buflen -= written;
4364
4132 if (v_buflen == 0) 4365 if (v_buflen == 0)
4133 { 4366 {
4134 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
4135
4136 if ((unsigned int)written == len)
4137 return;
4138
4139 data += written;
4140 len -= written;
4141 }
4142
4143
4144 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4145
4146 memcpy (v_buffer + v_buflen, data, len);
4147 v_buflen += len;
4148 }
4149
4150 for (;;)
4151 {
4152 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4153
4154 if (written > 0)
4155 {
4156 v_buflen -= written;
4157
4158 if (v_buflen == 0)
4159 {
4160 free (v_buffer); 4367 free (v_buffer);
4161 v_buffer = 0; 4368 v_buffer = 0;
4162 v_buflen = 0; 4369 v_buflen = 0;
4163 4370
4164 pty_ev.set (EVENT_READ); 4371 pty_ev.set (EVENT_READ);
4165 return;
4166 }
4167
4168 memmove (v_buffer, v_buffer + written, v_buflen);
4169 }
4170 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4171 // original code just ignores this...
4172 destroy ();
4173 else
4174 {
4175 pty_ev.set (EVENT_READ | EVENT_WRITE);
4176 return; 4372 return;
4177 } 4373 }
4374
4375 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4376 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this...
4379 destroy ();
4179} 4380}
4180 4381
4181/*----------------------- end-of-file (C source) -----------------------*/ 4382/*----------------------- end-of-file (C source) -----------------------*/
4182 4383

Diff Legend

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