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

Diff Legend

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