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

Diff Legend

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