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.218 by root, Sat Dec 31 16:40:28 2005 UTC

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

Diff Legend

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