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

Diff Legend

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