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.221 by root, Sat Dec 31 18:27:57 2005 UTC

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

Diff Legend

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