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

Diff Legend

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