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

Diff Legend

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