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.199 by root, Sun Feb 20 02:00:43 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]
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1009 destroy (); 1337 destroy ();
1338#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out ();
1346 }
1347#endif
1010#ifdef OFFIX_DND 1348#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */ 1349 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1350 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile 1351 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1352 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1353 || ev.xclient.data.l[0] == DndLink))
1016 { 1354 {
1017 /* Get Dnd data */ 1355 /* Get Dnd data */
1018 Atom ActualType; 1356 Atom ActualType;
1019 int ActualFormat; 1357 int ActualFormat;
1020 unsigned char *data; 1358 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1359 unsigned long Size, RemainingBytes;
1022 1360
1023 XGetWindowProperty (display->display, display->root, 1361 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1362 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1363 0L, 1000000L,
1026 False, AnyPropertyType, 1364 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1365 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1366 &Size, &RemainingBytes,
1029 &data); 1367 &data);
1030 XChangeProperty (display->display, display->root, 1368 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1369 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1370 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1371 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1372 }
1037#endif /* OFFIX_DND */ 1373#endif /* OFFIX_DND */
1038 break; 1374 break;
1039 1375
1040 case MappingNotify: 1376 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1377 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1378 break;
1043 1379
1044 /* 1380 /*
1045 * XXX: this is not the _current_ arrangement 1381 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1382 * Here's my conclusion:
… …
1065 break; 1401 break;
1066 } 1402 }
1067 break; 1403 break;
1068 1404
1069 case FocusIn: 1405 case FocusIn:
1070 if (!TermWin.focus) 1406 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; 1407 break;
1085 1408
1086 case FocusOut: 1409 case FocusOut:
1087 if (TermWin.focus) 1410 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; 1411 break;
1103 1412
1104 case ConfigureNotify: 1413 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1414 if (ev.xconfigure.window == TermWin.parent[0])
1106 { 1415 {
… …
1110 { /* Wrap lots of configures into one */ 1419 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width; 1420 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height; 1421 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1423 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1425
1117 if (szHint.width != width || szHint.height != height) 1426 if (szHint.width != width || szHint.height != height)
1118 { 1427 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1428 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1429 resize_all_windows (width, height, 1);
1121 } 1430 }
1122#ifdef DEBUG_SIZE 1431
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1433 if (options & Opt_transparent)
1130 {
1131 check_our_parents (); 1434 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif 1435#endif
1136
1137 } 1436 }
1437 break;
1438
1439 case PropertyNotify:
1440 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1441 && ev.xproperty.state == PropertyNewValue)
1442 selection_property (ev.xproperty.window, ev.xproperty.atom);
1443
1138 break; 1444 break;
1139 1445
1140 case SelectionClear: 1446 case SelectionClear:
1141 selection_clear (); 1447 selection_clear ();
1142 break; 1448 break;
1143 1449
1144 case SelectionNotify: 1450 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1451 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1452 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1453 break;
1149 1454
1150 case SelectionRequest: 1455 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1456 selection_send (ev.xselectionrequest);
1152 break; 1457 break;
… …
1173 1478
1174 case GraphicsExpose: 1479 case GraphicsExpose:
1175 case Expose: 1480 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1481 if (ev.xany.window == TermWin.vt)
1177 { 1482 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1483 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1484 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1485 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1487
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1493
1186 // ev.xexpose.width, TermWin.height, False); 1494 scr_refresh (refresh_type);
1187#endif
1188 want_refresh = 1;
1189 } 1495 }
1190 else 1496 else
1191 { 1497 {
1192 XEvent unused_event; 1498 XEvent unused_event;
1193 1499
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1500 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1195 Expose, 1501 ;
1196 &unused_event)) ; 1502 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1503 ;
1198 GraphicsExpose, 1504
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1505 if (isScrollbarWindow (ev.xany.window))
1201 { 1506 {
1202 scrollBar.setIdle (); 1507 scrollBar.setIdle ();
1203 scrollbar_show (0); 1508 scrollbar_show (0);
1204 } 1509 }
1205#ifdef MENUBAR 1510#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1512 menubar_expose ();
1208#endif 1513#endif
1514
1515#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0])
1517 XClearWindow (disp, ev.xany.window);
1518#endif
1209 } 1519 }
1210 break; 1520 break;
1211 1521
1212 case MotionNotify: 1522 case MotionNotify:
1213#ifdef POINTER_BLANK 1523#ifdef POINTER_BLANK
… …
1219 { 1529 {
1220 menubar_control (ev.xbutton); 1530 menubar_control (ev.xbutton);
1221 break; 1531 break;
1222 } 1532 }
1223#endif 1533#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1225 break; 1535 break;
1226 1536
1227 if (ev.xany.window == TermWin.vt) 1537 if (ev.xany.window == TermWin.vt)
1228 { 1538 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1539 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1540 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1232 ; 1542 ;
1233 1543
1234 XQueryPointer (display->display, TermWin.vt, 1544 XQueryPointer (disp, TermWin.vt,
1235 &unused_root, &unused_child, 1545 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1546 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1547 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1548 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1549#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1550 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1551 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1552 {
1243#endif 1553#endif
1554#if ISO_14755
1555 // 5.4
1556 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1557 {
1558 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1559 break;
1560 }
1561#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1562 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1563 ev.xbutton.state & Button3Mask ? 2 : 0);
1564
1246#ifdef SELECTION_SCROLLING 1565#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1566 if (ev.xbutton.y < TermWin.int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1249 { 1568 {
1250 int dist; 1569 int dist;
1251 1570
1252 pending_scroll_selection=1;
1253
1254 /* don't clobber the current delay if we are 1571 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1572 * already in the middle of scrolling.
1256 */ 1573 */
1257 if (scroll_selection_delay<=0) 1574 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1575 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1576
1260 /* save the event params so we can highlight 1577 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1578 * the selection in the pending-scroll loop
1262 */ 1579 */
1263 selection_save_x=ev.xbutton.x; 1580 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1581 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1583
1268 /* calc number of lines to scroll */ 1584 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1585 if (ev.xbutton.y < TermWin.int_bwidth)
1270 { 1586 {
1271 scroll_selection_dir = UP; 1587 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1588 dist = TermWin.int_bwidth - ev.xbutton.y;
1273 } 1589 }
1274 else 1590 else
1275 { 1591 {
1276 scroll_selection_dir = DN; 1592 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y -
1278 (TermWin.int_bwidth + TermWin.height); 1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1279 } 1594 }
1595
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1596 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1597 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1;
1282 MIN_IT (scroll_selection_lines, 1599 MIN_IT (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1600 SELECTION_SCROLL_MAX_LINES);
1284 } 1601 }
1285 else 1602 else
1286 { 1603 {
1287 /* we are within the text window, so we 1604 /* we are within the text window, so we
1288 * shouldn't be scrolling 1605 * shouldn't be scrolling
1289 */ 1606 */
1290 pending_scroll_selection = 0; 1607 if (sel_scroll_ev.active)
1608 sel_scroll_ev.stop();
1291 } 1609 }
1292#endif 1610#endif
1293#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
1294
1295 } 1612 }
1296#endif 1613#endif
1297
1298 } 1614 }
1299 } 1615 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1616 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1617 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1618 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1303 MotionNotify, &ev)) ; 1619 MotionNotify, &ev))
1620 ;
1621
1304 XQueryPointer (display->display, scrollBar.win, 1622 XQueryPointer (disp, scrollBar.win,
1305 &unused_root, &unused_child, 1623 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1624 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1625 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1626 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1627 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1628 scrollbar_size ());
1311 scr_refresh (refresh_type); 1629 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1630 refresh_limit = 0;
… …
1315 break; 1633 break;
1316 } 1634 }
1317} 1635}
1318 1636
1319void 1637void
1638rxvt_term::focus_in ()
1639{
1640 if (!TermWin.focus)
1641 {
1642 TermWin.focus = 1;
1643 want_refresh = 1;
1644#ifdef USE_XIM
1645 if (Input_Context != NULL)
1646 {
1647 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context);
1649 }
1650#endif
1651#ifdef CURSOR_BLINK
1652 if (options & Opt_cursorBlink)
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif
1655#ifdef OFF_FOCUS_FADING
1656 if (rs[Rs_fade])
1657 {
1658 pix_colors = pix_colors_focused;
1659 scr_recolour ();
1660 }
1661#endif
1662 }
1663}
1664
1665void
1666rxvt_term::focus_out ()
1667{
1668 if (TermWin.focus)
1669 {
1670 TermWin.focus = 0;
1671 want_refresh = 1;
1672
1673#if ENABLE_FRILLS || ISO_14755
1674 iso14755buf = 0;
1675#endif
1676#if ENABLE_OVERLAY
1677 scr_overlay_off ();
1678#endif
1679#ifdef USE_XIM
1680 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context);
1682#endif
1683#ifdef CURSOR_BLINK
1684 if (options & Opt_cursorBlink)
1685 cursor_blink_ev.stop ();
1686 hidden_cursor = 0;
1687#endif
1688#ifdef OFF_FOCUS_FADING
1689 if (rs[Rs_fade])
1690 {
1691 pix_colors = pix_colors_unfocused;
1692 scr_recolour ();
1693 }
1694#endif
1695 }
1696}
1697
1698#if TRANSPARENT
1699void
1320rxvt_term::rootwin_cb (XEvent &ev) 1700rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1701{
1322 SET_R (this); 1702 SET_R (this);
1323 SET_LOCALE (locale); 1703 SET_LOCALE (locale);
1324 1704
1325 switch (ev.type) 1705 switch (ev.type)
1326 { 1706 {
1327 case PropertyNotify: 1707 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 /* 1708 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1709 * 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. 1710 * use the property to determine the pixmap. We use it later on.
1340 */ 1711 */
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]) 1712 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1714 return;
1346 }
1347 1715
1348 /* FALLTHROUGH */ 1716 /* FALLTHROUGH */
1349 case ReparentNotify: 1717 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1719 want_refresh = want_full_refresh = 1;
1353 break; 1720 break;
1354#endif
1355 } 1721 }
1356} 1722}
1723#endif
1357 1724
1358void 1725void
1359rxvt_term::button_press (XButtonEvent &ev) 1726rxvt_term::button_press (XButtonEvent &ev)
1360{ 1727{
1361 int reportmode = 0, clickintime; 1728 int reportmode = 0, clickintime;
1362 1729
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1364 if (!bypass_keystate) 1731 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1732 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733
1366 /* 1734 /*
1367 * VT window processing of button press 1735 * VT window processing of button press
1368 */ 1736 */
1369 if (ev.window == TermWin.vt) 1737 if (ev.window == TermWin.vt)
1370 { 1738 {
1739#if ISO_14755
1740 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 {
1743 iso14755_54 (ev.x, ev.y);
1744 return;
1745 }
1746#endif
1747
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1748 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1749
1372 if (reportmode) 1750 if (reportmode)
1373 { 1751 {
1374 /* mouse report from vt window */ 1752 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1753 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1754 MEvent.state = ev.state;
… …
1405 } 1783 }
1406 else 1784 else
1407 { 1785 {
1408 if (ev.button != MEvent.button) 1786 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1787 MEvent.clicks = 0;
1788
1410 switch (ev.button) 1789 switch (ev.button)
1411 { 1790 {
1412 case Button1: 1791 case Button1:
1792 /* allow meta + click to select rectangular areas */
1793 /* should be done in screen.C */
1794#if ENABLE_FRILLS
1795 selection.rect = !!(ev.state & ModMetaMask);
1796#else
1797 selection.rect = false;
1798#endif
1799
1413 /* allow shift+left click to extend selection */ 1800 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1415 { 1802 {
1416 if (MEvent.button == Button1 && clickintime) 1803 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1804 selection_rotate (ev.x, ev.y);
1418 else 1805 else
1419 selection_extend (ev.x, ev.y, 1); 1806 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1821 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1822 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1823 selection_rotate (ev.x, ev.y);
1437 else 1824 else
1438 selection_extend (ev.x, ev.y, 1); 1825 selection_extend (ev.x, ev.y, 1);
1826
1439 MEvent.button = Button3; 1827 MEvent.button = Button3;
1440 break; 1828 break;
1441 } 1829 }
1442 } 1830 }
1831
1443 MEvent.time = ev.time; 1832 MEvent.time = ev.time;
1444 return; 1833 return;
1445 } 1834 }
1446 1835
1447 /* 1836 /*
… …
1513 upordown = 1; /* down */ 1902 upordown = 1; /* down */
1514 } 1903 }
1515 if (upordown) 1904 if (upordown)
1516 { 1905 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1906#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1907 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1908#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1909 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1910 {
1522 if (upordown < 0) 1911 if (upordown < 0)
1523 scrollBar.setUp (); 1912 scrollBar.setUp ();
… …
1539 break; 1928 break;
1540 case R_SB_ALIGN_BOTTOM: 1929 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 1930 csrO = scrollBar.bot - scrollBar.top;
1542 break; 1931 break;
1543 } 1932 }
1933
1544 if (scrollBar.style == R_SB_XTERM 1934 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 1935 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 1936 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 1937 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 1938
1549 scrollBar.setMotion (); 1939 scrollBar.setMotion ();
1550 break; 1940 break;
1551 1941
1552 case Button1: 1942 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1943 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1577 scr_page ((ev.button == Button1 ? DN : UP), 1967 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 1968 (TermWin.nrow
1579 * scrollbar_position (ev.y) 1969 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 1970 / scrollbar_size ()));
1581 } 1971 }
1972
1582 break; 1973 break;
1583 } 1974 }
1584 } 1975 }
1585 return; 1976 return;
1586 } 1977 }
… …
1598{ 1989{
1599 int reportmode = 0; 1990 int reportmode = 0;
1600 1991
1601 csrO = 0; /* reset csr Offset */ 1992 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 1993 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1994 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 1995
1605 if (scrollbar_isUpDn ()) 1996 if (scrollbar_isUpDn ())
1606 { 1997 {
1607 scrollBar.setIdle (); 1998 scrollBar.setIdle ();
1608 scrollbar_show (0); 1999 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH; 2001 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 2002#endif
1612
1613 } 2003 }
2004
1614#ifdef SELECTION_SCROLLING 2005#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2006 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop();
1616#endif 2008#endif
2009
1617 if (ev.window == TermWin.vt) 2010 if (ev.window == TermWin.vt)
1618 { 2011 {
2012#if ISO_14755
2013 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return;
2016#endif
1619 if (reportmode) 2017 if (reportmode)
1620 { 2018 {
1621 /* mouse report from vt window */ 2019 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2020 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2021 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2035 MEvent.button = AnyButton;
1638 mouse_report (ev); 2036 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2037#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2038 return;
1641 } 2039 }
2040
1642 /* 2041 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2042 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2043 * when overriding mouse reporting
1645 */ 2044 */
1646 if (PrivateModes & PrivMode_mouse_report 2045 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2046 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2047 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2048 selection_extend (ev.x, ev.y, 0);
1650 2049
1651 switch (ev.button) 2050 switch (ev.button)
… …
1662 case Button5: 2061 case Button5:
1663 { 2062 {
1664 int i; 2063 int i;
1665 page_dirn v; 2064 page_dirn v;
1666 2065
1667 v = (ev.button == Button4) ? UP : DN; 2066 v = ev.button == Button4 ? UP : DN;
2067
1668 if (ev.state & ShiftMask) 2068 if (ev.state & ShiftMask)
1669 i = 1; 2069 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2070 else if (options & Opt_mouseWheelScrollPage)
1671 i = TermWin.nrow - 1; 2071 i = TermWin.nrow - 1;
1672 else 2072 else
1673 i = 5; 2073 i = 5;
2074
1674# ifdef MOUSE_SLIP_WHEELING 2075# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2076 if (ev.state & ControlMask)
1676 { 2077 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2078 mouse_slip_wheel_speed += v ? -1 : 1;
2079 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2080 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2081
2082 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084
2085 slip_wheel_ev.start ();
1679 } 2086 }
2087 else
2088 {
1680# endif 2089# endif
1681# ifdef JUMP_MOUSE_WHEEL 2090# 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); 2091 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH); 2092 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 2093 scrollbar_show (1);
2094# else
2095 while (i--)
2096 {
2097 scr_page (v, 1);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1);
2100 }
2101# endif
2102# ifdef MOUSE_SLIP_WHEELING
1691 } 2103 }
1692# endif 2104#endif
1693
1694 } 2105 }
1695 break; 2106 break;
1696#endif 2107#endif
1697
1698 } 2108 }
1699 } 2109 }
1700#ifdef MENUBAR 2110#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 2111 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 2112 menubar_control (ev);
1703#endif 2113#endif
1704} 2114}
1705 2115
1706
1707#ifdef TRANSPARENT 2116#ifdef TRANSPARENT
2117#if TINTING
2118/* taken from aterm-0.4.2 */
2119
2120typedef uint32_t RUINT32T;
2121
2122void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2123{
2124 int sh_r, sh_g, sh_b;
2125 RUINT32T mask_r, mask_g, mask_b;
2126 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2127 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2128 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2129 int i;
2130
2131 Visual *visual = display->visual;
2132
2133 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2134
2135 /* for convenience */
2136 mask_r = visual->red_mask;
2137 mask_g = visual->green_mask;
2138 mask_b = visual->blue_mask;
2139
2140 /* boring lookup table pre-initialization */
2141 switch (srcImage->bits_per_pixel) {
2142 case 15:
2143 if ((mask_r != 0x7c00) ||
2144 (mask_g != 0x03e0) ||
2145 (mask_b != 0x001f))
2146 return;
2147 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2148 lookup_r = lookup;
2149 lookup_g = lookup+32;
2150 lookup_b = lookup+32+32;
2151 sh_r = 10;
2152 sh_g = 5;
2153 sh_b = 0;
2154 break;
2155 case 16:
2156 if ((mask_r != 0xf800) ||
2157 (mask_g != 0x07e0) ||
2158 (mask_b != 0x001f))
2159 return;
2160 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2161 lookup_r = lookup;
2162 lookup_g = lookup+32;
2163 lookup_b = lookup+32+64;
2164 sh_r = 11;
2165 sh_g = 5;
2166 sh_b = 0;
2167 break;
2168 case 24:
2169 if ((mask_r != 0xff0000) ||
2170 (mask_g != 0x00ff00) ||
2171 (mask_b != 0x0000ff))
2172 return;
2173 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2174 lookup_r = lookup;
2175 lookup_g = lookup+256;
2176 lookup_b = lookup+256+256;
2177 sh_r = 16;
2178 sh_g = 8;
2179 sh_b = 0;
2180 break;
2181 case 32:
2182 if ((mask_r != 0xff0000) ||
2183 (mask_g != 0x00ff00) ||
2184 (mask_b != 0x0000ff))
2185 return;
2186 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2187 lookup_r = lookup;
2188 lookup_g = lookup+256;
2189 lookup_b = lookup+256+256;
2190 sh_r = 16;
2191 sh_g = 8;
2192 sh_b = 0;
2193 break;
2194 default:
2195 return; /* we do not support this color depth */
2196 }
2197
2198 /* prepare limits for color transformation (each channel is handled separately) */
2199 if (shade < 0) {
2200 shade = -shade;
2201 if (shade < 0) shade = 0;
2202 if (shade > 100) shade = 100;
2203
2204 lower_lim_r = 65535-rm;
2205 lower_lim_g = 65535-gm;
2206 lower_lim_b = 65535-bm;
2207
2208 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2209 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2210 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2211
2212 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2213 } else {
2214 if (shade < 0) shade = 0;
2215 if (shade > 100) shade = 100;
2216
2217 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2218
2219 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2220 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2221 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2222 }
2223
2224 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2225 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2226 {
2227 unsigned int tmp;
2228
2229 tmp = lower_lim_r;
2230 lower_lim_r = lower_lim_b;
2231 lower_lim_b = tmp;
2232
2233 tmp = upper_lim_r;
2234 upper_lim_r = upper_lim_b;
2235 upper_lim_b = tmp;
2236 }
2237
2238 /* fill our lookup tables */
2239 for (i = 0; i <= mask_r>>sh_r; i++)
2240 {
2241 RUINT32T tmp;
2242 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2243 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2244 lookup_r[i] = (tmp/65535)<<sh_r;
2245 }
2246 for (i = 0; i <= mask_g>>sh_g; i++)
2247 {
2248 RUINT32T tmp;
2249 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2250 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2251 lookup_g[i] = (tmp/65535)<<sh_g;
2252 }
2253 for (i = 0; i <= mask_b>>sh_b; i++)
2254 {
2255 RUINT32T tmp;
2256 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2257 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2258 lookup_b[i] = (tmp/65535)<<sh_b;
2259 }
2260
2261 /* apply table to input image (replacing colors by newly calculated ones) */
2262 switch (srcImage->bits_per_pixel)
2263 {
2264 case 15:
2265 {
2266 unsigned short *p1, *pf, *p, *pl;
2267 p1 = (unsigned short *) srcImage->data;
2268 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2269 while (p1 < pf)
2270 {
2271 p = p1;
2272 pl = p1 + srcImage->width;
2273 for (; p < pl; p++)
2274 {
2275 *p = lookup_r[(*p & 0x7c00)>>10] |
2276 lookup_g[(*p & 0x03e0)>> 5] |
2277 lookup_b[(*p & 0x001f)];
2278 }
2279 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2280 }
2281 break;
2282 }
2283 case 16:
2284 {
2285 unsigned short *p1, *pf, *p, *pl;
2286 p1 = (unsigned short *) srcImage->data;
2287 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2288 while (p1 < pf)
2289 {
2290 p = p1;
2291 pl = p1 + srcImage->width;
2292 for (; p < pl; p++)
2293 {
2294 *p = lookup_r[(*p & 0xf800)>>11] |
2295 lookup_g[(*p & 0x07e0)>> 5] |
2296 lookup_b[(*p & 0x001f)];
2297 }
2298 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2299 }
2300 break;
2301 }
2302 case 24:
2303 {
2304 unsigned char *p1, *pf, *p, *pl;
2305 p1 = (unsigned char *) srcImage->data;
2306 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width * 3;
2311 for (; p < pl; p += 3)
2312 {
2313 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2314 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2315 p[2] = lookup_r[(p[2] & 0x0000ff)];
2316 }
2317 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2318 }
2319 break;
2320 }
2321 case 32:
2322 {
2323 RUINT32T *p1, *pf, *p, *pl;
2324 p1 = (RUINT32T *) srcImage->data;
2325 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2326
2327 while (p1 < pf)
2328 {
2329 p = p1;
2330 pl = p1 + srcImage->width;
2331 for (; p < pl; p++)
2332 {
2333 *p = lookup_r[(*p & 0xff0000)>>16] |
2334 lookup_g[(*p & 0x00ff00)>> 8] |
2335 lookup_b[(*p & 0x0000ff)] |
2336 (*p & ~0xffffff);
2337 }
2338 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2339 }
2340 break;
2341 }
2342 }
2343
2344 free (lookup);
2345}
2346#endif
2347
1708/* 2348/*
1709 * Check our parents are still who we think they are. 2349 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2350 * Do transparency updates if required
1711 */ 2351 */
1712int 2352int
1713rxvt_term::check_our_parents () 2353rxvt_term::check_our_parents ()
1714{ 2354{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2355 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2356 unsigned long nitems, bytes_after;
1717 Atom atype; 2357 Atom atype;
1718 unsigned char *prop = NULL; 2358 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2359 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2360 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2361 XWindowAttributes wattr, wrootattr;
2362 dDisp;
1722 2363
1723 pchanged = 0; 2364 pchanged = 0;
1724 2365
1725 if (! (Options & Opt_transparent)) 2366 if (!(options & Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2367 return pchanged; /* Don't try any more */
1727 2368
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2369 XGetWindowAttributes (disp, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2370 rootdepth = wrootattr.depth;
1730 2371
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2373
1732 if (rootdepth != wattr.depth) 2374 if (rootdepth != wattr.depth)
1733 { 2375 {
1734 if (am_transparent) 2376 if (am_transparent)
1735 { 2377 {
1736 pchanged = 1; 2378 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2380 am_transparent = am_pixmap_trans = 0;
1740 } 2381 }
2382
1741 return pchanged; /* Don't try any more */ 2383 return pchanged; /* Don't try any more */
1742 } 2384 }
1743 2385
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2386 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2387 XSync (disp, False);
1746 2388
1747 /* 2389 /*
1748 * Make the frame window set by the window manager have 2390 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2391 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2392 * windows for each client, so we have to take care about that.
1751 */ 2393 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2394 i = (xa[XA_XROOTPMAP_ID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2395 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2396 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2397 &nitems, &bytes_after, &prop) == Success);
2398
1756 if (!i || prop == NULL) 2399 if (!i || prop == NULL)
2400 i = (xa[XA_ESETROOT_PMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success);
2404
2405 if (!i || prop == NULL
2406#if TINTING
2407 || !rs[Rs_color + Color_tint]
2408#endif
2409 )
1757 have_pixmap = 0; 2410 have_pixmap = 0;
1758 else 2411 else
1759 { 2412 {
1760 have_pixmap = 1; 2413 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2414 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2415 XFree (prop);
1763 } 2416 }
2417
1764 if (have_pixmap) 2418 if (have_pixmap)
1765 { 2419 {
1766 /* 2420 /*
1767 * Copy display->root pixmap transparency 2421 * Copy display->root pixmap transparency
1768 */ 2422 */
… …
1771 Window cr; 2425 Window cr;
1772 XImage *image; 2426 XImage *image;
1773 GC gc; 2427 GC gc;
1774 XGCValues gcvalue; 2428 XGCValues gcvalue;
1775 2429
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2431 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2432 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2433 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2434 nx = ny = 0;
1781 2435
1782 if (sx < 0) 2436 if (sx < 0)
… …
1793 sy = 0; 2447 sy = 0;
1794 } 2448 }
1795 2449
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2452
2453 XSync (disp, False);
1798 allowedxerror = -1; 2454 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2456
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2457 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2458 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2459 allowedxerror = 0;
2460
1804 if (image == NULL) 2461 if (image == NULL)
1805 { 2462 {
1806 if (am_transparent && am_pixmap_trans) 2463 if (am_transparent && am_pixmap_trans)
1807 { 2464 {
1808 pchanged = 1; 2465 pchanged = 1;
1809 if (TermWin.pixmap != None) 2466 if (TermWin.pixmap != None)
1810 { 2467 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2468 XFreePixmap (disp, TermWin.pixmap);
1812 TermWin.pixmap = None; 2469 TermWin.pixmap = None;
1813 } 2470 }
1814 } 2471 }
2472
1815 am_pixmap_trans = 0; 2473 am_pixmap_trans = 0;
1816 } 2474 }
1817 else 2475 else
1818 { 2476 {
1819 if (TermWin.pixmap != None) 2477 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2478 XFreePixmap (disp, TermWin.pixmap);
2479
2480#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint))
2482 {
2483 unsigned short rm, gm, bm;
2484 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2485
2486 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2487
2488 ShadeXImage (display, image, shade, rm, gm, bm);
2489 }
2490#endif
2491
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2493 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2496 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2497 XFreeGC (disp, gc);
1830 XDestroyImage (image); 2498 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
1832 TermWin.pixmap); 2500 XClearWindow (disp, TermWin.parent[0]);
2501
1833 if (!am_transparent || !am_pixmap_trans) 2502 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2503 pchanged = 1;
2504
1835 am_transparent = am_pixmap_trans = 1; 2505 am_transparent = am_pixmap_trans = 1;
1836 } 2506 }
1837 } 2507 }
1838 2508
1839 if (!am_pixmap_trans) 2509 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2511 else
1840 { 2512 {
1841 unsigned int n; 2513 unsigned int n;
1842 /* 2514 /*
1843 * InheritPixmap transparency 2515 * InheritPixmap transparency
1844 */ 2516 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2518 {
1849 oldp = TermWin.parent[i]; 2519 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2520 XQueryTree (disp, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2521 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2522 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2523
1854 if (TermWin.parent[i] == display->root) 2524 if (TermWin.parent[i] == display->root)
1855 { 2525 {
1856 if (oldp != None) 2526 if (oldp != None)
1857 pchanged = 1; 2527 pchanged = 1;
2528
1858 break; 2529 break;
1859 } 2530 }
2531
1860 if (oldp != TermWin.parent[i]) 2532 if (oldp != TermWin.parent[i])
1861 pchanged = 1; 2533 pchanged = 1;
1862 } 2534 }
1863 2535
1864 n = 0; 2536 n = 0;
1865 2537
1866 if (pchanged) 2538 if (pchanged)
1867 { 2539 {
1868 for (; n < (unsigned int)i; n++) 2540 for (; n < (unsigned int)i; n++)
1869 { 2541 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2542 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) 2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2544 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
1875 break; 2546 break;
1876 } 2547 }
1877 } 2548 }
1878 } 2549 }
1879 2550
1880 if (n > (int) (sizeof (TermWin.parent) 2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2552 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2554 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; 2555 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2556 /* XXX: also turn off Opt_transparent? */
1890 } 2557 }
1891 else 2558 else
1892 { 2559 {
2560#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2561 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2562 * 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); 2563 sleep (1);
1903# endif 2564#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2565 for (n = 0; n < (unsigned int)i; n++)
2566 {
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
1907 ParentRelative); 2568 XClearWindow (disp, TermWin.parent[n]);
2569 }
2570
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
1909 ParentRelative);
1910 am_transparent = 1; 2572 am_transparent = 1;
1911 } 2573 }
1912 2574
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2576 TermWin.parent[i] = None;
1915 } 2577 }
2578
2579 if (scrollBar.win)
2580 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2582 scrollBar.setIdle ();
2583 scrollbar_show (0);
2584 }
2585
2586 if (am_transparent)
2587 {
2588 want_refresh = want_full_refresh = 1;
2589 if (am_pixmap_trans)
2590 flush ();
2591 }
2592
1916 return pchanged; 2593 return pchanged;
1917} 2594}
1918#endif 2595#endif
1919 2596
1920/*}}} */ 2597/*}}} */
… …
1935 } 2612 }
1936 2613
1937 if (ch == NOCHAR) // TODO: improve 2614 if (ch == NOCHAR) // TODO: improve
1938 break; 2615 break;
1939 2616
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2617 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2618 {
2619 if (!seen_input)
1941 { 2620 {
2621 seen_input = 1;
2622 // many badly-written programs (e.g. jed) contain a race condition:
2623 // they first read the screensize and then install a SIGWINCH handler.
2624 // some window managers resize the window early, and these programs
2625 // then sometimes get the size wrong.
2626 // unfortunately other programs are even more buggy and dislike
2627 // being sent SIGWINCH, so only do it when we were in fact being
2628 // resized.
2629 if (seen_resize && cmd_pid)
2630 kill (-cmd_pid, SIGWINCH);
2631 }
2632
1942 /* Read a text string from the input buffer */ 2633 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2634 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2635 bool refreshnow = false;
1945 int nlines = 0; 2636 int nlines = 0;
1946 unicode_t *str = buf; 2637 unicode_t *str = buf;
1947 2638
1948 *str++ = ch;
1949
1950 for (;;) 2639 for (;;)
1951 { 2640 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2642 break;
1957 2643
1958 *str++ = ch; 2644 *str++ = ch;
1959 2645
1960 if (ch == '\n') 2646 if (ch == C0_LF)
1961 { 2647 {
1962 nlines++; 2648 nlines++;
1963 refresh_count++; 2649 refresh_count++;
1964 2650
1965 if (! (Options & Opt_jumpScroll) 2651 if (!(options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
1967 { 2653 {
1968 refreshnow = true; 2654 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR; 2655 ch = NOCHAR;
1971 break; 2656 break;
1972 } 2657 }
1973 2658
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2660 if (nlines >= TermWin.nrow - 1)
1976 { 2661 {
1977 scr_add_lines (buf, nlines, str - buf); 2662 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0; 2663 nlines = 0;
1979 str = buf; 2664 str = buf;
… …
1983 if (str >= buf + UBUFSIZ) 2668 if (str >= buf + UBUFSIZ)
1984 { 2669 {
1985 ch = NOCHAR; 2670 ch = NOCHAR;
1986 break; 2671 break;
1987 } 2672 }
2673
2674 seq_begin = cmdbuf_ptr;
2675 ch = next_char ();
1988 } 2676 }
1989 2677
1990 scr_add_lines (buf, nlines, str - buf); 2678 scr_add_lines (buf, nlines, str - buf);
1991 2679
1992 /* 2680 /*
1993 * If there have been a lot of new lines, then update the screen 2681 * 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. 2682 * 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 2683 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2684 * 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 */ 2685 */
2001 if (refreshnow) 2686 if (refreshnow)
2002 { 2687 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2689 refresh_limit++;
2005 2690 else
2691 {
2692 flag = true;
2006 scr_refresh (refresh_type); 2693 scr_refresh (refresh_type);
2694 }
2007 } 2695 }
2008 2696
2009 } 2697 }
2010 else 2698 else
2011 { 2699 {
… …
2025 } 2713 }
2026 2714
2027 return flag; 2715 return flag;
2028} 2716}
2029 2717
2718// read the next octet
2719unicode_t
2720rxvt_term::next_octet ()
2721{
2722 return cmdbuf_ptr < cmdbuf_endp
2723 ? *cmdbuf_ptr++
2724 : NOCHAR;
2725}
2726
2030// read the next character 2727// read the next character
2031unicode_t 2728unicode_t
2032rxvt_term::next_char () 2729rxvt_term::next_char ()
2033{ 2730{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2731 while (cmdbuf_ptr < cmdbuf_endp)
… …
2050 if (len == (size_t)-1) 2747 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2748 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2749
2053 // assume wchar == unicode 2750 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2751 cmdbuf_ptr += len;
2055 return wc; 2752 return wc & UNICODE_MASK;
2056 } 2753 }
2057 2754
2058 return NOCHAR; 2755 return NOCHAR;
2059} 2756}
2060 2757
… …
2065 */ 2762 */
2066unicode_t 2763unicode_t
2067rxvt_term::cmd_getc () 2764rxvt_term::cmd_getc ()
2068{ 2765{
2069 unicode_t c = next_char (); 2766 unicode_t c = next_char ();
2767
2768 if (c == NOCHAR)
2769 throw out_of_input;
2770
2771 return c;
2772}
2773
2774unicode_t
2775rxvt_term::cmd_get8 ()
2776{
2777 unicode_t c = next_octet ();
2070 2778
2071 if (c == NOCHAR) 2779 if (c == NOCHAR)
2072 throw out_of_input; 2780 throw out_of_input;
2073 2781
2074 return c; 2782 return c;
… …
2156/*}}} */ 2864/*}}} */
2157 2865
2158/* *INDENT-OFF* */ 2866/* *INDENT-OFF* */
2159enum { 2867enum {
2160 C1_40 = 0x40, 2868 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2869 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, 2870 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, 2871 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 2872 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2873};
2166/* *INDENT-ON* */ 2874/* *INDENT-ON* */
2167 2875
2168/*{{{ process non-printing single characters */ 2876/*{{{ process non-printing single characters */
2169void 2877void
… …
2174 case C0_ESC: 2882 case C0_ESC:
2175 process_escape_seq (); 2883 process_escape_seq ();
2176 break; 2884 break;
2177 case C0_ENQ: /* terminal Status */ 2885 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2886 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2889 else
2183 tt_write ((unsigned char *)VT100_ANS, 2890 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2891 (unsigned int)strlen (VT100_ANS));
2185 break; 2892 break;
2186 case C0_BEL: /* bell */ 2893 case C0_BEL: /* bell */
2187 scr_bell (); 2894 scr_bell ();
2188 break; 2895 break;
2189 case C0_BS: /* backspace */ 2896 case C0_BS: /* backspace */
… …
2205 break; 2912 break;
2206 case C0_SI: /* shift in - acs */ 2913 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2914 scr_charset_choose (0);
2208 break; 2915 break;
2209 2916
2917#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2918 // 8-bit controls
2211 case 0x90: /* DCS */ 2919 case 0x90: /* DCS */
2212 process_dcs_seq (); 2920 process_dcs_seq ();
2213 break; 2921 break;
2214 case 0x9b: /* CSI */ 2922 case 0x9b: /* CSI */
2215 process_csi_seq (); 2923 process_csi_seq ();
2216 break; 2924 break;
2217 case 0x9d: /* CSI */ 2925 case 0x9d: /* CSI */
2218 process_osc_seq (); 2926 process_osc_seq ();
2219 break; 2927 break;
2928#endif
2220 } 2929 }
2221} 2930}
2222/*}}} */ 2931/*}}} */
2223 2932
2224 2933
… …
2286void 2995void
2287rxvt_term::process_escape_seq () 2996rxvt_term::process_escape_seq ()
2288{ 2997{
2289 unicode_t ch = cmd_getc (); 2998 unicode_t ch = cmd_getc ();
2290 2999
2291 if (PrivateModes & PrivMode_vt52) 3000 if (priv_modes & PrivMode_vt52)
2292 { 3001 {
2293 process_escape_vt52 (ch); 3002 process_escape_vt52 (ch);
2294 return; 3003 return;
2295 } 3004 }
2296 3005
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 3020 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 3021 break;
2313 case '+': 3022 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 3023 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 3024 break;
2316#ifndef NO_FRILLS 3025#if ENABLE_FRILLS
2317 case '6': 3026 case '6':
2318 scr_backindex (); 3027 scr_backindex ();
2319 break; 3028 break;
2320#endif 3029#endif
2321 case '7': 3030 case '7':
2322 scr_cursor (SAVE); 3031 scr_cursor (SAVE);
2323 break; 3032 break;
2324 case '8': 3033 case '8':
2325 scr_cursor (RESTORE); 3034 scr_cursor (RESTORE);
2326 break; 3035 break;
2327#ifndef NO_FRILLS 3036#if ENABLE_FRILLS
2328 case '9': 3037 case '9':
2329 scr_forwardindex (); 3038 scr_forwardindex ();
2330 break; 3039 break;
2331#endif 3040#endif
2332 case '=': 3041 case '=':
… …
2342 break; 3051 break;
2343 3052
2344 /* 8.3.87: NEXT LINE */ 3053 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3054 case C1_NEL: /* ESC E */
2346 { 3055 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3056 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3057 scr_add_lines (nlcr, 1, 2);
2349 } 3058 }
2350 break; 3059 break;
2351 3060
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3061 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2363 case C1_RI: /* ESC M */ 3072 case C1_RI: /* ESC M */
2364 scr_index (DN); 3073 scr_index (DN);
2365 break; 3074 break;
2366 3075
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3076 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3077 /*case C1_SS2: scr_single_shift (2); break; */
2369 3078
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3079 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3080 /*case C1_SS3: scr_single_shift (3); break; */
2372 3081
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3082 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3083 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3084 process_dcs_seq ();
2376 break; 3085 break;
… …
2391 process_osc_seq (); 3100 process_osc_seq ();
2392 break; 3101 break;
2393 3102
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3103 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3104 case 'c':
3105 mbstate.reset ();
2396 scr_poweron (); 3106 scr_poweron ();
2397 scrollbar_show (1); 3107 scrollbar_show (1);
2398 break; 3108 break;
2399 3109
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3110 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3122
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3123/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3124/* *INDENT-OFF* */
2415enum { 3125enum {
2416 CSI_ICH = 0x40, 3126 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3127 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 , 3128 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, 3129 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, 3130 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, 3131 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, 3132 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, */ 3147 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, [, \, ], ^, _, */ 3148 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, */ 3149 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, */ 3150 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, */ 3151 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, {, |, }, ~, */ 3152 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3153 };
2444/* *INDENT-ON* */ 3154/* *INDENT-ON* */
2445 3155
2446void 3156void
2447rxvt_term::process_csi_seq () 3157rxvt_term::process_csi_seq ()
… …
2510 { 3220 {
2511 switch (priv) 3221 switch (priv)
2512 { 3222 {
2513 case '>': 3223 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 3224 if (ch == CSI_DA) /* secondary device attributes */
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3225 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2516 break; 3226 break;
2517 case '?': 3227 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3228 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 3229 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 3230 break;
… …
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2631 break; 3341 break;
2632 3342
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3344 tt_write ((const unsigned char *)VT100_ANS,
2635 (unsigned int) (sizeof (VT100_ANS) - 1)); 3345 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3346 break;
2637 3347
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3349 process_sgr_mode (nargs, arg);
2640 break; 3350 break;
… …
2646 tt_printf ("\033[0n"); 3356 tt_printf ("\033[0n");
2647 break; 3357 break;
2648 case 6: /* CPR requested */ 3358 case 6: /* CPR requested */
2649 scr_report_position (); 3359 scr_report_position ();
2650 break; 3360 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3361 case 7: /* unofficial extension */
3362 if (options & Opt_insecure)
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3363 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3364 break;
2655#endif
2656 case 8: /* unofficial extension */ 3365 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3367 break;
2659 } 3368 }
2660 break; 3369 break;
2661 3370
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3371 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3404 break;
2696 3405
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3406 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3407 if (arg[0] == 4)
2699 scr_insert_mode (0); 3408 scr_insert_mode (0);
3409 else if (arg[0] == 20)
3410 priv_modes &= ~PrivMode_LFNL;
2700 break; 3411 break;
2701 3412
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3413 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3414 if (arg[0] == 4)
2704 scr_insert_mode (1); 3415 scr_insert_mode (1);
3416 else if (arg[0] == 20)
3417 priv_modes |= PrivMode_LFNL;
2705 break; 3418 break;
2706 3419
2707 /* 3420 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3421 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3422 */
… …
2721 break; 3434 break;
2722 case CSI_75: 3435 case CSI_75:
2723 scr_cursor (RESTORE); 3436 scr_cursor (RESTORE);
2724 break; 3437 break;
2725 3438
2726#ifndef NO_FRILLS 3439#if ENABLE_FRILLS
2727 case CSI_74: 3440 case CSI_74:
2728 process_window_ops (arg, nargs); 3441 process_window_ops (arg, nargs);
2729 break; 3442 break;
2730#endif 3443#endif
2731 3444
… …
2738 break; 3451 break;
2739 } 3452 }
2740} 3453}
2741/*}}} */ 3454/*}}} */
2742 3455
2743#ifndef NO_FRILLS 3456#if ENABLE_FRILLS
2744/* ARGSUSED */ 3457/* ARGSUSED */
2745void 3458void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3459rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3460{
2748 int x, y; 3461 int x, y;
2749 XWindowAttributes wattr; 3462 XWindowAttributes wattr;
2750 Window wdummy; 3463 Window wdummy;
3464 dDisp;
2751 3465
2752 if (nargs == 0) 3466 if (nargs == 0)
2753 return; 3467 return;
2754 3468
2755 switch (args[0]) 3469 switch (args[0])
2756 { 3470 {
2757 /* 3471 /*
2758 * commands 3472 * commands
2759 */ 3473 */
2760 case 1: /* deiconify window */ 3474 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3475 XMapWindow (disp, TermWin.parent[0]);
2762 break; 3476 break;
2763 case 2: /* iconify window */ 3477 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3478 XIconifyWindow (disp, TermWin.parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3479 break;
2767 case 3: /* set position (pixels) */ 3480 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
2769 break; 3482 break;
2770 case 4: /* set size (pixels) */ 3483 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3485 break;
2773 case 5: /* raise window */ 3486 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3487 XRaiseWindow (disp, TermWin.parent[0]);
2775 break; 3488 break;
2776 case 6: /* lower window */ 3489 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3490 XLowerWindow (disp, TermWin.parent[0]);
2778 break; 3491 break;
2779 case 7: /* refresh window */ 3492 case 7: /* refresh window */
2780 scr_touch (true); 3493 scr_touch (true);
2781 break; 3494 break;
2782 case 8: /* set size (chars) */ 3495 case 8: /* set size (chars) */
… …
2794 3507
2795 /* 3508 /*
2796 * reports - some output format copied from XTerm 3509 * reports - some output format copied from XTerm
2797 */ 3510 */
2798 case 11: /* report window state */ 3511 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3514 break;
2802 case 13: /* report window position */ 3515 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3518 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3519 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3520 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3521 break;
2809 case 14: /* report window size (pixels) */ 3522 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3525 break;
2813 case 18: /* report text area size (chars) */ 3526 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break; 3528 break;
2816 case 19: /* report window size (chars) */ 3529 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3531 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3532 case 20: /* report icon label */
3533 {
3534 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3535 XGetIconName (disp, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s);
3538 }
2823 break; 3539 break;
2824 case 21: /* report window title */ 3540 case 21: /* report window title */
3541 {
3542 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3543 XFetchName (disp, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s);
3546 }
2827 break; 3547 break;
2828#endif
2829 } 3548 }
2830} 3549}
2831#endif 3550#endif
2832 3551
2833/*----------------------------------------------------------------------*/ 3552/*----------------------------------------------------------------------*/
2834/* 3553/*
2835 * get input up until STRING TERMINATOR (or BEL) 3554 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3555 * ends_how is terminator used. returned input must be free()'d
2837 */ 3556 */
2838unsigned char * 3557unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3558rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3559{
2841 int seen_esc = 0; /* seen escape? */ 3560 unicode_t ch;
3561 bool seen_esc = false;
2842 unsigned int n = 0; 3562 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3563 wchar_t string[STRING_MAX];
2846 3564
2847 while ((ch = cmd_getc ())) 3565 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3566 {
2849 if (ch == C0_BEL 3567 if (seen_esc)
2850 || ch == CHAR_ST 3568 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3569 if (ch == 0x5c) /* 7bit ST */
2852 break; 3570 break;
2853 3571 else
3572 return NULL;
3573 }
2854 if (ch == C0_ESC) 3574 else if (ch == C0_ESC)
2855 { 3575 {
2856 seen_esc = 1; 3576 seen_esc = true;
2857 continue; 3577 continue;
2858 } 3578 }
2859 else if (ch == '\t') 3579 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3580 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3581 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3582 return NULL; /* other control character - exit */
2863 3583
3584 seen_esc = false;
3585
2864 if (n < sizeof (string) - 1) 3586 if (n >= sizeof (string) - 1)
3587 // stop at some sane length
3588 return NULL;
3589
3590 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 ();
3592 else
2865 string[n++] = ch; 3593 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3594 }
2869 3595
2870 string[n++] = '\0'; 3596 string[n++] = '\0';
2871 3597
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3598 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3599
2877 return s; 3600 return (unsigned char *)rxvt_wcstombs (string);
2878} 3601}
2879 3602
2880/*----------------------------------------------------------------------*/ 3603/*----------------------------------------------------------------------*/
2881/* 3604/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3605 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
2915 { 3638 {
2916 unsigned char *s = get_to_st (eh); 3639 unsigned char *s = get_to_st (eh);
2917 3640
2918 if (s) 3641 if (s)
2919 { 3642 {
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); 3643 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3644 free (s);
2934 } 3645 }
2935 } 3646 }
2936} 3647}
3648
3649void
3650rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3651{
3652 if (str[0] == '?' && !str[1])
3653 {
3654 unsigned short r, g, b;
3655 pix_colors_focused[color].get (display, r, g, b);
3656 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3657 }
3658 else
3659 set_window_color (color, str);
3660}
3661
2937/* 3662/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title 3664 * 0 = change iconName/title
2940 * 1 = change iconName 3665 * 1 = change iconName
2941 * 2 = change title 3666 * 2 = change title
2942 * 4 = change color 3667 * 4 = change color
3668 * 10 = change fg color
3669 * 11 = change bg color
2943 * 12 = change text color 3670 * 12 = change text color
2944 * 13 = change mouse foreground color 3671 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour 3672 * 17 = change highlight character colour
2946 * 18 = change bold character color 3673 * 18 = change bold character color
2947 * 19 = change underlined character color 3674 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented) 3675 * 46 = change logfile (not implemented)
2949 * 50 = change font 3676 * 50 = change font
2950 * 3677 *
2951 * rxvt extensions: 3678 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap 3679 * 20 = bg pixmap
2954 * 39 = change default fg color 3680 * 39 = change default fg color
2955 * 49 = change default bg color 3681 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen 3682 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale 3683 * 701 = change locale
2958 * 702 = find font 3684 * 702 = find font
3685 * 703 = menu
2959 */ 3686 */
2960void 3687void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3689{
2963 int changed = 0; 3690 int changed = 0;
2964 int color; 3691 int color;
2965 char *buf, *name; 3692 char *buf, *name;
3693 bool query = str[0] == '?' && !str[1];
3694 int saveop = op;
3695 dDisp;
2966 3696
2967 assert (str != NULL); 3697 assert (str != NULL);
2968 switch (op) 3698 switch (op)
2969 { 3699 {
2970 case XTerm_name: 3700 case XTerm_name:
… …
2974 set_icon_name (str); 3704 set_icon_name (str);
2975 break; 3705 break;
2976 case XTerm_title: 3706 case XTerm_title:
2977 set_title (str); 3707 set_title (str);
2978 break; 3708 break;
3709 case XTerm_property:
3710 if (str[0] == '?')
3711 {
3712 Atom prop = display->atom (str + 1);
3713 Atom actual_type;
3714 int actual_format;
3715 unsigned long nitems;
3716 unsigned long bytes_after;
3717 unsigned char *value = 0;
3718 const char *str = "";
3719
3720 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0],
3722 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None
3726 && actual_format == 8)
3727 str = (const char *)(value);
3728
3729 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3730
3731 XFree (value);
3732 }
3733 else
3734 {
3735 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3736
3737 if (eq)
3738 {
3739 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1);
3741 }
3742 else
3743 XDeleteProperty (disp, TermWin.parent[0],
3744 display->atom (str));
3745 }
3746 break;
3747
2979 case XTerm_Color: 3748 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3749 for (buf = (char *)str; buf && *buf;)
2981 { 3750 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3751 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3752 break;
2984 3753
2985 *name++ = '\0'; 3754 *name++ = '\0';
2986 color = atoi (buf); 3755 color = atoi (buf);
2987 3756
2988 if (color < 0 || color >= TOTAL_COLORS) 3757 if (color < 0 || color >= TOTAL_COLORS)
2989 break; 3758 break;
2990 3759
2991 if ((buf = STRCHR (name, ';')) != NULL) 3760 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3761 *buf++ = '\0';
2993 3762
3763 if (name[0] == '?' && !name[1])
3764 {
3765 unsigned short r, g, b;
3766 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3767 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3768 }
3769 else
2994 set_window_color (color + minCOLOR, name); 3770 set_window_color (color + minCOLOR, name);
2995 } 3771 }
3772 break;
3773 case XTerm_Color00:
3774 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3775 break;
3776 case XTerm_Color01:
3777 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3778 break;
2997#ifndef NO_CURSORCOLOR 3779#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3780 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3781 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3782 break;
3001#endif 3783#endif
3002 case XTerm_Color_pointer: 3784 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3785 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3786 break;
3787 case XTerm_Color_pointer_bg:
3788 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3789 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3790#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3791 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3008 break; 3796 break;
3009 case XTerm_Color_UL: 3797 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3799 break;
3012 case XTerm_Color_RV: 3800 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3802 break;
3015#endif 3803#endif
3016 3804#if TRANSPARENT && TINTING
3017 case XTerm_Menu: 3805 case XTerm_Color_tint:
3018 /* 3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3019 * rxvt_menubar_dispatch () violates the constness of the string, 3807 check_our_parents ();
3020 * so DON'T do it here 3808 if (am_transparent)
3021 */ 3809 want_full_refresh = want_refresh = 1;
3022 break; 3810 break;
3811#endif
3812
3023 case XTerm_Pixmap: 3813 case XTerm_Pixmap:
3024 if (*str != ';') 3814 if (*str != ';')
3025 { 3815 {
3026#if XPM_BACKGROUND 3816#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3817 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3818 set_bgPixmap (str); /* change pixmap */
3029#endif 3819#endif
3030 scr_touch (true); 3820 scr_touch (true);
3031 } 3821 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3822 while ((str = strchr (str, ';')) != NULL)
3033 { 3823 {
3034 str++; 3824 str++;
3035#if XPM_BACKGROUND 3825#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3826 changed += scale_pixmap (str);
3037#endif 3827#endif
3038
3039 } 3828 }
3829
3040 if (changed) 3830 if (changed)
3041 { 3831 {
3042#ifdef XPM_BACKGROUND 3832#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3833 resize_pixmap ();
3044#endif 3834#endif
… …
3050 set_window_color (Color_fg, str); 3840 set_window_color (Color_fg, str);
3051 break; 3841 break;
3052 case XTerm_restoreBG: 3842 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3843 set_window_color (Color_bg, str);
3054 break; 3844 break;
3845
3055 case XTerm_logfile: 3846 case XTerm_logfile:
3056 // TODO, when secure mode? 3847 // TODO, when secure mode?
3057 break; 3848 break;
3849
3058 case XTerm_font: 3850 case XTerm_font:
3059 change_font (str); 3851 op = URxvt_font;
3852 case URxvt_font:
3853#if ENABLE_STYLES
3854 case URxvt_boldFont:
3855 case URxvt_italicFont:
3856 case URxvt_boldItalicFont:
3857#endif
3858 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3862 resp);
3863 else
3864 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866
3867 res = strdup (str);
3868 allocated.push_back ((void *)res);
3869 set_fonts ();
3870 }
3060 break; 3871 break;
3061#ifndef NO_FRILLS 3872
3873#if ENABLE_FRILLS
3062 case XTerm_locale: 3874 case XTerm_locale:
3063 if (str[0] == '?' && !str[1]) 3875 if (query)
3064 tt_printf ("%-.250s\n", locale); 3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3065 else 3877 else
3066 { 3878 {
3067 set_locale (str); 3879 set_locale (str);
3068# ifdef USE_XIM 3880 pty.set_utf8_mode (enc_utf8);
3069 im_cb (); 3881 init_xlocale ();
3070# endif
3071 } 3882 }
3072 break; 3883 break;
3884#endif
3885
3886#ifdef MENUBAR
3073 case XTerm_findfont: 3887 case XTerm_Menu:
3074 { 3888 if (options & Opt_insecure)
3075 int fid = TermWin.fontset->find_font (atoi (str)); 3889 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3077 }
3078 break; 3890 break;
3079#endif 3891#endif
3080#if 0 3892#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3893 case XTerm_dumpscreen: /* no error notices */
3082 { 3894 {
3083 int fd; 3895 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3896 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3897 {
3086 scr_dump (fd); 3898 scr_dump (fd);
3087 close (fd); 3899 close (fd);
3088 } 3900 }
… …
3108{ 3920{
3109 int state; 3921 int state;
3110 3922
3111 if (mode == 's') 3923 if (mode == 's')
3112 { 3924 {
3113 SavedModes |= (PrivateModes & bit); 3925 SavedModes |= (priv_modes & bit);
3114 return -1; 3926 return -1;
3115 } 3927 }
3116 else 3928 else
3117 { 3929 {
3118 if (mode == 'r') 3930 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3931 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3932 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3933 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3934 PrivMode (state, bit);
3123 } 3935 }
3124 3936
3125 return state; 3937 return state;
3126} 3938}
… …
3144 { 3, PrivMode_132 }, 3956 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3957 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3958 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3959 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3960 { 7, PrivMode_Autowrap },
3961 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3962 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3963#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 3964 { menuBar_esc, PrivMode_menuBar },
3152#endif 3965#endif
3966 // 18, 19 printing-related
3967 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 3968#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3969 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3970#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3971 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 3972 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3973 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3974 // 45 margin bell NYI
3163 // 46 start logging 3975 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 3987 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3988 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3989 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3990 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3991 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3992 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3993 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3994 };
3183 3995
3184 if (nargs == 0) 3996 if (nargs == 0)
3185 return; 3997 return;
… …
3205 /* extra handling for values with state unkept */ 4017 /* extra handling for values with state unkept */
3206 switch (arg[i]) 4018 switch (arg[i])
3207 { 4019 {
3208 case 1048: /* alternative cursor save */ 4020 case 1048: /* alternative cursor save */
3209 case 1049: 4021 case 1049:
4022 if (options & Opt_secondaryScreen)
3210 if (mode == 0) 4023 if (mode == 0)
3211 scr_cursor (RESTORE); 4024 scr_cursor (RESTORE);
3212 else if (mode == 1) 4025 else if (mode == 1)
3213 scr_cursor (SAVE); 4026 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 4027 break;
3215 } 4028 }
3216 4029
3217 if (state >= 0) 4030 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 4031 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 4032 switch (arg[i])
… …
3225 * within VT52 mode 4038 * within VT52 mode
3226 */ 4039 */
3227 PrivMode (1, PrivMode_vt52); 4040 PrivMode (1, PrivMode_vt52);
3228 break; 4041 break;
3229 case 3: /* 80/132 */ 4042 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4043 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4044 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3232 break; 4045 break;
3233 case 4: /* smooth scrolling */ 4046 case 4: /* smooth scrolling */
3234 if (state) 4047 if (state)
3235 Options &= ~Opt_jumpScroll; 4048 options &= ~Opt_jumpScroll;
3236 else 4049 else
3237 Options |= Opt_jumpScroll; 4050 options |= Opt_jumpScroll;
3238 break; 4051 break;
3239 case 5: /* reverse video */ 4052 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4053 scr_rvideo_mode (state);
3241 break; 4054 break;
3242 case 6: /* relative/absolute origins */ 4055 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4056 scr_relative_origin (state);
3244 break; 4057 break;
3245 case 7: /* autowrap */ 4058 case 7: /* autowrap */
3246 scr_autowrap (state); 4059 scr_autowrap (state);
3247 break; 4060 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4061 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4062 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4063 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4064 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4065 break;
3253#ifdef menuBar_esc 4066#ifdef menuBar_esc
3254 case menuBar_esc: 4067 case menuBar_esc:
3255#ifdef MENUBAR 4068#ifdef MENUBAR
3256 map_menuBar (state); 4069 map_menuBar (state);
… …
3267 break; 4080 break;
3268#endif 4081#endif
3269 case 25: /* visible/invisible cursor */ 4082 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4083 scr_cursor_visible (state);
3271 break; 4084 break;
3272 /* case 35: - shift keys */ 4085 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4086 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4087 case 47: /* secondary screen */
3275 scr_change_screen (state); 4088 scr_change_screen (state);
3276 break; 4089 break;
3277 /* case 66: - application key pad */ 4090 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4091 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4092 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4093 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4094 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4095 break;
3283#if 0 4096#if 0
3284 case 1001: 4097 case 1001:
3285 break; /* X11 mouse highlighting */ 4098 break; /* X11 mouse highlighting */
3286#endif 4099#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4100 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state) 4101 if (state)
3289 Options &= ~Opt_scrollTtyOutput; 4102 options &= ~Opt_scrollTtyOutput;
3290 else 4103 else
3291 Options |= Opt_scrollTtyOutput; 4104 options |= Opt_scrollTtyOutput;
3292 break; 4105 break;
3293 case 1011: /* scroll to bottom on key press */ 4106 case 1011: /* scroll to bottom on key press */
3294 if (state) 4107 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4108 options |= Opt_scrollTtyKeypress;
3296 else 4109 else
3297 Options &= ~Opt_scrollTtyKeypress; 4110 options &= ~Opt_scrollTtyKeypress;
3298 break; 4111 break;
3299 case 1047: /* secondary screen w/ clearing */ 4112 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4113 if (options & Opt_secondaryScreen)
3301 if (current_screen != PRIMARY) 4114 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4115 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4116 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4117 break;
4118 case 1049: /* secondary screen w/ clearing first */
4119 scr_change_screen (state);
4120 if (options & Opt_secondaryScreen)
4121 if (current_screen != PRIMARY)
4122 scr_erase_screen (2);
4123 break;
3306 default: 4124 default:
3307 break; 4125 break;
3308 } 4126 }
3309 } 4127 }
3310} 4128}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4151 rendset = 0, rendstyle = ~RS_None;
3334 break; 4152 break;
3335 case 1: 4153 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4154 rendset = 1, rendstyle = RS_Bold;
3337 break; 4155 break;
4156 //case 2: // low intensity
4157 case 3:
4158 rendset = 1, rendstyle = RS_Italic;
4159 break;
3338 case 4: 4160 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4161 rendset = 1, rendstyle = RS_Uline;
3340 break; 4162 break;
3341 case 5: 4163 case 5: // slowly blinking
4164 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4165 rendset = 1, rendstyle = RS_Blink;
3343 break; 4166 break;
4167 //case 6: // scoansi light background
3344 case 7: 4168 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4169 rendset = 1, rendstyle = RS_RVid;
3346 break; 4170 break;
3347 case 8: 4171 case 8:
3348 // invisible. NYI 4172 // invisible. NYI
3349 break; 4173 break;
3350 case 22: 4174 //case 9: // crossed out
4175 //case 10: // scoansi acs off, primary font
4176 //case 11: // scoansi acs on, first alt font
4177 //case 12: // scoansi acs on, |0x80, second alt font
4178 //...
4179 //case 19: // ninth alt font
4180 //case 20: // gothic
4181 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4182 rendset = 0, rendstyle = RS_Bold;
4183 break;
4184 case 22: // normal intensity
4185 rendset = 0, rendstyle = RS_Bold;
4186 break;
4187 case 23: // disable italic
4188 rendset = 0, rendstyle = RS_Italic;
3352 break; 4189 break;
3353 case 24: 4190 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4191 rendset = 0, rendstyle = RS_Uline;
3355 break; 4192 break;
3356 case 25: 4193 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4194 rendset = 0, rendstyle = RS_Blink;
3358 break; 4195 break;
4196 case 26: // variable spacing (iso 8613)
4197 rendset = 0, rendstyle = RS_Blink;
4198 break;
3359 case 27: 4199 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4200 rendset = 0, rendstyle = RS_RVid;
3361 break; 4201 break;
3362 case 28:
3363 // visible. NYI 4202 //case 28: // visible. NYI
3364 break; 4203 //case 29: // not crossed-out
3365 } 4204 }
3366 4205
3367 if (rendset != -1) 4206 if (rendset != -1)
3368 { 4207 {
3369 scr_rendition (rendset, rendstyle); 4208 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4219 case 35:
3381 case 36: 4220 case 36:
3382 case 37: 4221 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4222 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4223 break;
3385#ifdef TTY_256COLOR 4224 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4225 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4226 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4227 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4228 i += 2;
3391 } 4229 }
3392 break; 4230 break;
3393#endif
3394 case 39: /* default fg */ 4231 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4232 scr_color (Color_fg, Color_fg);
3396 break; 4233 break;
3397 4234
3398 case 40: 4235 case 40:
… …
3403 case 45: 4240 case 45:
3404 case 46: 4241 case 46:
3405 case 47: 4242 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4243 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4244 break;
3408#ifdef TTY_256COLOR 4245 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4246 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4247 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4248 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4249 i += 2;
3414 } 4250 }
3415 break; 4251 break;
3416#endif
3417 case 49: /* default bg */ 4252 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4253 scr_color (Color_bg, Color_bg);
3419 break; 4254 break;
4255
4256 //case 50: // not variable spacing
3420 4257
3421#ifndef NO_BRIGHTCOLOR 4258#ifndef NO_BRIGHTCOLOR
3422 case 90: 4259 case 90:
3423 case 91: /* set bright fg color */ 4260 case 91: /* set bright fg color */
3424 case 92: 4261 case 92:
3425 case 93: 4262 case 93:
3426 case 94: 4263 case 94:
3427 case 95: 4264 case 95:
3428 case 96: 4265 case 96:
3429 case 97: 4266 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4267 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4268 break;
3433 case 100: 4269 case 100:
3434 case 101: /* set bright bg color */ 4270 case 101: /* set bright bg color */
3435 case 102: 4271 case 102:
3436 case 103: 4272 case 103:
3437 case 104: 4273 case 104:
3438 case 105: 4274 case 105:
3439 case 106: 4275 case 106:
3440 case 107: 4276 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4277 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4278 break;
3444#endif 4279#endif
3445 4280
3446 } 4281 }
3447 } 4282 }
3448} 4283}
3449/*}}} */ 4284/*}}} */
3450 4285
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4286/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4287void
3453rxvt_term::process_graphics () 4288rxvt_term::process_graphics ()
3454{ 4289{
3455 unicode_t ch, cmd = cmd_getc (); 4290 unicode_t ch, cmd = cmd_getc ();
3456 4291
3457 if (cmd == 'Q') 4292 if (cmd == 'Q')
3458 { /* query graphics */ 4293 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4294 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4295 return;
3461 } 4296 }
3462 /* swallow other graphics sequences until terminating ':' */ 4297 /* swallow other graphics sequences until terminating ':' */
3463 do 4298 do
3464 ch = cmd_getc (); 4299 ch = cmd_getc ();
… …
3479 unsigned char buf[256]; 4314 unsigned char buf[256];
3480 4315
3481 va_start (arg_ptr, fmt); 4316 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4317 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4318 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4319 tt_write (buf, strlen (buf));
3485} 4320}
3486 4321
3487/* ---------------------------------------------------------------------- */ 4322/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4323/* 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. 4324 * or generated by us in response to a query ESC sequence.
3490 */ 4325 */
4326const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4327
3491void 4328void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4329rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3493{ 4330{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4331 if (v_buflen == 0)
4332 {
4333 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3495 4334
3496 if (len) 4335 if ((unsigned int)written == len)
4336 return;
4337
4338 data += written;
4339 len -= written;
3497 { 4340 }
4341
4342 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4343
4344 memcpy (v_buffer + v_buflen, data, len);
4345 v_buflen += len;
4346
4347 pty_ev.set (EVENT_READ | EVENT_WRITE);
4348}
4349
4350void rxvt_term::pty_write ()
4351{
4352 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4353
4354 if (written > 0)
4355 {
4356 v_buflen -= written;
4357
3498 if (v_buflen == 0) 4358 if (v_buflen == 0)
3499 { 4359 {
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); 4360 free (v_buffer);
3527 v_buffer = 0; 4361 v_buffer = 0;
3528 v_buflen = 0; 4362 v_buflen = 0;
3529 4363
3530 pty_ev.set (EVENT_READ); 4364 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; 4365 return;
3543 } 4366 }
4367
4368 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4369 }
4370 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4371 // original code just ignores this...
4372 destroy ();
3545} 4373}
3546 4374
3547/*----------------------- end-of-file (C source) -----------------------*/ 4375/*----------------------- end-of-file (C source) -----------------------*/
3548 4376

Diff Legend

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