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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.201 by root, Mon Feb 21 19:26:07 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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;
65
66#if ENABLE_FRILLS || ISO_14755
67
68#define ISO_14755_STARTED 0x80000000UL
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
73
74#if ISO_14755
75static unsigned short iso14755_symtab[] = {
76 // keysym, unicode
77 XK_Left, 0x2190,
78 XK_KP_Left, 0x2190,
79 XK_Up, 0x2191,
80 XK_KP_Up, 0x2191,
81 XK_Right, 0x2192,
82 XK_KP_Right, 0x2192,
83 XK_Down, 0x2193,
84 XK_KP_Down, 0x2193,
85 XK_Linefeed, 0x21b4,
86 XK_Return, 0x21b5,
87 XK_KP_Enter, 0x21b5,
88
89 XK_Prior, 0x21de,
90 XK_Next, 0x21df,
91 XK_Tab, 0x21e5,
92 XK_ISO_Left_Tab, 0x21e6,
93 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7,
95
96 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0,
104 XK_Home, 0x21f1,
105 XK_End, 0x21f2,
106
107 XK_Execute, 0x2318,
108 XK_Begin, 0x2320,
109 XK_Delete, 0x2326,
110 XK_Clear, 0x2327,
111 XK_BackSpace, 0x232b,
112 XK_Insert, 0x2380,
113 XK_Control_L, 0x2388,
114 XK_Control_R, 0x2388,
115 XK_Pause, 0x2389,
116 XK_Break, 0x238a,
117 XK_Escape, 0x238b,
118 XK_Undo, 0x238c,
119 XK_Print, 0x2399,
120
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,
129 XK_KP_Space, 0x2422,
130#endif
131 0,
132};
133
134void
135rxvt_term::iso14755_54 (int x, int y)
136{
137 x = Pixel2Col (x);
138 y = Pixel2Row (y);
139
140 if (x < 0 || x >= TermWin.ncol
141 || y < 0 || y >= TermWin.nrow)
142 return;
143
144 for (;;)
145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
147
148 if (t != NOCHAR || !x)
149 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54;
153 break;
154 }
155
156 x--;
157 }
158
159}
160#endif
161
162#if ENABLE_OVERLAY
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2;
169 int len;
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 int width = strlen (f->name);
189
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
191
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193
194 for (int y = 0; y < len; y++)
195 {
196 char buf[9];
197
198 ch = *chr++;
199
200 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '=');
203#if !UNICODE3
204 if (ch >= 0x10000)
205 ch = 0xfffd;
206#endif
207 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r);
209 }
210
211 scr_overlay_set (0, len, f->name);
212
213#if ENABLE_COMBINING
214 if (alloc)
215 delete [] alloc;
216#endif
217}
218#endif
219
220void
221rxvt_term::commit_iso14755 ()
222{
223 wchar_t ch[2];
224
225 ch[0] = iso14755buf & ISO_14755_MASK;
226 ch[1] = 0;
227
228 if (iso14755buf & ISO_14755_51)
229 {
230 char mb[16];
231 int len;
232
233 // allow verbatim 0-bytes and control-bytes to be entered
234 if (ch[0] >= 0x20)
235 len = wcstombs (mb, ch, 16);
236 else
237 {
238 mb[0] = ch[0];
239 len = 1;
240 }
241
242 if (len > 0)
243 tt_write ((unsigned char *)mb, len);
244 else
245 scr_bell ();
246 }
247
248 iso14755buf = 0;
249}
250
251int
252rxvt_term::hex_keyval (XKeyEvent &ev)
253{
254 // check wether this event corresponds to a hex digit
255 // if the modifiers had not been pressed.
256 for (int index = 0; index < 8; index++)
257 {
258 KeySym k = XLookupKeysym (&ev, index);
259
260 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
261 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
262 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
263 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
264 }
265
266 return -1;
267}
268#endif
61 269
62/*{{{ Convert the keypress event into a string */ 270/*{{{ Convert the keypress event into a string */
63void 271void
64rxvt_term::lookup_key (XKeyEvent &ev) 272rxvt_term::lookup_key (XKeyEvent &ev)
65{ 273{
… …
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 285 * escape sequence to toggle the Keypad.
78 * 286 *
79 * Always permit `shift' to override the current setting 287 * Always permit `shift' to override the current setting
80 */ 288 */
81 shft = (ev.state & ShiftMask); 289 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 290 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 291 meta = ev.state & ModMetaMask;
84 292
85 if (numlock_state || (ev.state & ModNumLockMask)) 293 if (numlock_state || (ev.state & ModNumLockMask))
86 { 294 {
87 numlock_state = (ev.state & ModNumLockMask); 295 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 296 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
147 valid_keysym = keysym != NoSymbol; 355 valid_keysym = keysym != NoSymbol;
148 } 356 }
149 357
150 if (valid_keysym) 358 if (valid_keysym)
151 { 359 {
360#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state))
362 return;
363#endif
364
152 if (TermWin.saveLines) 365 if (TermWin.saveLines)
153 { 366 {
154#ifdef UNSHIFTED_SCROLLKEYS 367#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 368 if (!ctrl && !meta)
156 {
157#else 369#else
158 if (IS_SCROLL_MOD) 370 if (IS_SCROLL_MOD)
371#endif
159 { 372 {
160#endif
161 int lnsppg; 373 int lnsppg;
162 374
163#ifdef PAGING_CONTEXT_LINES 375#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 377#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 426 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 427 {
216 keysym += (XK_F11 - XK_F1); 428 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 429 shft = 0; /* turn off Shift */
218 } 430 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 431 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 432 {
221 switch (keysym) 433 switch (keysym)
222 { 434 {
223 /* normal XTerm key bindings */ 435 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 436 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 437 selection_request (ev.time, 0, 0);
226 return; 438 return;
439#if TODO
227 /* rxvt extras */ 440 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 441 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 442 change_font (FONT_UP);
230 return; 443 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 444 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 445 change_font (FONT_DN);
233 return; 446 return;
447#endif
234 } 448 }
235 } 449 }
236 } 450 }
237#ifdef PRINTPIPE 451
238 if (keysym == XK_Print) 452#if ENABLE_FRILLS || ISO_14755
239 { 453 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 454 if (shft && ctrl)
241 return;
242 } 455 {
243#endif 456 int hv;
244 457
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 458 if (iso14755buf & ISO_14755_51
246 { 459 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 460 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 461 {
250 unsigned int l; 462 commit_iso14755 ();
251 const unsigned char *kbuf0; 463 iso14755buf = ISO_14755_51;
252 464# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 465 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 466# endif
261 ) 467 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 468 }
266 469 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 470 {
471 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
472 | hv | ISO_14755_51;
473# if ISO_14755
474 iso14755_51 (iso14755buf & ISO_14755_MASK);
475# endif
268 return; 476 return;
269 } 477 }
270 else 478 else
479 {
480# if ENABLE_OVERLAY
481 scr_overlay_off ();
271#endif 482# endif
483 iso14755buf = 0;
484 }
485 }
486 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
487 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
488 if (!(iso14755buf & ISO_14755_STARTED))
489 {
490 iso14755buf |= ISO_14755_STARTED;
491# if ENABLE_OVERLAY
492 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
493 scr_overlay_set (0, 0, "ISO 14755 mode");
494# endif
495 }
496#endif
497
498#ifdef PRINTPIPE
499 if (keysym == XK_Print)
500 {
501 scr_printscreen (ctrl | shft);
502 return;
503 }
504#endif
505
506 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
507 {
272 { 508 {
273 newlen = 1; 509 newlen = 1;
274 switch (keysym) 510 switch (keysym)
275 { 511 {
276#ifndef NO_BACKSPACE_KEY 512#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 513 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 514 if (priv_modes & PrivMode_HaveBackSpace)
279 { 515 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 517 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 518 kbuf[1] = '\0';
283 } 519 }
284 else 520 else
285 STRCPY (kbuf, key_backspace); 521 strcpy (kbuf, key_backspace);
286 break; 522 break;
287#endif 523#endif
288#ifndef NO_DELETE_KEY 524#ifndef NO_DELETE_KEY
525# ifdef XK_KP_Prior
526 case XK_KP_Delete:
527 /* allow shift to override */
528 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
529 {
530 strcpy (kbuf, "\033On");
531 break;
532 }
533 /* FALLTHROUGH */
534# endif
289 case XK_Delete: 535 case XK_Delete:
290 STRCPY (kbuf, key_delete); 536 strcpy (kbuf, key_delete);
291 break; 537 break;
292#endif 538#endif
293 case XK_Tab: 539 case XK_Tab:
294 if (shft) 540 if (shft)
295 STRCPY (kbuf, "\033[Z"); 541 strcpy (kbuf, "\033[Z");
296 else 542 else
297 { 543 {
298#ifdef CTRL_TAB_MAKES_META 544#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 545 if (ctrl)
300 meta = 1; 546 meta = 1;
… …
306 newlen = 0; 552 newlen = 0;
307 } 553 }
308 break; 554 break;
309 555
310#ifdef XK_KP_Left 556#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 557 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 558 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 559 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 560 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 562 {
317 STRCPY (kbuf, "\033OZ"); 563 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 564 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 565 break;
320 } 566 }
321 else 567 else
322 /* translate to std. cursor key */ 568 /* translate to std. cursor key */
… …
325#endif 571#endif
326 case XK_Up: /* "\033[A" */ 572 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 573 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 574 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 575 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 576 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 577 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 578 /* do Shift first */
333 if (shft) 579 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 580 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 581 else if (ctrl)
336 { 582 {
337 kbuf[1] = 'O'; 583 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 584 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 585 }
340 else if (PrivateModes & PrivMode_aplCUR) 586 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 587 kbuf[1] = 'O';
342 break; 588 break;
343 589
344#ifndef UNSHIFTED_SCROLLKEYS 590#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 591# ifdef XK_KP_Prior
346 case XK_KP_Prior: 592 case XK_KP_Prior:
347 /* allow shift to override */ 593 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 595 {
350 STRCPY (kbuf, "\033Oy"); 596 strcpy (kbuf, "\033Oy");
351 break; 597 break;
352 } 598 }
353 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
354# endif 600# endif
355 case XK_Prior: 601 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 602 strcpy (kbuf, "\033[5~");
357 break; 603 break;
358# ifdef XK_KP_Next 604# ifdef XK_KP_Next
359 case XK_KP_Next: 605 case XK_KP_Next:
360 /* allow shift to override */ 606 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 608 {
363 STRCPY (kbuf, "\033Os"); 609 strcpy (kbuf, "\033Os");
364 break; 610 break;
365 } 611 }
366 /* FALLTHROUGH */ 612 /* FALLTHROUGH */
367# endif 613# endif
368 case XK_Next: 614 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 615 strcpy (kbuf, "\033[6~");
370 break; 616 break;
371#endif 617#endif
372 case XK_KP_Enter: 618 case XK_KP_Enter:
373 /* allow shift to override */ 619 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 621 {
376 STRCPY (kbuf, "\033OM"); 622 strcpy (kbuf, "\033OM");
623 break;
624 }
625
626 /* FALLTHROUGH */
627
628 case XK_Return:
629 if (priv_modes & PrivMode_LFNL)
630 {
631 kbuf[0] = '\015';
632 kbuf[1] = '\012';
633 kbuf[2] = '\0';
377 } 634 }
378 else 635 else
379 { 636 {
380 kbuf[0] = '\r'; 637 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 638 kbuf[1] = '\0';
382 } 639 }
383 break; 640 break;
384 641
385#ifdef XK_KP_Begin 642#ifdef XK_KP_Begin
386 case XK_KP_Begin: 643 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 644 strcpy (kbuf, "\033Ou");
388 break; 645 break;
389 646
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 647#endif
398 case XK_KP_F1: /* "\033OP" */ 648 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 649 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 650 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 651 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 652 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 653 kbuf[2] += (keysym - XK_KP_F1);
404 break; 654 break;
405 655
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 656 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 657 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 668 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 669 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 670 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 671 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 672 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 673 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 674 {
425 STRCPY (kbuf, "\033Oj"); 675 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 676 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 677 }
428 else 678 else
429 { 679 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 680 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 681 kbuf[1] = '\0';
432 } 682 }
433 break; 683 break;
434 684
435 case XK_Find: 685 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 686 strcpy (kbuf, "\033[1~");
437 break; 687 break;
688
689#ifdef XK_KP_End
690 case XK_KP_Insert:
691 /* allow shift to override */
692 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
693 {
694 strcpy (kbuf, "\033Op");
695 break;
696 }
697 /* FALLTHROUGH */
698#endif
438 case XK_Insert: 699 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 700 strcpy (kbuf, "\033[2~");
440 break; 701 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 702#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 703 case DXK_Remove:
443 /* FALLTHROUGH */ 704 /* FALLTHROUGH */
444#endif 705#endif
445 case XK_Execute: 706 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 707 strcpy (kbuf, "\033[3~");
447 break; 708 break;
448 case XK_Select: 709 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 710 strcpy (kbuf, "\033[4~");
450 break; 711 break;
451#ifdef XK_KP_End 712#ifdef XK_KP_End
452 case XK_KP_End: 713 case XK_KP_End:
453 /* allow shift to override */ 714 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 715 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 716 {
456 STRCPY (kbuf, "\033Oq"); 717 strcpy (kbuf, "\033Oq");
457 break; 718 break;
458 } 719 }
459 /* FALLTHROUGH */ 720 /* FALLTHROUGH */
460#endif 721#endif
461 case XK_End: 722 case XK_End:
462 STRCPY (kbuf, KS_END); 723 strcpy (kbuf, KS_END);
463 break; 724 break;
464#ifdef XK_KP_Home 725#ifdef XK_KP_Home
465 case XK_KP_Home: 726 case XK_KP_Home:
466 /* allow shift to override */ 727 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 729 {
469 STRCPY (kbuf, "\033Ow"); 730 strcpy (kbuf, "\033Ow");
470 break; 731 break;
471 } 732 }
472 /* FALLTHROUGH */ 733 /* FALLTHROUGH */
473#endif 734#endif
474 case XK_Home: 735 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 736 strcpy (kbuf, KS_HOME);
476 break; 737 break;
477 738
478#define FKEY(n, fkey) \ 739#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 740 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 741
… …
532#undef FKEY 793#undef FKEY
533 default: 794 default:
534 newlen = 0; 795 newlen = 0;
535 break; 796 break;
536 } 797 }
798
537 if (newlen) 799 if (newlen)
538 len = STRLEN (kbuf); 800 len = strlen (kbuf);
539 } 801 }
540 802
541 /* 803 /*
542 * Pass meta for all function keys, if 'meta' option set 804 * Pass meta for all function keys, if 'meta' option set
543 */ 805 */
… …
550 else if (ctrl && keysym == XK_minus) 812 else if (ctrl && keysym == XK_minus)
551 { 813 {
552 len = 1; 814 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 815 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 816 }
817 else if (keysym == XK_ISO_Left_Tab)
818 {
819 strcpy (kbuf, "\033[Z");
820 len = 3;
821 }
555 else 822 else
556 { 823 {
557#ifdef META8_OPTION 824#ifdef META8_OPTION
558 /* set 8-bit on */ 825 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 826 if (meta && (meta_char == 0x80))
… …
571 } 838 }
572 839
573 if (len <= 0) 840 if (len <= 0)
574 return; /* not mapped */ 841 return; /* not mapped */
575 842
576 if (Options & Opt_scrollTtyKeypress) 843 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 844 if (TermWin.view_start)
578 { 845 {
579 TermWin.view_start = 0; 846 TermWin.view_start = 0;
580 want_refresh = 1; 847 want_refresh = 1;
581 } 848 }
… …
617#endif /* DEBUG_CMD */ 884#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
619} 886}
620/*}}} */ 887/*}}} */
621 888
622#if (MENUBAR_MAX) 889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 891/* attempt to `write' count to the input buffer */
625unsigned int 892unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 893rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 894{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 897 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 899
633 if (n > 0 && s < count) 900 if (n > 0 && s < count)
634 { 901 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 902 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 903 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 904 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 905 cmdbuf_endp -= n;
639 s += n; 906 s += n;
640 } 907 }
… …
650 917
651 cmd_parse (); 918 cmd_parse ();
652 919
653 return 0; 920 return 0;
654} 921}
655#endif /* MENUBAR_MAX */ 922#endif
656 923
657void 924void
658rxvt_term::flush () 925rxvt_term::flush ()
659{ 926{
927 flush_ev.stop ();
928
660#ifdef TRANSPARENT 929#ifdef TRANSPARENT
661 if (want_full_refresh) 930 if (want_full_refresh)
662 { 931 {
663 want_full_refresh = 0; 932 want_full_refresh = 0;
664 scr_clear (); 933 scr_clear ();
665 scr_touch (false); 934 scr_touch (false);
666 want_refresh = 1;
667 } 935 }
668#endif 936#endif
669 937
670 if (want_refresh) 938 if (want_refresh)
671 { 939 {
672 scr_refresh (refresh_type); 940 scr_refresh (refresh_type);
673 scrollbar_show (1); 941 scrollbar_show (1);
674#ifdef USE_XIM 942#ifdef USE_XIM
675 IMSendSpot (); 943 IMSendSpot ();
676#endif 944#endif
677
678 } 945 }
679 946
680 display->flush (); 947 display->flush ();
681} 948}
682 949
… …
684rxvt_term::check_cb (check_watcher &w) 951rxvt_term::check_cb (check_watcher &w)
685{ 952{
686 SET_R (this); 953 SET_R (this);
687 SET_LOCALE (locale); 954 SET_LOCALE (locale);
688 955
956 display->flush ();
957
958 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01);
960}
961
962void
963rxvt_term::flush_cb (time_watcher &w)
964{
965 SET_R (this);
966 SET_LOCALE (locale);
967
968 refresh_limit = 1;
969 refresh_count = 0;
689 flush (); 970 flush ();
690} 971}
691 972
692#ifdef CURSOR_BLINK 973#ifdef CURSOR_BLINK
693void 974void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 992 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 993 }
713} 994}
714#endif 995#endif
715 996
997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
998void
999rxvt_term::cont_scroll_cb (time_watcher &w)
1000{
1001 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1002 scr_page (scrollbar_isUp() ? UP : DN, 1))
1003 {
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1;
1006 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1007 }
1008}
1009#endif
1010
1011#ifdef SELECTION_SCROLLING
1012void
1013rxvt_term::sel_scroll_cb (time_watcher &w)
1014{
1015 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1016 {
1017 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1018 refresh_type |= SMOOTH_REFRESH;
1019 want_refresh = 1;
1020 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1021 }
1022}
1023#endif
1024
1025#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1026void
1027rxvt_term::slip_wheel_cb (time_watcher &w)
1028{
1029 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed))
1032 {
1033 if (TermWin.view_start == TermWin.nscrolled ||
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0;
1036
1037 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 }
1041}
1042#endif
1043
716bool 1044bool
717rxvt_term::pty_fill () 1045rxvt_term::pty_fill ()
718{ 1046{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048
1049 if (CBUFSIZ == n)
1050 {
1051 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1052 n = 0;
1053 }
720 1054
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1055 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1056 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1057 cmdbuf_endp = cmdbuf_ptr + n;
724 1058
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1060
727 if (n > 0) 1061 if (n > 0)
728 { 1062 {
729 cmdbuf_endp += n; 1063 cmdbuf_endp += n;
730 return true; 1064 return true;
… …
739rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1074{
741 SET_R (this); 1075 SET_R (this);
742 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
743 1077
1078 if (revents & EVENT_READ)
1079 // loop, but don't allow a single term to monopolize us
1080 while (pty_fill ())
1081 if (cmd_parse ())
1082 break;
1083
744 if (revents & EVENT_WRITE) 1084 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1085 pty_write ();
746 else if (revents & EVENT_READ) 1086}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1087
760 if (cmd_parse ()) 1088void
761 break; 1089rxvt_term::pointer_unblank ()
762 } 1090{
763 } 1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1092 recolour_cursor ();
1093
1094#ifdef POINTER_BLANK
1095 hidden_pointer = 0;
1096
1097 if (options & Opt_pointerBlank)
1098 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif
764} 1100}
765 1101
766#ifdef POINTER_BLANK 1102#ifdef POINTER_BLANK
767void 1103void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
781{ 1105{
782 if (! (Options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
783 return; 1107 return;
784 1108
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
786 XFlush (display->display); 1110 XFlush (display->display);
787 1111
788 hidden_pointer = 1; 1112 hidden_pointer = 1;
789} 1113}
790 1114
… …
807 x = ev.x; 1131 x = ev.x;
808 y = ev.y; 1132 y = ev.y;
809 pixel_position (&x, &y); 1133 pixel_position (&x, &y);
810 1134
811 if (MEvent.button == AnyButton) 1135 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1136 button_number = 3;
814 }
815 else 1137 else
816 { 1138 {
817 button_number = MEvent.button - Button1; 1139 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1140 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1141 if (button_number >= 3)
820 button_number += (64 - 3); 1142 button_number += (64 - 3);
821 } 1143 }
822 1144
823 if (PrivateModes & PrivMode_MouseX10) 1145 if (priv_modes & PrivMode_MouseX10)
824 { 1146 {
825 /* 1147 /*
826 * do not report ButtonRelease 1148 * do not report ButtonRelease
827 * no state info allowed 1149 * no state info allowed
828 */ 1150 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1165 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1166 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1167#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1168 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1169#endif
848
849 } 1170 }
850 1171
851#ifdef DEBUG_MOUSEREPORT 1172#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1173 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1174 if (key_state & 16)
854 fputc ('C', stderr); 1175 fputc ('C', stderr);
855 if (key_state & 4) 1176 if (key_state & 4)
856 fputc ('S', stderr); 1177 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1181 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1182 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1183 button_number,
863 x + 1, 1184 x + 1,
864 y + 1); 1185 y + 1);
865#else 1186#endif
1187
866 tt_printf ("\033[M%c%c%c", 1188 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1189 (32 + button_number + key_state),
868 (32 + x + 1), 1190 (32 + x + 1),
869 (32 + y + 1)); 1191 (32 + y + 1));
870#endif
871} 1192}
872 1193
873#ifdef USING_W11LIB 1194#ifdef USING_W11LIB
874void 1195void
875rxvt_W11_process_x_event (XEvent *ev) 1196rxvt_W11_process_x_event (XEvent *ev)
… …
882 1203
883/*{{{ process an X event */ 1204/*{{{ process an X event */
884void 1205void
885rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
886{ 1207{
1208 dDisp;
1209
887 SET_R (this); 1210 SET_R (this);
888 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
889 1212
890#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1215 {
893 if (hidden_cursor) 1216 if (hidden_cursor)
894 { 1217 {
895 hidden_cursor = 0; 1218 hidden_cursor = 0;
896 want_refresh = 1; 1219 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1223 }
901#endif 1224#endif
902 1225
903#if defined(POINTER_BLANK) 1226#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1228 {
906 if (ev.type == MotionNotify 1229 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1230 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1231 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1232 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1235 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1236 pointer_blank ();
914 } 1237 }
915#endif 1238#endif
916 1239
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1240 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1241 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1242 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 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));
973#endif
974 1243
975 switch (ev.type) 1244 switch (ev.type)
976 { 1245 {
977 case KeyPress: 1246 case KeyPress:
1247#if ISO_14755
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
978 lookup_key (ev.xkey); 1250 lookup_key (ev.xkey);
1251
1252 break;
1253
1254 case KeyRelease:
1255 {
1256#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1257 KeySym ks;
1258
1259 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1260#endif
1261
1262#if ENABLE_FRILLS || ISO_14755
1263 // ISO 14755 support
1264 if (iso14755buf)
1265 if (iso14755buf & ISO_14755_52)
1266 {
1267# if ENABLE_OVERLAY
1268 scr_overlay_off ();
1269# endif
1270# if ISO_14755
1271 // iso14755 part 5.2 handling: release time
1272 // first: controls
1273 if ((ev.xkey.state & ControlMask)
1274 && ((ks >= 0x40 && ks <= 0x5f)
1275 || (ks >= 0x61 && ks <= 0x7f)))
1276 {
1277 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1278 commit_iso14755 ();
1279 return; // case-break;
1280 }
1281
1282 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1283 if (i[0] == ks)
1284 {
1285 iso14755buf = ISO_14755_51 | i[1];
1286 commit_iso14755 ();
1287 return; // case-break;
1288 }
1289
1290 scr_bell ();
1291# endif
1292 iso14755buf = 0;
979 break; 1293 break;
1294 }
1295 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1296 {
1297# if ENABLE_OVERLAY
1298 scr_overlay_off ();
1299# endif
1300 if (iso14755buf & ISO_14755_51)
1301 commit_iso14755 ();
1302#if ISO_14755
1303 else if (iso14755buf & ISO_14755_STARTED)
1304 {
1305 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1306
1307 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1308 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1309 }
1310# endif
1311 else
1312 iso14755buf = 0;
1313 }
1314#endif
980 1315
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1317 if (!(ev.xkey.state & ControlMask))
1318 slip_wheel_ev.stop ();
1319 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1320 mouse_slip_wheel_speed = 0;
986 else 1321#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1322 break;
995 } 1323 }
996#endif
997 1324
998 case ButtonPress: 1325 case ButtonPress:
999 button_press (ev.xbutton); 1326 button_press (ev.xbutton);
1000 break; 1327 break;
1001 1328
… …
1003 button_release (ev.xbutton); 1330 button_release (ev.xbutton);
1004 break; 1331 break;
1005 1332
1006 case ClientMessage: 1333 case ClientMessage:
1007 if (ev.xclient.format == 32 1334 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1336 {
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1337 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1009 destroy (); 1338 destroy ();
1339#if ENABLE_EWMH
1340 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1341 XSendEvent (disp, ev.xclient.window = display->root,
1342 False, SubstructureRedirectMask | SubstructureNotifyMask,
1343 &ev);
1344#endif
1345 }
1346#if ENABLE_XEMBED
1347 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1348 {
1349 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1350 focus_in ();
1351 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1352 focus_out ();
1353 }
1354#endif
1010#ifdef OFFIX_DND 1355#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */ 1356 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1357 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile 1358 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1359 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1360 || ev.xclient.data.l[0] == DndLink))
1016 { 1361 {
1017 /* Get Dnd data */ 1362 /* Get Dnd data */
1018 Atom ActualType; 1363 Atom ActualType;
1019 int ActualFormat; 1364 int ActualFormat;
1020 unsigned char *data; 1365 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1366 unsigned long Size, RemainingBytes;
1022 1367
1023 XGetWindowProperty (display->display, display->root, 1368 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1369 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1370 0L, 1000000L,
1026 False, AnyPropertyType, 1371 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1372 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1373 &Size, &RemainingBytes,
1029 &data); 1374 &data);
1030 XChangeProperty (display->display, display->root, 1375 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1376 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1377 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1378 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1379 }
1037#endif /* OFFIX_DND */ 1380#endif /* OFFIX_DND */
1038 break; 1381 break;
1039 1382
1040 case MappingNotify: 1383 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1384 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1385 break;
1043 1386
1044 /* 1387 /*
1045 * XXX: this is not the _current_ arrangement 1388 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1389 * Here's my conclusion:
… …
1065 break; 1408 break;
1066 } 1409 }
1067 break; 1410 break;
1068 1411
1069 case FocusIn: 1412 case FocusIn:
1070 if (!TermWin.focus) 1413 focus_in ();
1071 {
1072 TermWin.focus = 1;
1073 want_refresh = 1;
1074#ifdef USE_XIM
1075 if (Input_Context != NULL)
1076 XSetICFocus (Input_Context);
1077#endif
1078#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif
1082
1083 }
1084 break; 1414 break;
1085 1415
1086 case FocusOut: 1416 case FocusOut:
1087 if (TermWin.focus) 1417 focus_out ();
1088 {
1089 TermWin.focus = 0;
1090 want_refresh = 1;
1091#ifdef USE_XIM
1092 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context);
1094#endif
1095#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop ();
1098 hidden_cursor = 0;
1099#endif
1100
1101 }
1102 break; 1418 break;
1103 1419
1104 case ConfigureNotify: 1420 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1421 if (ev.xconfigure.window == TermWin.parent[0])
1106 { 1422 {
… …
1110 { /* Wrap lots of configures into one */ 1426 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width; 1427 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height; 1428 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1429 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1430 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1431 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1432
1117 if (szHint.width != width || szHint.height != height) 1433 if (szHint.width != width || szHint.height != height)
1118 { 1434 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1435 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1436 resize_all_windows (width, height, 1);
1121 } 1437 }
1122#ifdef DEBUG_SIZE 1438
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1440 if (options & Opt_transparent)
1130 {
1131 check_our_parents (); 1441 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif 1442#endif
1136
1137 } 1443 }
1444 break;
1445
1446 case PropertyNotify:
1447 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1448 && ev.xproperty.state == PropertyNewValue)
1449 selection_property (ev.xproperty.window, ev.xproperty.atom);
1450
1138 break; 1451 break;
1139 1452
1140 case SelectionClear: 1453 case SelectionClear:
1141 selection_clear (); 1454 selection_clear ();
1142 break; 1455 break;
1143 1456
1144 case SelectionNotify: 1457 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1458 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1459 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1460 break;
1149 1461
1150 case SelectionRequest: 1462 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1463 selection_send (ev.xselectionrequest);
1152 break; 1464 break;
… …
1173 1485
1174 case GraphicsExpose: 1486 case GraphicsExpose:
1175 case Expose: 1487 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == TermWin.vt)
1177 { 1489 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1490 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1493 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1494
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496
1497 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1500
1186 // ev.xexpose.width, TermWin.height, False); 1501 scr_refresh (refresh_type);
1187#endif
1188 want_refresh = 1;
1189 } 1502 }
1190 else 1503 else
1191 { 1504 {
1192 XEvent unused_event; 1505 XEvent unused_event;
1193 1506
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1195 Expose, 1508 ;
1196 &unused_event)) ; 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1510 ;
1198 GraphicsExpose, 1511
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1512 if (isScrollbarWindow (ev.xany.window))
1201 { 1513 {
1202 scrollBar.setIdle (); 1514 scrollBar.setIdle ();
1203 scrollbar_show (0); 1515 scrollbar_show (0);
1204 } 1516 }
1205#ifdef MENUBAR 1517#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1519 menubar_expose ();
1208#endif 1520#endif
1521
1522#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == TermWin.parent[0])
1524 XClearWindow (disp, ev.xany.window);
1525#endif
1209 } 1526 }
1210 break; 1527 break;
1211 1528
1212 case MotionNotify: 1529 case MotionNotify:
1213#ifdef POINTER_BLANK 1530#ifdef POINTER_BLANK
… …
1219 { 1536 {
1220 menubar_control (ev.xbutton); 1537 menubar_control (ev.xbutton);
1221 break; 1538 break;
1222 } 1539 }
1223#endif 1540#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1225 break; 1542 break;
1226 1543
1227 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == TermWin.vt)
1228 { 1545 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1547 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1232 ; 1549 ;
1233 1550
1234 XQueryPointer (display->display, TermWin.vt, 1551 XQueryPointer (disp, TermWin.vt,
1235 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1554 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1555 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1557 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1558 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1559 {
1243#endif 1560#endif
1561#if ISO_14755
1562 // 5.4
1563 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1564 {
1565 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1566 break;
1567 }
1568#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1571
1246#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < TermWin.int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1249 { 1575 {
1250 int dist; 1576 int dist;
1251 1577
1252 pending_scroll_selection=1;
1253
1254 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1256 */ 1580 */
1257 if (scroll_selection_delay<=0) 1581 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1582 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1583
1260 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1262 */ 1586 */
1263 selection_save_x=ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1590
1268 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1592 if (ev.xbutton.y < TermWin.int_bwidth)
1270 { 1593 {
1271 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = TermWin.int_bwidth - ev.xbutton.y;
1273 } 1596 }
1274 else 1597 else
1275 { 1598 {
1276 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y -
1278 (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1279 } 1601 }
1602
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1603 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1;
1282 MIN_IT (scroll_selection_lines, 1606 MIN_IT (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1607 SELECTION_SCROLL_MAX_LINES);
1284 } 1608 }
1285 else 1609 else
1286 { 1610 {
1287 /* we are within the text window, so we 1611 /* we are within the text window, so we
1288 * shouldn't be scrolling 1612 * shouldn't be scrolling
1289 */ 1613 */
1290 pending_scroll_selection = 0; 1614 if (sel_scroll_ev.active)
1615 sel_scroll_ev.stop();
1291 } 1616 }
1292#endif 1617#endif
1293#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1294
1295 } 1619 }
1296#endif 1620#endif
1297
1298 } 1621 }
1299 } 1622 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1624 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1625 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1303 MotionNotify, &ev)) ; 1626 MotionNotify, &ev))
1627 ;
1628
1304 XQueryPointer (display->display, scrollBar.win, 1629 XQueryPointer (disp, scrollBar.win,
1305 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1633 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1635 scrollbar_size ());
1311 scr_refresh (refresh_type); 1636 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1637 refresh_limit = 0;
… …
1315 break; 1640 break;
1316 } 1641 }
1317} 1642}
1318 1643
1319void 1644void
1645rxvt_term::focus_in ()
1646{
1647 if (!TermWin.focus)
1648 {
1649 TermWin.focus = 1;
1650 want_refresh = 1;
1651#ifdef USE_XIM
1652 if (Input_Context != NULL)
1653 {
1654 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context);
1656 }
1657#endif
1658#ifdef CURSOR_BLINK
1659 if (options & Opt_cursorBlink)
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif
1662#ifdef OFF_FOCUS_FADING
1663 if (rs[Rs_fade])
1664 {
1665 pix_colors = pix_colors_focused;
1666 scr_recolour ();
1667 }
1668#endif
1669 }
1670}
1671
1672void
1673rxvt_term::focus_out ()
1674{
1675 if (TermWin.focus)
1676 {
1677 TermWin.focus = 0;
1678 want_refresh = 1;
1679
1680#if ENABLE_FRILLS || ISO_14755
1681 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY
1684 scr_overlay_off ();
1685#endif
1686#ifdef USE_XIM
1687 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context);
1689#endif
1690#ifdef CURSOR_BLINK
1691 if (options & Opt_cursorBlink)
1692 cursor_blink_ev.stop ();
1693 hidden_cursor = 0;
1694#endif
1695#ifdef OFF_FOCUS_FADING
1696 if (rs[Rs_fade])
1697 {
1698 pix_colors = pix_colors_unfocused;
1699 scr_recolour ();
1700 }
1701#endif
1702 }
1703}
1704
1705#if TRANSPARENT
1706void
1320rxvt_term::rootwin_cb (XEvent &ev) 1707rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1708{
1322 SET_R (this); 1709 SET_R (this);
1323 SET_LOCALE (locale); 1710 SET_LOCALE (locale);
1324 1711
1325 switch (ev.type) 1712 switch (ev.type)
1326 { 1713 {
1327 case PropertyNotify: 1714 case PropertyNotify:
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1329 {
1330 if (ev.xproperty.state == PropertyNewValue)
1331 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 break;
1333 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /* 1715 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1716 * if user used some Esetroot compatible prog to set the root bg,
1339 * use the property to determine the pixmap. We use it later on. 1717 * use the property to determine the pixmap. We use it later on.
1340 */ 1718 */
1341 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1719 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1721 return;
1346 }
1347 1722
1348 /* FALLTHROUGH */ 1723 /* FALLTHROUGH */
1349 case ReparentNotify: 1724 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1726 want_refresh = want_full_refresh = 1;
1353 break; 1727 break;
1354#endif
1355 } 1728 }
1356} 1729}
1730#endif
1357 1731
1358void 1732void
1359rxvt_term::button_press (XButtonEvent &ev) 1733rxvt_term::button_press (XButtonEvent &ev)
1360{ 1734{
1361 int reportmode = 0, clickintime; 1735 int reportmode = 0, clickintime;
1362 1736
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1364 if (!bypass_keystate) 1738 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740
1366 /* 1741 /*
1367 * VT window processing of button press 1742 * VT window processing of button press
1368 */ 1743 */
1369 if (ev.window == TermWin.vt) 1744 if (ev.window == TermWin.vt)
1370 { 1745 {
1746#if ISO_14755
1747 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 {
1750 iso14755_54 (ev.x, ev.y);
1751 return;
1752 }
1753#endif
1754
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1755 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1756
1372 if (reportmode) 1757 if (reportmode)
1373 { 1758 {
1374 /* mouse report from vt window */ 1759 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1760 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1761 MEvent.state = ev.state;
… …
1405 } 1790 }
1406 else 1791 else
1407 { 1792 {
1408 if (ev.button != MEvent.button) 1793 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1794 MEvent.clicks = 0;
1795
1410 switch (ev.button) 1796 switch (ev.button)
1411 { 1797 {
1412 case Button1: 1798 case Button1:
1799 /* allow meta + click to select rectangular areas */
1800 /* should be done in screen.C */
1801#if ENABLE_FRILLS
1802 selection.rect = !!(ev.state & ModMetaMask);
1803#else
1804 selection.rect = false;
1805#endif
1806
1413 /* allow shift+left click to extend selection */ 1807 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1415 { 1809 {
1416 if (MEvent.button == Button1 && clickintime) 1810 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1811 selection_rotate (ev.x, ev.y);
1418 else 1812 else
1419 selection_extend (ev.x, ev.y, 1); 1813 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1828 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1829 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1830 selection_rotate (ev.x, ev.y);
1437 else 1831 else
1438 selection_extend (ev.x, ev.y, 1); 1832 selection_extend (ev.x, ev.y, 1);
1833
1439 MEvent.button = Button3; 1834 MEvent.button = Button3;
1440 break; 1835 break;
1441 } 1836 }
1442 } 1837 }
1838
1443 MEvent.time = ev.time; 1839 MEvent.time = ev.time;
1444 return; 1840 return;
1445 } 1841 }
1446 1842
1447 /* 1843 /*
… …
1513 upordown = 1; /* down */ 1909 upordown = 1; /* down */
1514 } 1910 }
1515 if (upordown) 1911 if (upordown)
1516 { 1912 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1913#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1914 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1915#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1916 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1917 {
1522 if (upordown < 0) 1918 if (upordown < 0)
1523 scrollBar.setUp (); 1919 scrollBar.setUp ();
… …
1539 break; 1935 break;
1540 case R_SB_ALIGN_BOTTOM: 1936 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 1937 csrO = scrollBar.bot - scrollBar.top;
1542 break; 1938 break;
1543 } 1939 }
1940
1544 if (scrollBar.style == R_SB_XTERM 1941 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 1942 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 1943 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 1944 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 1945
1549 scrollBar.setMotion (); 1946 scrollBar.setMotion ();
1550 break; 1947 break;
1551 1948
1552 case Button1: 1949 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1950 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1577 scr_page ((ev.button == Button1 ? DN : UP), 1974 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 1975 (TermWin.nrow
1579 * scrollbar_position (ev.y) 1976 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 1977 / scrollbar_size ()));
1581 } 1978 }
1979
1582 break; 1980 break;
1583 } 1981 }
1584 } 1982 }
1585 return; 1983 return;
1586 } 1984 }
… …
1598{ 1996{
1599 int reportmode = 0; 1997 int reportmode = 0;
1600 1998
1601 csrO = 0; /* reset csr Offset */ 1999 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2000 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2001 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2002
1605 if (scrollbar_isUpDn ()) 2003 if (scrollbar_isUpDn ())
1606 { 2004 {
1607 scrollBar.setIdle (); 2005 scrollBar.setIdle ();
1608 scrollbar_show (0); 2006 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH; 2008 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 2009#endif
1612
1613 } 2010 }
2011
1614#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2013 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop();
1616#endif 2015#endif
2016
1617 if (ev.window == TermWin.vt) 2017 if (ev.window == TermWin.vt)
1618 { 2018 {
2019#if ISO_14755
2020 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return;
2023#endif
1619 if (reportmode) 2024 if (reportmode)
1620 { 2025 {
1621 /* mouse report from vt window */ 2026 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2027 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2028 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2042 MEvent.button = AnyButton;
1638 mouse_report (ev); 2043 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2044#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2045 return;
1641 } 2046 }
2047
1642 /* 2048 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2049 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2050 * when overriding mouse reporting
1645 */ 2051 */
1646 if (PrivateModes & PrivMode_mouse_report 2052 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2053 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2054 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2055 selection_extend (ev.x, ev.y, 0);
1650 2056
1651 switch (ev.button) 2057 switch (ev.button)
… …
1662 case Button5: 2068 case Button5:
1663 { 2069 {
1664 int i; 2070 int i;
1665 page_dirn v; 2071 page_dirn v;
1666 2072
1667 v = (ev.button == Button4) ? UP : DN; 2073 v = ev.button == Button4 ? UP : DN;
2074
1668 if (ev.state & ShiftMask) 2075 if (ev.state & ShiftMask)
1669 i = 1; 2076 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2077 else if (options & Opt_mouseWheelScrollPage)
1671 i = TermWin.nrow - 1; 2078 i = TermWin.nrow - 1;
1672 else 2079 else
1673 i = 5; 2080 i = 5;
2081
1674# ifdef MOUSE_SLIP_WHEELING 2082# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2083 if (ev.state & ControlMask)
1676 { 2084 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2085 mouse_slip_wheel_speed += v ? -1 : 1;
2086 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2087 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2088
2089 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2091
2092 slip_wheel_ev.start ();
1679 } 2093 }
2094 else
2095 {
1680# endif 2096# endif
1681# ifdef JUMP_MOUSE_WHEEL 2097# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 {
1688 scr_page (v, 1); 2098 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH); 2099 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 2100 scrollbar_show (1);
2101# else
2102 while (i--)
2103 {
2104 scr_page (v, 1);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1);
2107 }
2108# endif
2109# ifdef MOUSE_SLIP_WHEELING
1691 } 2110 }
1692# endif 2111#endif
1693
1694 } 2112 }
1695 break; 2113 break;
1696#endif 2114#endif
1697
1698 } 2115 }
1699 } 2116 }
1700#ifdef MENUBAR 2117#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 2118 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 2119 menubar_control (ev);
1703#endif 2120#endif
1704} 2121}
1705 2122
1706
1707#ifdef TRANSPARENT 2123#ifdef TRANSPARENT
2124#if TINTING
2125/* taken from aterm-0.4.2 */
2126
2127typedef uint32_t RUINT32T;
2128
2129void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2130{
2131 int sh_r, sh_g, sh_b;
2132 RUINT32T mask_r, mask_g, mask_b;
2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2136 int i;
2137
2138 Visual *visual = display->visual;
2139
2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2141
2142 /* for convenience */
2143 mask_r = visual->red_mask;
2144 mask_g = visual->green_mask;
2145 mask_b = visual->blue_mask;
2146
2147 /* boring lookup table pre-initialization */
2148 switch (srcImage->bits_per_pixel) {
2149 case 15:
2150 if ((mask_r != 0x7c00) ||
2151 (mask_g != 0x03e0) ||
2152 (mask_b != 0x001f))
2153 return;
2154 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2155 lookup_r = lookup;
2156 lookup_g = lookup+32;
2157 lookup_b = lookup+32+32;
2158 sh_r = 10;
2159 sh_g = 5;
2160 sh_b = 0;
2161 break;
2162 case 16:
2163 if ((mask_r != 0xf800) ||
2164 (mask_g != 0x07e0) ||
2165 (mask_b != 0x001f))
2166 return;
2167 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2168 lookup_r = lookup;
2169 lookup_g = lookup+32;
2170 lookup_b = lookup+32+64;
2171 sh_r = 11;
2172 sh_g = 5;
2173 sh_b = 0;
2174 break;
2175 case 24:
2176 if ((mask_r != 0xff0000) ||
2177 (mask_g != 0x00ff00) ||
2178 (mask_b != 0x0000ff))
2179 return;
2180 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2181 lookup_r = lookup;
2182 lookup_g = lookup+256;
2183 lookup_b = lookup+256+256;
2184 sh_r = 16;
2185 sh_g = 8;
2186 sh_b = 0;
2187 break;
2188 case 32:
2189 if ((mask_r != 0xff0000) ||
2190 (mask_g != 0x00ff00) ||
2191 (mask_b != 0x0000ff))
2192 return;
2193 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2194 lookup_r = lookup;
2195 lookup_g = lookup+256;
2196 lookup_b = lookup+256+256;
2197 sh_r = 16;
2198 sh_g = 8;
2199 sh_b = 0;
2200 break;
2201 default:
2202 return; /* we do not support this color depth */
2203 }
2204
2205 /* prepare limits for color transformation (each channel is handled separately) */
2206 if (shade < 0) {
2207 shade = -shade;
2208 if (shade < 0) shade = 0;
2209 if (shade > 100) shade = 100;
2210
2211 lower_lim_r = 65535-rm;
2212 lower_lim_g = 65535-gm;
2213 lower_lim_b = 65535-bm;
2214
2215 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2216 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2217 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2218
2219 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2220 } else {
2221 if (shade < 0) shade = 0;
2222 if (shade > 100) shade = 100;
2223
2224 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2225
2226 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2227 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2228 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2229 }
2230
2231 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2232 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2233 {
2234 unsigned int tmp;
2235
2236 tmp = lower_lim_r;
2237 lower_lim_r = lower_lim_b;
2238 lower_lim_b = tmp;
2239
2240 tmp = upper_lim_r;
2241 upper_lim_r = upper_lim_b;
2242 upper_lim_b = tmp;
2243 }
2244
2245 /* fill our lookup tables */
2246 for (i = 0; i <= mask_r>>sh_r; i++)
2247 {
2248 RUINT32T tmp;
2249 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2250 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2251 lookup_r[i] = (tmp/65535)<<sh_r;
2252 }
2253 for (i = 0; i <= mask_g>>sh_g; i++)
2254 {
2255 RUINT32T tmp;
2256 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2257 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2258 lookup_g[i] = (tmp/65535)<<sh_g;
2259 }
2260 for (i = 0; i <= mask_b>>sh_b; i++)
2261 {
2262 RUINT32T tmp;
2263 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2264 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2265 lookup_b[i] = (tmp/65535)<<sh_b;
2266 }
2267
2268 /* apply table to input image (replacing colors by newly calculated ones) */
2269 switch (srcImage->bits_per_pixel)
2270 {
2271 case 15:
2272 {
2273 unsigned short *p1, *pf, *p, *pl;
2274 p1 = (unsigned short *) srcImage->data;
2275 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2276 while (p1 < pf)
2277 {
2278 p = p1;
2279 pl = p1 + srcImage->width;
2280 for (; p < pl; p++)
2281 {
2282 *p = lookup_r[(*p & 0x7c00)>>10] |
2283 lookup_g[(*p & 0x03e0)>> 5] |
2284 lookup_b[(*p & 0x001f)];
2285 }
2286 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2287 }
2288 break;
2289 }
2290 case 16:
2291 {
2292 unsigned short *p1, *pf, *p, *pl;
2293 p1 = (unsigned short *) srcImage->data;
2294 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2295 while (p1 < pf)
2296 {
2297 p = p1;
2298 pl = p1 + srcImage->width;
2299 for (; p < pl; p++)
2300 {
2301 *p = lookup_r[(*p & 0xf800)>>11] |
2302 lookup_g[(*p & 0x07e0)>> 5] |
2303 lookup_b[(*p & 0x001f)];
2304 }
2305 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2306 }
2307 break;
2308 }
2309 case 24:
2310 {
2311 unsigned char *p1, *pf, *p, *pl;
2312 p1 = (unsigned char *) srcImage->data;
2313 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2314 while (p1 < pf)
2315 {
2316 p = p1;
2317 pl = p1 + srcImage->width * 3;
2318 for (; p < pl; p += 3)
2319 {
2320 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2321 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2322 p[2] = lookup_r[(p[2] & 0x0000ff)];
2323 }
2324 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2325 }
2326 break;
2327 }
2328 case 32:
2329 {
2330 RUINT32T *p1, *pf, *p, *pl;
2331 p1 = (RUINT32T *) srcImage->data;
2332 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2333
2334 while (p1 < pf)
2335 {
2336 p = p1;
2337 pl = p1 + srcImage->width;
2338 for (; p < pl; p++)
2339 {
2340 *p = lookup_r[(*p & 0xff0000)>>16] |
2341 lookup_g[(*p & 0x00ff00)>> 8] |
2342 lookup_b[(*p & 0x0000ff)] |
2343 (*p & ~0xffffff);
2344 }
2345 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2346 }
2347 break;
2348 }
2349 }
2350
2351 free (lookup);
2352}
2353#endif
2354
1708/* 2355/*
1709 * Check our parents are still who we think they are. 2356 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2357 * Do transparency updates if required
1711 */ 2358 */
1712int 2359int
1713rxvt_term::check_our_parents () 2360rxvt_term::check_our_parents ()
1714{ 2361{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2362 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2363 unsigned long nitems, bytes_after;
1717 Atom atype; 2364 Atom atype;
1718 unsigned char *prop = NULL; 2365 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2366 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2367 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2368 XWindowAttributes wattr, wrootattr;
2369 dDisp;
1722 2370
1723 pchanged = 0; 2371 pchanged = 0;
1724 2372
1725 if (! (Options & Opt_transparent)) 2373 if (!(options & Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
1727 2375
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
1730 2378
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2380
1732 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
1733 { 2382 {
1734 if (am_transparent) 2383 if (am_transparent)
1735 { 2384 {
1736 pchanged = 1; 2385 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2386 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
1740 } 2388 }
2389
1741 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
1742 } 2391 }
1743 2392
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2393 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2394 XSync (disp, False);
1746 2395
1747 /* 2396 /*
1748 * Make the frame window set by the window manager have 2397 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2398 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2399 * windows for each client, so we have to take care about that.
1751 */ 2400 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2401 i = (xa[XA_XROOTPMAP_ID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2404 &nitems, &bytes_after, &prop) == Success);
2405
1756 if (!i || prop == NULL) 2406 if (!i || prop == NULL)
2407 i = (xa[XA_ESETROOT_PMAP_ID]
2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2410 &nitems, &bytes_after, &prop) == Success);
2411
2412 if (!i || prop == NULL
2413#if TINTING
2414 || !rs[Rs_color + Color_tint]
2415#endif
2416 )
1757 have_pixmap = 0; 2417 have_pixmap = 0;
1758 else 2418 else
1759 { 2419 {
1760 have_pixmap = 1; 2420 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2421 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2422 XFree (prop);
1763 } 2423 }
2424
1764 if (have_pixmap) 2425 if (have_pixmap)
1765 { 2426 {
1766 /* 2427 /*
1767 * Copy display->root pixmap transparency 2428 * Copy display->root pixmap transparency
1768 */ 2429 */
… …
1771 Window cr; 2432 Window cr;
1772 XImage *image; 2433 XImage *image;
1773 GC gc; 2434 GC gc;
1774 XGCValues gcvalue; 2435 XGCValues gcvalue;
1775 2436
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2441 nx = ny = 0;
1781 2442
1782 if (sx < 0) 2443 if (sx < 0)
… …
1793 sy = 0; 2454 sy = 0;
1794 } 2455 }
1795 2456
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2459
2460 XSync (disp, False);
1798 allowedxerror = -1; 2461 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2463
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2465 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2466 allowedxerror = 0;
2467
1804 if (image == NULL) 2468 if (image == NULL)
1805 { 2469 {
1806 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
1807 { 2471 {
1808 pchanged = 1; 2472 pchanged = 1;
1809 if (TermWin.pixmap != None) 2473 if (TermWin.pixmap != None)
1810 { 2474 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2475 XFreePixmap (disp, TermWin.pixmap);
1812 TermWin.pixmap = None; 2476 TermWin.pixmap = None;
1813 } 2477 }
1814 } 2478 }
2479
1815 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
1816 } 2481 }
1817 else 2482 else
1818 { 2483 {
1819 if (TermWin.pixmap != None) 2484 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2485 XFreePixmap (disp, TermWin.pixmap);
2486
2487#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint))
2489 {
2490 unsigned short rm, gm, bm;
2491 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2492
2493 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2494
2495 ShadeXImage (display, image, shade, rm, gm, bm);
2496 }
2497#endif
2498
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2499 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2500 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2503 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2504 XFreeGC (disp, gc);
1830 XDestroyImage (image); 2505 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2506 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
1832 TermWin.pixmap); 2507 XClearWindow (disp, TermWin.parent[0]);
2508
1833 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2510 pchanged = 1;
2511
1835 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
1836 } 2513 }
1837 } 2514 }
1838 2515
1839 if (!am_pixmap_trans) 2516 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2518 else
1840 { 2519 {
1841 unsigned int n; 2520 unsigned int n;
1842 /* 2521 /*
1843 * InheritPixmap transparency 2522 * InheritPixmap transparency
1844 */ 2523 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2524 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2525 {
1849 oldp = TermWin.parent[i]; 2526 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2528 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2529 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2530
1854 if (TermWin.parent[i] == display->root) 2531 if (TermWin.parent[i] == display->root)
1855 { 2532 {
1856 if (oldp != None) 2533 if (oldp != None)
1857 pchanged = 1; 2534 pchanged = 1;
2535
1858 break; 2536 break;
1859 } 2537 }
2538
1860 if (oldp != TermWin.parent[i]) 2539 if (oldp != TermWin.parent[i])
1861 pchanged = 1; 2540 pchanged = 1;
1862 } 2541 }
1863 2542
1864 n = 0; 2543 n = 0;
1865 2544
1866 if (pchanged) 2545 if (pchanged)
1867 { 2546 {
1868 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
1869 { 2548 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
1871 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
1872 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2551 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2552 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
1875 break; 2553 break;
1876 } 2554 }
1877 } 2555 }
1878 } 2556 }
1879 2557
1880 if (n > (int) (sizeof (TermWin.parent) 2558 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2559 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2560 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2561 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt,
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2562 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
1890 } 2564 }
1891 else 2565 else
1892 { 2566 {
2567#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2568 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1); 2570 sleep (1);
1903# endif 2571#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2573 {
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2574 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
1907 ParentRelative); 2575 XClearWindow (disp, TermWin.parent[n]);
2576 }
2577
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2578 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
1909 ParentRelative);
1910 am_transparent = 1; 2579 am_transparent = 1;
1911 } 2580 }
1912 2581
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2583 TermWin.parent[i] = None;
1915 } 2584 }
2585
2586 if (scrollBar.win)
2587 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2589 scrollBar.setIdle ();
2590 scrollbar_show (0);
2591 }
2592
2593 if (am_transparent)
2594 {
2595 want_refresh = want_full_refresh = 1;
2596 if (am_pixmap_trans)
2597 flush ();
2598 }
2599
1916 return pchanged; 2600 return pchanged;
1917} 2601}
1918#endif 2602#endif
1919 2603
1920/*}}} */ 2604/*}}} */
… …
1935 } 2619 }
1936 2620
1937 if (ch == NOCHAR) // TODO: improve 2621 if (ch == NOCHAR) // TODO: improve
1938 break; 2622 break;
1939 2623
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2625 {
2626 if (!seen_input)
1941 { 2627 {
2628 seen_input = 1;
2629 // many badly-written programs (e.g. jed) contain a race condition:
2630 // they first read the screensize and then install a SIGWINCH handler.
2631 // some window managers resize the window early, and these programs
2632 // then sometimes get the size wrong.
2633 // unfortunately other programs are even more buggy and dislike
2634 // being sent SIGWINCH, so only do it when we were in fact being
2635 // resized.
2636 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH);
2638 }
2639
1942 /* Read a text string from the input buffer */ 2640 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2641 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2642 bool refreshnow = false;
1945 int nlines = 0; 2643 int nlines = 0;
1946 unicode_t *str = buf; 2644 unicode_t *str = buf;
1947 2645
1948 *str++ = ch;
1949
1950 for (;;) 2646 for (;;)
1951 { 2647 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2649 break;
1957 2650
1958 *str++ = ch; 2651 *str++ = ch;
1959 2652
1960 if (ch == '\n') 2653 if (ch == C0_LF)
1961 { 2654 {
1962 nlines++; 2655 nlines++;
1963 refresh_count++; 2656 refresh_count++;
1964 2657
1965 if (! (Options & Opt_jumpScroll) 2658 if (!(options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2659 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
1967 { 2660 {
1968 refreshnow = true; 2661 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR; 2662 ch = NOCHAR;
1971 break; 2663 break;
1972 } 2664 }
1973 2665
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2666 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2667 if (nlines >= TermWin.nrow - 1)
1976 { 2668 {
1977 scr_add_lines (buf, nlines, str - buf); 2669 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0; 2670 nlines = 0;
1979 str = buf; 2671 str = buf;
… …
1983 if (str >= buf + UBUFSIZ) 2675 if (str >= buf + UBUFSIZ)
1984 { 2676 {
1985 ch = NOCHAR; 2677 ch = NOCHAR;
1986 break; 2678 break;
1987 } 2679 }
2680
2681 seq_begin = cmdbuf_ptr;
2682 ch = next_char ();
1988 } 2683 }
1989 2684
1990 scr_add_lines (buf, nlines, str - buf); 2685 scr_add_lines (buf, nlines, str - buf);
1991 2686
1992 /* 2687 /*
1993 * If there have been a lot of new lines, then update the screen 2688 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2689 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2690 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2691 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2692 */
2001 if (refreshnow) 2693 if (refreshnow)
2002 { 2694 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2695 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2696 refresh_limit++;
2005 2697 else
2698 {
2699 flag = true;
2006 scr_refresh (refresh_type); 2700 scr_refresh (refresh_type);
2701 }
2007 } 2702 }
2008 2703
2009 } 2704 }
2010 else 2705 else
2011 { 2706 {
… …
2025 } 2720 }
2026 2721
2027 return flag; 2722 return flag;
2028} 2723}
2029 2724
2725// read the next octet
2726unicode_t
2727rxvt_term::next_octet ()
2728{
2729 return cmdbuf_ptr < cmdbuf_endp
2730 ? *cmdbuf_ptr++
2731 : NOCHAR;
2732}
2733
2030// read the next character 2734// read the next character
2031unicode_t 2735unicode_t
2032rxvt_term::next_char () 2736rxvt_term::next_char ()
2033{ 2737{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2738 while (cmdbuf_ptr < cmdbuf_endp)
… …
2050 if (len == (size_t)-1) 2754 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2755 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2756
2053 // assume wchar == unicode 2757 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2758 cmdbuf_ptr += len;
2055 return wc; 2759 return wc & UNICODE_MASK;
2056 } 2760 }
2057 2761
2058 return NOCHAR; 2762 return NOCHAR;
2059} 2763}
2060 2764
… …
2065 */ 2769 */
2066unicode_t 2770unicode_t
2067rxvt_term::cmd_getc () 2771rxvt_term::cmd_getc ()
2068{ 2772{
2069 unicode_t c = next_char (); 2773 unicode_t c = next_char ();
2774
2775 if (c == NOCHAR)
2776 throw out_of_input;
2777
2778 return c;
2779}
2780
2781unicode_t
2782rxvt_term::cmd_get8 ()
2783{
2784 unicode_t c = next_octet ();
2070 2785
2071 if (c == NOCHAR) 2786 if (c == NOCHAR)
2072 throw out_of_input; 2787 throw out_of_input;
2073 2788
2074 return c; 2789 return c;
… …
2156/*}}} */ 2871/*}}} */
2157 2872
2158/* *INDENT-OFF* */ 2873/* *INDENT-OFF* */
2159enum { 2874enum {
2160 C1_40 = 0x40, 2875 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2876 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2877 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2878 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2879 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2880};
2166/* *INDENT-ON* */ 2881/* *INDENT-ON* */
2167 2882
2168/*{{{ process non-printing single characters */ 2883/*{{{ process non-printing single characters */
2169void 2884void
… …
2174 case C0_ESC: 2889 case C0_ESC:
2175 process_escape_seq (); 2890 process_escape_seq ();
2176 break; 2891 break;
2177 case C0_ENQ: /* terminal Status */ 2892 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2893 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2894 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2895 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2896 else
2183 tt_write ((unsigned char *)VT100_ANS, 2897 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2898 (unsigned int)strlen (VT100_ANS));
2185 break; 2899 break;
2186 case C0_BEL: /* bell */ 2900 case C0_BEL: /* bell */
2187 scr_bell (); 2901 scr_bell ();
2188 break; 2902 break;
2189 case C0_BS: /* backspace */ 2903 case C0_BS: /* backspace */
… …
2205 break; 2919 break;
2206 case C0_SI: /* shift in - acs */ 2920 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2921 scr_charset_choose (0);
2208 break; 2922 break;
2209 2923
2924#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2925 // 8-bit controls
2211 case 0x90: /* DCS */ 2926 case 0x90: /* DCS */
2212 process_dcs_seq (); 2927 process_dcs_seq ();
2213 break; 2928 break;
2214 case 0x9b: /* CSI */ 2929 case 0x9b: /* CSI */
2215 process_csi_seq (); 2930 process_csi_seq ();
2216 break; 2931 break;
2217 case 0x9d: /* CSI */ 2932 case 0x9d: /* CSI */
2218 process_osc_seq (); 2933 process_osc_seq ();
2219 break; 2934 break;
2935#endif
2220 } 2936 }
2221} 2937}
2222/*}}} */ 2938/*}}} */
2223 2939
2224 2940
… …
2286void 3002void
2287rxvt_term::process_escape_seq () 3003rxvt_term::process_escape_seq ()
2288{ 3004{
2289 unicode_t ch = cmd_getc (); 3005 unicode_t ch = cmd_getc ();
2290 3006
2291 if (PrivateModes & PrivMode_vt52) 3007 if (priv_modes & PrivMode_vt52)
2292 { 3008 {
2293 process_escape_vt52 (ch); 3009 process_escape_vt52 (ch);
2294 return; 3010 return;
2295 } 3011 }
2296 3012
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 3027 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 3028 break;
2313 case '+': 3029 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 3030 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 3031 break;
2316#ifndef NO_FRILLS 3032#if ENABLE_FRILLS
2317 case '6': 3033 case '6':
2318 scr_backindex (); 3034 scr_backindex ();
2319 break; 3035 break;
2320#endif 3036#endif
2321 case '7': 3037 case '7':
2322 scr_cursor (SAVE); 3038 scr_cursor (SAVE);
2323 break; 3039 break;
2324 case '8': 3040 case '8':
2325 scr_cursor (RESTORE); 3041 scr_cursor (RESTORE);
2326 break; 3042 break;
2327#ifndef NO_FRILLS 3043#if ENABLE_FRILLS
2328 case '9': 3044 case '9':
2329 scr_forwardindex (); 3045 scr_forwardindex ();
2330 break; 3046 break;
2331#endif 3047#endif
2332 case '=': 3048 case '=':
… …
2342 break; 3058 break;
2343 3059
2344 /* 8.3.87: NEXT LINE */ 3060 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3061 case C1_NEL: /* ESC E */
2346 { 3062 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3063 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3064 scr_add_lines (nlcr, 1, 2);
2349 } 3065 }
2350 break; 3066 break;
2351 3067
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3068 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2363 case C1_RI: /* ESC M */ 3079 case C1_RI: /* ESC M */
2364 scr_index (DN); 3080 scr_index (DN);
2365 break; 3081 break;
2366 3082
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3083 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3084 /*case C1_SS2: scr_single_shift (2); break; */
2369 3085
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3086 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3087 /*case C1_SS3: scr_single_shift (3); break; */
2372 3088
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3089 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3090 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3091 process_dcs_seq ();
2376 break; 3092 break;
… …
2391 process_osc_seq (); 3107 process_osc_seq ();
2392 break; 3108 break;
2393 3109
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3110 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3111 case 'c':
3112 mbstate.reset ();
2396 scr_poweron (); 3113 scr_poweron ();
2397 scrollbar_show (1); 3114 scrollbar_show (1);
2398 break; 3115 break;
2399 3116
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3117 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3129
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3130/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3131/* *INDENT-OFF* */
2415enum { 3132enum {
2416 CSI_ICH = 0x40, 3133 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3134 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3135 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3136 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3137 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3138 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3139 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3154 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3155 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3156 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3157 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3158 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3159 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3160 };
2444/* *INDENT-ON* */ 3161/* *INDENT-ON* */
2445 3162
2446void 3163void
2447rxvt_term::process_csi_seq () 3164rxvt_term::process_csi_seq ()
… …
2510 { 3227 {
2511 switch (priv) 3228 switch (priv)
2512 { 3229 {
2513 case '>': 3230 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 3231 if (ch == CSI_DA) /* secondary device attributes */
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3232 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2516 break; 3233 break;
2517 case '?': 3234 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3235 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 3236 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 3237 break;
… …
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3347 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2631 break; 3348 break;
2632 3349
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3350 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3351 tt_write ((const unsigned char *)VT100_ANS,
2635 (unsigned int) (sizeof (VT100_ANS) - 1)); 3352 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3353 break;
2637 3354
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3355 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3356 process_sgr_mode (nargs, arg);
2640 break; 3357 break;
… …
2646 tt_printf ("\033[0n"); 3363 tt_printf ("\033[0n");
2647 break; 3364 break;
2648 case 6: /* CPR requested */ 3365 case 6: /* CPR requested */
2649 scr_report_position (); 3366 scr_report_position ();
2650 break; 3367 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3368 case 7: /* unofficial extension */
3369 if (options & Opt_insecure)
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3370 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3371 break;
2655#endif
2656 case 8: /* unofficial extension */ 3372 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3373 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3374 break;
2659 } 3375 }
2660 break; 3376 break;
2661 3377
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3378 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3411 break;
2696 3412
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3413 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3414 if (arg[0] == 4)
2699 scr_insert_mode (0); 3415 scr_insert_mode (0);
3416 else if (arg[0] == 20)
3417 priv_modes &= ~PrivMode_LFNL;
2700 break; 3418 break;
2701 3419
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3420 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3421 if (arg[0] == 4)
2704 scr_insert_mode (1); 3422 scr_insert_mode (1);
3423 else if (arg[0] == 20)
3424 priv_modes |= PrivMode_LFNL;
2705 break; 3425 break;
2706 3426
2707 /* 3427 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3428 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3429 */
… …
2721 break; 3441 break;
2722 case CSI_75: 3442 case CSI_75:
2723 scr_cursor (RESTORE); 3443 scr_cursor (RESTORE);
2724 break; 3444 break;
2725 3445
2726#ifndef NO_FRILLS 3446#if ENABLE_FRILLS
2727 case CSI_74: 3447 case CSI_74:
2728 process_window_ops (arg, nargs); 3448 process_window_ops (arg, nargs);
2729 break; 3449 break;
2730#endif 3450#endif
2731 3451
… …
2738 break; 3458 break;
2739 } 3459 }
2740} 3460}
2741/*}}} */ 3461/*}}} */
2742 3462
2743#ifndef NO_FRILLS 3463#if ENABLE_FRILLS
2744/* ARGSUSED */ 3464/* ARGSUSED */
2745void 3465void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3466rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3467{
2748 int x, y; 3468 int x, y;
2749 XWindowAttributes wattr; 3469 XWindowAttributes wattr;
2750 Window wdummy; 3470 Window wdummy;
3471 dDisp;
2751 3472
2752 if (nargs == 0) 3473 if (nargs == 0)
2753 return; 3474 return;
2754 3475
2755 switch (args[0]) 3476 switch (args[0])
2756 { 3477 {
2757 /* 3478 /*
2758 * commands 3479 * commands
2759 */ 3480 */
2760 case 1: /* deiconify window */ 3481 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3482 XMapWindow (disp, TermWin.parent[0]);
2762 break; 3483 break;
2763 case 2: /* iconify window */ 3484 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3485 XIconifyWindow (disp, TermWin.parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3486 break;
2767 case 3: /* set position (pixels) */ 3487 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3488 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
2769 break; 3489 break;
2770 case 4: /* set size (pixels) */ 3490 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3491 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3492 break;
2773 case 5: /* raise window */ 3493 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3494 XRaiseWindow (disp, TermWin.parent[0]);
2775 break; 3495 break;
2776 case 6: /* lower window */ 3496 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3497 XLowerWindow (disp, TermWin.parent[0]);
2778 break; 3498 break;
2779 case 7: /* refresh window */ 3499 case 7: /* refresh window */
2780 scr_touch (true); 3500 scr_touch (true);
2781 break; 3501 break;
2782 case 8: /* set size (chars) */ 3502 case 8: /* set size (chars) */
… …
2794 3514
2795 /* 3515 /*
2796 * reports - some output format copied from XTerm 3516 * reports - some output format copied from XTerm
2797 */ 3517 */
2798 case 11: /* report window state */ 3518 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3519 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3520 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3521 break;
2802 case 13: /* report window position */ 3522 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3524 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3525 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3526 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3527 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3528 break;
2809 case 14: /* report window size (pixels) */ 3529 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3530 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3531 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3532 break;
2813 case 18: /* report text area size (chars) */ 3533 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3534 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break; 3535 break;
2816 case 19: /* report window size (chars) */ 3536 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3537 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3538 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3539 case 20: /* report icon label */
3540 {
3541 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3542 XGetIconName (disp, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3543 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3544 XFree (s);
3545 }
2823 break; 3546 break;
2824 case 21: /* report window title */ 3547 case 21: /* report window title */
3548 {
3549 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3550 XFetchName (disp, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3551 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3552 XFree (s);
3553 }
2827 break; 3554 break;
2828#endif
2829 } 3555 }
2830} 3556}
2831#endif 3557#endif
2832 3558
2833/*----------------------------------------------------------------------*/ 3559/*----------------------------------------------------------------------*/
2834/* 3560/*
2835 * get input up until STRING TERMINATOR (or BEL) 3561 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3562 * ends_how is terminator used. returned input must be free()'d
2837 */ 3563 */
2838unsigned char * 3564unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3565rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3566{
2841 int seen_esc = 0; /* seen escape? */ 3567 unicode_t ch;
3568 bool seen_esc = false;
2842 unsigned int n = 0; 3569 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3570 wchar_t string[STRING_MAX];
2846 3571
2847 while ((ch = cmd_getc ())) 3572 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3573 {
2849 if (ch == C0_BEL 3574 if (seen_esc)
2850 || ch == CHAR_ST 3575 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3576 if (ch == 0x5c) /* 7bit ST */
2852 break; 3577 break;
2853 3578 else
3579 return NULL;
3580 }
2854 if (ch == C0_ESC) 3581 else if (ch == C0_ESC)
2855 { 3582 {
2856 seen_esc = 1; 3583 seen_esc = true;
2857 continue; 3584 continue;
2858 } 3585 }
2859 else if (ch == '\t') 3586 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3587 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3588 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3589 return NULL; /* other control character - exit */
2863 3590
3591 seen_esc = false;
3592
2864 if (n < sizeof (string) - 1) 3593 if (n >= sizeof (string) - 1)
3594 // stop at some sane length
3595 return NULL;
3596
3597 if (ch == C0_SYN)
3598 string[n++] = cmd_get8 ();
3599 else
2865 string[n++] = ch; 3600 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3601 }
2869 3602
2870 string[n++] = '\0'; 3603 string[n++] = '\0';
2871 3604
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3605 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3606
2877 return s; 3607 return (unsigned char *)rxvt_wcstombs (string);
2878} 3608}
2879 3609
2880/*----------------------------------------------------------------------*/ 3610/*----------------------------------------------------------------------*/
2881/* 3611/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3612 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
2915 { 3645 {
2916 unsigned char *s = get_to_st (eh); 3646 unsigned char *s = get_to_st (eh);
2917 3647
2918 if (s) 3648 if (s)
2919 { 3649 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3650 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3651 free (s);
2934 } 3652 }
2935 } 3653 }
2936} 3654}
3655
3656void
3657rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3658{
3659 if (str[0] == '?' && !str[1])
3660 {
3661 unsigned short r, g, b;
3662 pix_colors_focused[color].get (display, r, g, b);
3663 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3664 }
3665 else
3666 set_window_color (color, str);
3667}
3668
2937/* 3669/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3670 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title
2940 * 1 = change iconName
2941 * 2 = change title
2942 * 4 = change color
2943 * 12 = change text color
2944 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour
2946 * 18 = change bold character color
2947 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented)
2949 * 50 = change font
2950 *
2951 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap
2954 * 39 = change default fg color
2955 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale
2958 * 702 = find font
2959 */ 3671 */
2960void 3672void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3673rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3674{
2963 int changed = 0; 3675 int changed = 0;
2964 int color; 3676 int color;
2965 char *buf, *name; 3677 char *buf, *name;
3678 bool query = str[0] == '?' && !str[1];
3679 int saveop = op;
3680 dDisp;
2966 3681
2967 assert (str != NULL); 3682 assert (str != NULL);
2968 switch (op) 3683 switch (op)
2969 { 3684 {
2970 case XTerm_name: 3685 case XTerm_name:
… …
2974 set_icon_name (str); 3689 set_icon_name (str);
2975 break; 3690 break;
2976 case XTerm_title: 3691 case XTerm_title:
2977 set_title (str); 3692 set_title (str);
2978 break; 3693 break;
3694 case XTerm_property:
3695 if (str[0] == '?')
3696 {
3697 Atom prop = display->atom (str + 1);
3698 Atom actual_type;
3699 int actual_format;
3700 unsigned long nitems;
3701 unsigned long bytes_after;
3702 unsigned char *value = 0;
3703 const char *str = "";
3704
3705 if (prop
3706 && XGetWindowProperty (disp, TermWin.parent[0],
3707 prop, 0, 1<<16, 0, AnyPropertyType,
3708 &actual_type, &actual_format,
3709 &nitems, &bytes_after, &value) == Success
3710 && actual_type != None
3711 && actual_format == 8)
3712 str = (const char *)(value);
3713
3714 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3715
3716 XFree (value);
3717 }
3718 else
3719 {
3720 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3721
3722 if (eq)
3723 {
3724 *eq = 0;
3725 set_utf8_property (display->atom (str), eq + 1);
3726 }
3727 else
3728 XDeleteProperty (disp, TermWin.parent[0],
3729 display->atom (str));
3730 }
3731 break;
3732
2979 case XTerm_Color: 3733 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3734 for (buf = (char *)str; buf && *buf;)
2981 { 3735 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3736 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3737 break;
2984 3738
2985 *name++ = '\0'; 3739 *name++ = '\0';
2986 color = atoi (buf); 3740 color = atoi (buf);
2987 3741
2988 if (color < 0 || color >= TOTAL_COLORS) 3742 if (color < 0 || color >= TOTAL_COLORS)
2989 break; 3743 break;
2990 3744
2991 if ((buf = STRCHR (name, ';')) != NULL) 3745 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3746 *buf++ = '\0';
2993 3747
3748 if (name[0] == '?' && !name[1])
3749 {
3750 unsigned short r, g, b;
3751 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3752 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3753 }
3754 else
2994 set_window_color (color + minCOLOR, name); 3755 set_window_color (color + minCOLOR, name);
2995 } 3756 }
3757 break;
3758 case XTerm_Color00:
3759 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3760 break;
3761 case XTerm_Color01:
3762 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3763 break;
2997#ifndef NO_CURSORCOLOR 3764#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3765 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3766 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3767 break;
3001#endif 3768#endif
3002 case XTerm_Color_pointer: 3769 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3770 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3771 break;
3772 case XTerm_Color_pointer_bg:
3773 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3774 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3775#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3776 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3777 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3008 break; 3778 break;
3009 case XTerm_Color_UL: 3779 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3780 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3781 break;
3012 case XTerm_Color_RV: 3782 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3783 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3784 break;
3015#endif 3785 case URxvt_Color_IT:
3016 3786 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3017 case XTerm_Menu:
3018 /*
3019 * rxvt_menubar_dispatch () violates the constness of the string,
3020 * so DON'T do it here
3021 */
3022 break; 3787 break;
3788#endif
3789#if TRANSPARENT && TINTING
3790 case URxvt_Color_tint:
3791 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3792 check_our_parents ();
3793 if (am_transparent)
3794 want_full_refresh = want_refresh = 1;
3795 break;
3796#endif
3797
3023 case XTerm_Pixmap: 3798 case XTerm_Pixmap:
3024 if (*str != ';') 3799 if (*str != ';')
3025 { 3800 {
3026#if XPM_BACKGROUND 3801#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3802 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3803 set_bgPixmap (str); /* change pixmap */
3029#endif 3804#endif
3030 scr_touch (true); 3805 scr_touch (true);
3031 } 3806 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3807 while ((str = strchr (str, ';')) != NULL)
3033 { 3808 {
3034 str++; 3809 str++;
3035#if XPM_BACKGROUND 3810#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3811 changed += scale_pixmap (str);
3037#endif 3812#endif
3038
3039 } 3813 }
3814
3040 if (changed) 3815 if (changed)
3041 { 3816 {
3042#ifdef XPM_BACKGROUND 3817#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3818 resize_pixmap ();
3044#endif 3819#endif
… …
3050 set_window_color (Color_fg, str); 3825 set_window_color (Color_fg, str);
3051 break; 3826 break;
3052 case XTerm_restoreBG: 3827 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3828 set_window_color (Color_bg, str);
3054 break; 3829 break;
3830
3055 case XTerm_logfile: 3831 case XTerm_logfile:
3056 // TODO, when secure mode? 3832 // TODO, when secure mode?
3057 break; 3833 break;
3058 case XTerm_font: 3834
3059 change_font (str); 3835#ifdef MENUBAR
3836 case URxvt_Menu:
3837 if (options & Opt_insecure)
3838 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3060 break; 3839 break;
3061#ifndef NO_FRILLS
3062 case XTerm_locale:
3063 if (str[0] == '?' && !str[1])
3064 tt_printf ("%-.250s\n", locale);
3065 else
3066 {
3067 set_locale (str);
3068# ifdef USE_XIM
3069 im_cb ();
3070# endif
3071 }
3072 break;
3073 case XTerm_findfont:
3074 {
3075 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3077 }
3078 break;
3079#endif 3840#endif
3080#if 0 3841#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3842 case XTerm_dumpscreen: /* no error notices */
3082 { 3843 {
3083 int fd; 3844 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3845 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3846 {
3086 scr_dump (fd); 3847 scr_dump (fd);
3087 close (fd); 3848 close (fd);
3088 } 3849 }
3089 } 3850 }
3851 break;
3852#endif
3853 case XTerm_font:
3854 op = URxvt_font;
3855 case URxvt_font:
3856#if ENABLE_STYLES
3857 case URxvt_boldFont:
3858 case URxvt_italicFont:
3859 case URxvt_boldItalicFont:
3860#endif
3861 if (query)
3862 tt_printf ("\33]%d;%-.250s%c", saveop,
3863 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3864 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3865 resp);
3866 else
3867 {
3868 const char *&res = rs[Rs_font + (op - URxvt_font)];
3869
3870 res = strdup (str);
3871 allocated.push_back ((void *)res);
3872 set_fonts ();
3873 }
3874 break;
3875
3876#if ENABLE_FRILLS
3877 case URxvt_locale:
3878 if (query)
3879 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3880 else
3881 {
3882 set_locale (str);
3883 pty.set_utf8_mode (enc_utf8);
3884 init_xlocale ();
3885 }
3886 break;
3887
3888 case URxvt_view_up:
3889 case URxvt_view_down:
3890 int lines = atoi (str);
3891
3892 if (lines)
3893 scr_page (op == URxvt_view_up ? UP : DN, lines);
3894 else
3895 {
3896 scr_erase_savelines ();
3897 }
3898
3090 break; 3899 break;
3091#endif 3900#endif
3092 } 3901 }
3093} 3902}
3094/*----------------------------------------------------------------------*/ 3903/*----------------------------------------------------------------------*/
… …
3108{ 3917{
3109 int state; 3918 int state;
3110 3919
3111 if (mode == 's') 3920 if (mode == 's')
3112 { 3921 {
3113 SavedModes |= (PrivateModes & bit); 3922 SavedModes |= (priv_modes & bit);
3114 return -1; 3923 return -1;
3115 } 3924 }
3116 else 3925 else
3117 { 3926 {
3118 if (mode == 'r') 3927 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3928 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3929 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3930 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3931 PrivMode (state, bit);
3123 } 3932 }
3124 3933
3125 return state; 3934 return state;
3126} 3935}
… …
3144 { 3, PrivMode_132 }, 3953 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3954 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3955 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3956 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3957 { 7, PrivMode_Autowrap },
3958 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3959 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3960#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 3961 { menuBar_esc, PrivMode_menuBar },
3152#endif 3962#endif
3963 // 18, 19 printing-related
3964 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 3965#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3966 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3967#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3968 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 3969 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3970 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3971 // 45 margin bell NYI
3163 // 46 start logging 3972 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 3984 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3985 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3986 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3987 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3988 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3989 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3990 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3991 };
3183 3992
3184 if (nargs == 0) 3993 if (nargs == 0)
3185 return; 3994 return;
… …
3205 /* extra handling for values with state unkept */ 4014 /* extra handling for values with state unkept */
3206 switch (arg[i]) 4015 switch (arg[i])
3207 { 4016 {
3208 case 1048: /* alternative cursor save */ 4017 case 1048: /* alternative cursor save */
3209 case 1049: 4018 case 1049:
4019 if (options & Opt_secondaryScreen)
3210 if (mode == 0) 4020 if (mode == 0)
3211 scr_cursor (RESTORE); 4021 scr_cursor (RESTORE);
3212 else if (mode == 1) 4022 else if (mode == 1)
3213 scr_cursor (SAVE); 4023 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 4024 break;
3215 } 4025 }
3216 4026
3217 if (state >= 0) 4027 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 4028 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 4029 switch (arg[i])
… …
3225 * within VT52 mode 4035 * within VT52 mode
3226 */ 4036 */
3227 PrivMode (1, PrivMode_vt52); 4037 PrivMode (1, PrivMode_vt52);
3228 break; 4038 break;
3229 case 3: /* 80/132 */ 4039 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4040 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4041 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3232 break; 4042 break;
3233 case 4: /* smooth scrolling */ 4043 case 4: /* smooth scrolling */
3234 if (state) 4044 if (state)
3235 Options &= ~Opt_jumpScroll; 4045 options &= ~Opt_jumpScroll;
3236 else 4046 else
3237 Options |= Opt_jumpScroll; 4047 options |= Opt_jumpScroll;
3238 break; 4048 break;
3239 case 5: /* reverse video */ 4049 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4050 scr_rvideo_mode (state);
3241 break; 4051 break;
3242 case 6: /* relative/absolute origins */ 4052 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4053 scr_relative_origin (state);
3244 break; 4054 break;
3245 case 7: /* autowrap */ 4055 case 7: /* autowrap */
3246 scr_autowrap (state); 4056 scr_autowrap (state);
3247 break; 4057 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4058 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4059 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4060 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4061 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4062 break;
3253#ifdef menuBar_esc 4063#ifdef menuBar_esc
3254 case menuBar_esc: 4064 case menuBar_esc:
3255#ifdef MENUBAR 4065#ifdef MENUBAR
3256 map_menuBar (state); 4066 map_menuBar (state);
… …
3267 break; 4077 break;
3268#endif 4078#endif
3269 case 25: /* visible/invisible cursor */ 4079 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4080 scr_cursor_visible (state);
3271 break; 4081 break;
3272 /* case 35: - shift keys */ 4082 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4083 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4084 case 47: /* secondary screen */
3275 scr_change_screen (state); 4085 scr_change_screen (state);
3276 break; 4086 break;
3277 /* case 66: - application key pad */ 4087 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4088 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4089 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4090 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4091 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4092 break;
3283#if 0 4093#if 0
3284 case 1001: 4094 case 1001:
3285 break; /* X11 mouse highlighting */ 4095 break; /* X11 mouse highlighting */
3286#endif 4096#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4097 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state) 4098 if (state)
3289 Options &= ~Opt_scrollTtyOutput; 4099 options &= ~Opt_scrollTtyOutput;
3290 else 4100 else
3291 Options |= Opt_scrollTtyOutput; 4101 options |= Opt_scrollTtyOutput;
3292 break; 4102 break;
3293 case 1011: /* scroll to bottom on key press */ 4103 case 1011: /* scroll to bottom on key press */
3294 if (state) 4104 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4105 options |= Opt_scrollTtyKeypress;
3296 else 4106 else
3297 Options &= ~Opt_scrollTtyKeypress; 4107 options &= ~Opt_scrollTtyKeypress;
3298 break; 4108 break;
3299 case 1047: /* secondary screen w/ clearing */ 4109 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4110 if (options & Opt_secondaryScreen)
3301 if (current_screen != PRIMARY) 4111 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4112 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4113 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4114 break;
4115 case 1049: /* secondary screen w/ clearing first */
4116 scr_change_screen (state);
4117 if (options & Opt_secondaryScreen)
4118 if (current_screen != PRIMARY)
4119 scr_erase_screen (2);
4120 break;
3306 default: 4121 default:
3307 break; 4122 break;
3308 } 4123 }
3309 } 4124 }
3310} 4125}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4148 rendset = 0, rendstyle = ~RS_None;
3334 break; 4149 break;
3335 case 1: 4150 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4151 rendset = 1, rendstyle = RS_Bold;
3337 break; 4152 break;
4153 //case 2: // low intensity
4154 case 3:
4155 rendset = 1, rendstyle = RS_Italic;
4156 break;
3338 case 4: 4157 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4158 rendset = 1, rendstyle = RS_Uline;
3340 break; 4159 break;
3341 case 5: 4160 case 5: // slowly blinking
4161 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4162 rendset = 1, rendstyle = RS_Blink;
3343 break; 4163 break;
4164 //case 6: // scoansi light background
3344 case 7: 4165 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4166 rendset = 1, rendstyle = RS_RVid;
3346 break; 4167 break;
3347 case 8: 4168 case 8:
3348 // invisible. NYI 4169 // invisible. NYI
3349 break; 4170 break;
3350 case 22: 4171 //case 9: // crossed out
4172 //case 10: // scoansi acs off, primary font
4173 //case 11: // scoansi acs on, first alt font
4174 //case 12: // scoansi acs on, |0x80, second alt font
4175 //...
4176 //case 19: // ninth alt font
4177 //case 20: // gothic
4178 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4179 rendset = 0, rendstyle = RS_Bold;
4180 break;
4181 case 22: // normal intensity
4182 rendset = 0, rendstyle = RS_Bold;
4183 break;
4184 case 23: // disable italic
4185 rendset = 0, rendstyle = RS_Italic;
3352 break; 4186 break;
3353 case 24: 4187 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4188 rendset = 0, rendstyle = RS_Uline;
3355 break; 4189 break;
3356 case 25: 4190 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4191 rendset = 0, rendstyle = RS_Blink;
3358 break; 4192 break;
4193 case 26: // variable spacing (iso 8613)
4194 rendset = 0, rendstyle = RS_Blink;
4195 break;
3359 case 27: 4196 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4197 rendset = 0, rendstyle = RS_RVid;
3361 break; 4198 break;
3362 case 28:
3363 // visible. NYI 4199 //case 28: // visible. NYI
3364 break; 4200 //case 29: // not crossed-out
3365 } 4201 }
3366 4202
3367 if (rendset != -1) 4203 if (rendset != -1)
3368 { 4204 {
3369 scr_rendition (rendset, rendstyle); 4205 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4216 case 35:
3381 case 36: 4217 case 36:
3382 case 37: 4218 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4219 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4220 break;
3385#ifdef TTY_256COLOR 4221 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4222 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4223 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4224 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4225 i += 2;
3391 } 4226 }
3392 break; 4227 break;
3393#endif
3394 case 39: /* default fg */ 4228 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4229 scr_color (Color_fg, Color_fg);
3396 break; 4230 break;
3397 4231
3398 case 40: 4232 case 40:
… …
3403 case 45: 4237 case 45:
3404 case 46: 4238 case 46:
3405 case 47: 4239 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4240 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4241 break;
3408#ifdef TTY_256COLOR 4242 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4243 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4244 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4245 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4246 i += 2;
3414 } 4247 }
3415 break; 4248 break;
3416#endif
3417 case 49: /* default bg */ 4249 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4250 scr_color (Color_bg, Color_bg);
3419 break; 4251 break;
4252
4253 //case 50: // not variable spacing
3420 4254
3421#ifndef NO_BRIGHTCOLOR 4255#ifndef NO_BRIGHTCOLOR
3422 case 90: 4256 case 90:
3423 case 91: /* set bright fg color */ 4257 case 91: /* set bright fg color */
3424 case 92: 4258 case 92:
3425 case 93: 4259 case 93:
3426 case 94: 4260 case 94:
3427 case 95: 4261 case 95:
3428 case 96: 4262 case 96:
3429 case 97: 4263 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4264 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4265 break;
3433 case 100: 4266 case 100:
3434 case 101: /* set bright bg color */ 4267 case 101: /* set bright bg color */
3435 case 102: 4268 case 102:
3436 case 103: 4269 case 103:
3437 case 104: 4270 case 104:
3438 case 105: 4271 case 105:
3439 case 106: 4272 case 106:
3440 case 107: 4273 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4274 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4275 break;
3444#endif 4276#endif
3445 4277
3446 } 4278 }
3447 } 4279 }
3448} 4280}
3449/*}}} */ 4281/*}}} */
3450 4282
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4283/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4284void
3453rxvt_term::process_graphics () 4285rxvt_term::process_graphics ()
3454{ 4286{
3455 unicode_t ch, cmd = cmd_getc (); 4287 unicode_t ch, cmd = cmd_getc ();
3456 4288
3457 if (cmd == 'Q') 4289 if (cmd == 'Q')
3458 { /* query graphics */ 4290 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4291 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4292 return;
3461 } 4293 }
3462 /* swallow other graphics sequences until terminating ':' */ 4294 /* swallow other graphics sequences until terminating ':' */
3463 do 4295 do
3464 ch = cmd_getc (); 4296 ch = cmd_getc ();
… …
3479 unsigned char buf[256]; 4311 unsigned char buf[256];
3480 4312
3481 va_start (arg_ptr, fmt); 4313 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4314 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4315 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4316 tt_write (buf, strlen (buf));
3485} 4317}
3486 4318
3487/* ---------------------------------------------------------------------- */ 4319/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4320/* Write data to the pty as typed by the user, pasted with the mouse,
3489 * or generated by us in response to a query ESC sequence. 4321 * or generated by us in response to a query ESC sequence.
3490 */ 4322 */
4323const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4324
3491void 4325void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4326rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3493{ 4327{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4328 if (v_buflen == 0)
4329 {
4330 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3495 4331
3496 if (len) 4332 if ((unsigned int)written == len)
4333 return;
4334
4335 data += written;
4336 len -= written;
3497 { 4337 }
4338
4339 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4340
4341 memcpy (v_buffer + v_buflen, data, len);
4342 v_buflen += len;
4343
4344 pty_ev.set (EVENT_READ | EVENT_WRITE);
4345}
4346
4347void rxvt_term::pty_write ()
4348{
4349 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4350
4351 if (written > 0)
4352 {
4353 v_buflen -= written;
4354
3498 if (v_buflen == 0) 4355 if (v_buflen == 0)
3499 { 4356 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3501
3502 if ((unsigned int)written == len)
3503 return;
3504
3505 data += written;
3506 len -= written;
3507 }
3508
3509
3510 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3511
3512 memcpy (v_buffer + v_buflen, data, len);
3513 v_buflen += len;
3514 }
3515
3516 for (;;)
3517 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3519
3520 if (written > 0)
3521 {
3522 v_buflen -= written;
3523
3524 if (v_buflen == 0)
3525 {
3526 free (v_buffer); 4357 free (v_buffer);
3527 v_buffer = 0; 4358 v_buffer = 0;
3528 v_buflen = 0; 4359 v_buflen = 0;
3529 4360
3530 pty_ev.set (EVENT_READ); 4361 pty_ev.set (EVENT_READ);
3531 return;
3532 }
3533
3534 memmove (v_buffer, v_buffer + written, v_buflen);
3535 }
3536 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3537 // original code just ignores this...
3538 destroy ();
3539 else
3540 {
3541 pty_ev.set (EVENT_READ | EVENT_WRITE);
3542 return; 4362 return;
3543 } 4363 }
4364
4365 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4366 }
4367 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4368 // original code just ignores this...
4369 destroy ();
3545} 4370}
3546 4371
3547/*----------------------- end-of-file (C source) -----------------------*/ 4372/*----------------------- end-of-file (C source) -----------------------*/
3548 4373

Diff Legend

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