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

Diff Legend

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