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

Diff Legend

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