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.39 by pcg, Mon Feb 9 07:15:46 2004 UTC vs.
Revision 1.281 by root, Tue Jan 24 17:28:06 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 (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1330 { 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1331 int height, width; 1499 && ev.xproperty.state == PropertyNewValue)
1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 1501
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; 1502 break;
1363 1503
1364 case SelectionClear: 1504 case SelectionClear:
1365 selection_clear (); 1505 selection_clear ();
1366 break; 1506 break;
1367 1507
1368 case SelectionNotify: 1508 case SelectionNotify:
1369 if (selection_wait == Sel_normal) 1509 if (selection_wait == Sel_normal)
1370 selection_paste (ev.xselection.requestor, 1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1371 ev.xselection.property, True);
1372 break; 1511 break;
1373 1512
1374 case SelectionRequest: 1513 case SelectionRequest:
1375 selection_send (ev.xselectionrequest); 1514 selection_send (ev.xselectionrequest);
1376 break; 1515 break;
1377 1516
1517 case MapNotify:
1518 mapped = 1;
1519#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1521#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break;
1524
1378 case UnmapNotify: 1525 case UnmapNotify:
1379 TermWin.mapped = 0; 1526 mapped = 0;
1380#ifdef TEXT_BLINK 1527#ifdef TEXT_BLINK
1381 text_blink_ev.stop (); 1528 text_blink_ev.stop ();
1382#endif 1529#endif
1383 break; 1530 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; 1531 break;
1397 1532
1398#ifdef TRANSPARENT 1533#ifdef TRANSPARENT
1399 case ReparentNotify: 1534 case ReparentNotify:
1400 rootwin_cb (ev); 1535 rootwin_cb (ev);
1401 break; 1536 break;
1402#endif /* TRANSPARENT */ 1537#endif /* TRANSPARENT */
1403 1538
1404 case GraphicsExpose: 1539 case GraphicsExpose:
1405 case Expose: 1540 case Expose:
1406 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1407 { 1542 {
1408#ifdef NO_SLOW_LINK_SUPPORT 1543 do
1409 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1410 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1411#else 1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1412 // don't understand this, so commented it out 1547
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1413 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1414 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1415 //scr_expose (ev.xexpose.x, 0, 1553
1416 // ev.xexpose.width, TermWin.height, False);
1417#endif
1418 want_refresh = 1; 1554 want_refresh = 1;
1419 } 1555 }
1420 else 1556 else
1421 { 1557 {
1422 XEvent unused_event; 1558 XEvent unused_event;
1423 1559
1424 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1425 Expose, 1561 ;
1426 &unused_event)) ; 1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1427 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1563 ;
1428 GraphicsExpose, 1564
1429 &unused_event)) ;
1430 if (isScrollbarWindow(ev.xany.window)) 1565 if (isScrollbarWindow (ev.xany.window))
1431 { 1566 {
1432 scrollBar.setIdle(); 1567 scrollBar.setIdle ();
1433 scrollbar_show (0); 1568 scrollbar_show (0);
1434 } 1569 }
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 1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1443 } 1575 }
1444 break; 1576 break;
1445 1577
1446 case MotionNotify: 1578 case MotionNotify:
1447#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1448 if (hidden_pointer) 1580 if (hidden_pointer)
1449 pointer_unblank (); 1581 pointer_unblank ();
1450#endif 1582#endif
1451#if MENUBAR 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1452 if (isMenuBarWindow(ev.xany.window)) 1584 break;
1585
1586 if (ev.xany.window == vt)
1453 { 1587 {
1454 menubar_control (&(ev.xbutton)); 1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1455 break; 1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1456 } 1590 ; // 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))) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1464 { 1592 {
1465 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1466 ; 1594 ;
1467 1595
1468 XQueryPointer(display->display, TermWin.vt, 1596 XQueryPointer (disp, vt,
1469 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1470 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1471 &(ev.xbutton.x), &(ev.xbutton.y), 1599 &ev.xbutton.x, &ev.xbutton.y,
1472 &unused_mask); 1600 &ev.xbutton.state);
1473#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
1474 /* deal with a `jumpy' mouse */ 1602 /* deal with a `jumpy' mouse */
1475 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1603 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1476 { 1604 {
1477#endif 1605#endif
1606#if ISO_14755
1607 // 5.4
1608 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1609 {
1610 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1611 break;
1612 }
1613#endif
1478 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1614 selection_extend (ev.xbutton.x, ev.xbutton.y,
1479 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1615 ev.xbutton.state & Button3Mask ? 2 : 0);
1616
1480#ifdef SELECTION_SCROLLING 1617#ifdef SELECTION_SCROLLING
1481 if (ev.xbutton.y < TermWin.int_bwidth 1618 if (ev.xbutton.y < int_bwidth
1482 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1)) 1619 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1483 { 1620 {
1484 int dist; 1621 int dist;
1485
1486 pending_scroll_selection=1;
1487 1622
1488 /* don't clobber the current delay if we are 1623 /* don't clobber the current delay if we are
1489 * already in the middle of scrolling. 1624 * already in the middle of scrolling.
1490 */ 1625 */
1491 if (scroll_selection_delay<=0) 1626 if (!sel_scroll_ev.active)
1492 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1493 1628
1494 /* save the event params so we can highlight 1629 /* save the event params so we can highlight
1495 * the selection in the pending-scroll loop 1630 * the selection in the pending-scroll loop
1496 */ 1631 */
1497 selection_save_x=ev.xbutton.x; 1632 selection_save_x = ev.xbutton.x;
1498 selection_save_y=ev.xbutton.y; 1633 selection_save_y = ev.xbutton.y;
1499 selection_save_state=
1500 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1634 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1501 1635
1502 /* calc number of lines to scroll */ 1636 /* calc number of lines to scroll */
1503 if (ev.xbutton.y<TermWin.int_bwidth) 1637 if (ev.xbutton.y < int_bwidth)
1504 { 1638 {
1505 scroll_selection_dir = UP; 1639 scroll_selection_dir = UP;
1506 dist = TermWin.int_bwidth - ev.xbutton.y; 1640 dist = int_bwidth - ev.xbutton.y;
1507 } 1641 }
1508 else 1642 else
1509 { 1643 {
1510 scroll_selection_dir = DN; 1644 scroll_selection_dir = DN;
1511 dist = ev.xbutton.y - 1645 dist = ev.xbutton.y - (int_bwidth + height);
1512 (TermWin.int_bwidth + TermWin.height);
1513 } 1646 }
1647
1514 scroll_selection_lines=(Pixel2Height(dist)/ 1648 scroll_selection_lines = Pixel2Height (dist)
1515 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1649 / SELECTION_SCROLL_LINE_SPEEDUP
1650 + 1;
1516 MIN_IT(scroll_selection_lines, 1651 min_it (scroll_selection_lines,
1517 SELECTION_SCROLL_MAX_LINES); 1652 SELECTION_SCROLL_MAX_LINES);
1518 } 1653 }
1519 else 1654 else
1520 { 1655 {
1521 /* we are within the text window, so we 1656 /* we are within the text window, so we
1522 * shouldn't be scrolling 1657 * shouldn't be scrolling
1523 */ 1658 */
1524 pending_scroll_selection = 0; 1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop();
1525 } 1661 }
1526#endif 1662#endif
1527#ifdef MOUSE_THRESHOLD 1663#ifdef MOUSE_THRESHOLD
1528
1529 } 1664 }
1530#endif 1665#endif
1531
1532 } 1666 }
1533 } 1667 }
1534 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion()) 1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1535 { 1669 {
1536 while (XCheckTypedWindowEvent(display->display, scrollBar.win, 1670 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1537 MotionNotify, &ev)) ; 1671 MotionNotify, &ev))
1672 ;
1673
1538 XQueryPointer(display->display, scrollBar.win, 1674 XQueryPointer (disp, scrollBar.win,
1539 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1540 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1541 &(ev.xbutton.x), &(ev.xbutton.y), 1677 &ev.xbutton.x, &ev.xbutton.y,
1542 &unused_mask); 1678 &unused_mask);
1543 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1544 scrollbar_size()); 1680 scrollbar_size ());
1545 scr_refresh (refresh_type); 1681 want_refresh = 1;
1546 refresh_limit = 0; 1682 refresh_limit = 0;
1547 scrollbar_show (1); 1683 scrollbar_show (1);
1548 } 1684 }
1549 break; 1685 break;
1550 } 1686 }
1551}
1552 1687
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1692 {
1693 if (hidden_cursor)
1694 {
1695 hidden_cursor = 0;
1696 want_refresh = 1;
1697 }
1698
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 }
1701#endif
1702
1703#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 {
1706 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease)
1709 if (hidden_pointer)
1710 pointer_unblank ();
1711
1712 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank ();
1714 }
1715#endif
1716}
1717
1718void
1719rxvt_term::focus_in ()
1720{
1721 if (!focus)
1722 {
1723 focus = 1;
1724 want_refresh = 1;
1725
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1728#if USE_XIM
1729 if (Input_Context != NULL)
1730 {
1731 IMSetStatusPosition ();
1732 XSetICFocus (Input_Context);
1733 }
1734#endif
1735#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738#endif
1739#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade])
1741 {
1742 pix_colors = pix_colors_focused;
1743 scr_recolour ();
1744 }
1745#endif
1746 }
1747}
1748
1749void
1750rxvt_term::focus_out ()
1751{
1752 if (focus)
1753 {
1754 focus = 0;
1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1759#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf)
1761 {
1762 iso14755buf = 0;
1763# if ENABLE_OVERLAY
1764 scr_overlay_off ();
1765# endif
1766 }
1767#endif
1768#if USE_XIM
1769 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context);
1771#endif
1772#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink))
1774 cursor_blink_ev.stop ();
1775 hidden_cursor = 0;
1776#endif
1777#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade])
1779 {
1780 pix_colors = pix_colors_unfocused;
1781 scr_recolour ();
1782 }
1783#endif
1784 }
1785}
1786
1553#ifdef TRANSPARENT 1787#if TRANSPARENT
1554void 1788void
1555rxvt_term::rootwin_cb (XEvent &ev) 1789rxvt_term::rootwin_cb (XEvent &ev)
1556{ 1790{
1557 SET_R (this); 1791 make_current ();
1558 SET_LOCALE (locale);
1559 1792
1560 if (ev.type == PropertyNotify) 1793 switch (ev.type)
1561 { 1794 {
1795 case PropertyNotify:
1562 /* 1796 /*
1563 * if user used some Esetroot compatible prog to set the root bg, 1797 * if user used some Esetroot compatible prog to set the root bg,
1564 * use the property to determine the pixmap. We use it later on. 1798 * use the property to determine the pixmap. We use it later on.
1565 */ 1799 */
1566 if (xa[XA_XROOTPMAPID] == 0)
1567 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False);
1568
1569 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1570 return; 1802 return;
1571 }
1572 1803
1573 if ((Options & Opt_transparent) && check_our_parents ()) 1804 /* FALLTHROUGH */
1574 { 1805 case ReparentNotify:
1575 if (am_transparent) 1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1576 want_full_refresh = 1; 1807 want_refresh = want_full_refresh = 1;
1808 break;
1577 } 1809 }
1578} 1810}
1579#endif 1811#endif
1580 1812
1581void 1813void
1582rxvt_term::button_press (const XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
1583{ 1815{
1584 int reportmode = 0, clickintime; 1816 int reportmode = 0, clickintime;
1585 1817
1586 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1818 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1819
1587 if (!bypass_keystate) 1820 if (!bypass_keystate)
1588 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1821 reportmode = !! (priv_modes & PrivMode_mouse_report);
1822
1589 /* 1823 /*
1590 * VT window processing of button press 1824 * VT window processing of button press
1591 */ 1825 */
1592 if (ev.window == TermWin.vt) 1826 if (ev.window == vt)
1593 { 1827 {
1594#if RXVT_GRAPHICS 1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1595 if (ev.subwindow != None) 1829 return;
1596 rxvt_Gr_ButtonPress (ev.x, ev.y);
1597 else
1598#endif
1599 1830
1831#if ISO_14755
1832 // 5.4
1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1834 {
1835 iso14755_54 (ev.x, ev.y);
1836 return;
1600 { 1837 }
1838#endif
1839
1601 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1840 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1841
1602 if (reportmode) 1842 if (reportmode)
1843 {
1844 /* mouse report from vt window */
1845 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime)
1603 { 1849 {
1604 /* mouse report from vt window */ 1850 /* same button, within alloted time */
1605 /* save the xbutton state (for ButtonRelease) */ 1851 MEvent.clicks++;
1606 MEvent.state = ev.state; 1852
1607#ifdef MOUSE_REPORT_DOUBLECLICK 1853 if (MEvent.clicks > 1)
1608 if (ev.button == MEvent.button && clickintime)
1609 { 1854 {
1610 /* same button, within alloted time */
1611 MEvent.clicks++;
1612 if (MEvent.clicks > 1)
1613 {
1614 /* only report double clicks */ 1855 /* only report double clicks */
1615 MEvent.clicks = 2; 1856 MEvent.clicks = 2;
1616 mouse_report (ev); 1857 mouse_report (ev);
1617 1858
1618 /* don't report the release */ 1859 /* don't report the release */
1619 MEvent.clicks = 0; 1860 MEvent.clicks = 0;
1620 MEvent.button = AnyButton; 1861 MEvent.button = AnyButton;
1621 }
1622 } 1862 }
1623 else
1624 {
1625 /* different button, or time expired */
1626 MEvent.clicks = 1;
1627 MEvent.button = ev.button;
1628 mouse_report (ev);
1629 }
1630#else
1631 MEvent.button = ev.button;
1632 mouse_report (ev);
1633#endif /* MOUSE_REPORT_DOUBLECLICK */
1634
1635 } 1863 }
1636 else 1864 else
1637 { 1865 {
1866 /* different button, or time expired */
1867 MEvent.clicks = 1;
1868 MEvent.button = ev.button;
1869 mouse_report (ev);
1870 }
1871#else
1872 MEvent.button = ev.button;
1873 mouse_report (ev);
1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1875
1876 }
1877 else
1878 {
1638 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
1639 MEvent.clicks = 0; 1880 MEvent.clicks = 0;
1881
1640 switch (ev.button) 1882 switch (ev.button)
1641 { 1883 {
1642 case Button1: 1884 case Button1:
1885 /* allow meta + click to select rectangular areas */
1886 /* should be done in screen.C */
1887#if ENABLE_FRILLS
1888 selection.rect = !!(ev.state & ModMetaMask);
1889#else
1890 selection.rect = false;
1891#endif
1892
1643 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1644 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1645 { 1895 {
1646 if (MEvent.button == Button1 && clickintime)
1647 selection_rotate (ev.x, ev.y);
1648 else
1649 selection_extend (ev.x, ev.y, 1);
1650 }
1651 else
1652 {
1653 if (MEvent.button == Button1 && clickintime)
1654 MEvent.clicks++;
1655 else
1656 MEvent.clicks = 1;
1657
1658 selection_click (MEvent.clicks, ev.x, ev.y);
1659 }
1660
1661 MEvent.button = Button1;
1662 break;
1663
1664 case Button3:
1665 if (MEvent.button == Button3 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1666 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1667 else 1898 else
1668 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1900 }
1901 else
1902 {
1903 if (MEvent.button == Button1 && clickintime)
1904 MEvent.clicks++;
1905 else
1906 MEvent.clicks = 1;
1907
1908 selection_click (MEvent.clicks, ev.x, ev.y);
1909 }
1910
1911 MEvent.button = Button1;
1912 break;
1913
1914 case Button3:
1915 if (MEvent.button == Button3 && clickintime)
1916 selection_rotate (ev.x, ev.y);
1917 else
1918 selection_extend (ev.x, ev.y, 1);
1919
1669 MEvent.button = Button3; 1920 MEvent.button = Button3;
1670 break; 1921 break;
1671 }
1672 } 1922 }
1923 }
1924
1673 MEvent.time = ev.time; 1925 MEvent.time = ev.time;
1674 return; 1926 return;
1675 }
1676 } 1927 }
1677 1928
1678 /* 1929 /*
1679 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1680 */ 1931 */
1681 if (isScrollbarWindow(ev.window)) 1932 if (isScrollbarWindow (ev.window))
1682 { 1933 {
1683 scrollBar.setIdle (); 1934 scrollBar.setIdle ();
1684 /* 1935 /*
1685 * Rxvt-style scrollbar: 1936 * Rxvt-style scrollbar:
1686 * move up if mouse is above slider 1937 * move up if mouse is above slider
… …
1698 * Mouse report disabled scrollbar: 1949 * Mouse report disabled scrollbar:
1699 * arrow buttons - send up/down 1950 * arrow buttons - send up/down
1700 * click on scrollbar - send pageup/down 1951 * click on scrollbar - send pageup/down
1701 */ 1952 */
1702 if ((scrollBar.style == R_SB_NEXT 1953 if ((scrollBar.style == R_SB_NEXT
1703 && scrollbarnext_upButton(ev.y)) 1954 && scrollbarnext_upButton (ev.y))
1704 || (scrollBar.style == R_SB_RXVT 1955 || (scrollBar.style == R_SB_RXVT
1705 && scrollbarrxvt_upButton(ev.y))) 1956 && scrollbarrxvt_upButton (ev.y)))
1706 tt_printf("\033[A"); 1957 tt_printf ("\033[A");
1707 else if ((scrollBar.style == R_SB_NEXT 1958 else if ((scrollBar.style == R_SB_NEXT
1708 && scrollbarnext_dnButton(ev.y)) 1959 && scrollbarnext_dnButton (ev.y))
1709 || (scrollBar.style == R_SB_RXVT 1960 || (scrollBar.style == R_SB_RXVT
1710 && scrollbarrxvt_dnButton(ev.y))) 1961 && scrollbarrxvt_dnButton (ev.y)))
1711 tt_printf("\033[B"); 1962 tt_printf ("\033[B");
1712 else 1963 else
1713 switch (ev.button) 1964 switch (ev.button)
1714 { 1965 {
1715 case Button2: 1966 case Button2:
1716 tt_printf("\014"); 1967 tt_printf ("\014");
1717 break; 1968 break;
1718 case Button1: 1969 case Button1:
1719 tt_printf("\033[6~"); 1970 tt_printf ("\033[6~");
1720 break; 1971 break;
1721 case Button3: 1972 case Button3:
1722 tt_printf("\033[5~"); 1973 tt_printf ("\033[5~");
1723 break; 1974 break;
1724 } 1975 }
1725 } 1976 }
1726 else 1977 else
1727#endif /* NO_SCROLLBAR_REPORT */ 1978#endif /* NO_SCROLLBAR_REPORT */
… …
1729 { 1980 {
1730 char upordown = 0; 1981 char upordown = 0;
1731 1982
1732 if (scrollBar.style == R_SB_NEXT) 1983 if (scrollBar.style == R_SB_NEXT)
1733 { 1984 {
1734 if (scrollbarnext_upButton(ev.y)) 1985 if (scrollbarnext_upButton (ev.y))
1735 upordown = -1; /* up */ 1986 upordown = -1; /* up */
1736 else if (scrollbarnext_dnButton(ev.y)) 1987 else if (scrollbarnext_dnButton (ev.y))
1737 upordown = 1; /* down */ 1988 upordown = 1; /* down */
1738 } 1989 }
1739 else if (scrollBar.style == R_SB_RXVT) 1990 else if (scrollBar.style == R_SB_RXVT)
1740 { 1991 {
1741 if (scrollbarrxvt_upButton(ev.y)) 1992 if (scrollbarrxvt_upButton (ev.y))
1742 upordown = -1; /* up */ 1993 upordown = -1; /* up */
1743 else if (scrollbarrxvt_dnButton(ev.y)) 1994 else if (scrollbarrxvt_dnButton (ev.y))
1744 upordown = 1; /* down */ 1995 upordown = 1; /* down */
1745 } 1996 }
1746 if (upordown) 1997 if (upordown)
1747 { 1998 {
1748#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1999#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1749 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2000 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1750#endif 2001#endif
1751 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (upordown < 0 ? UP : DN, 1))
1752 { 2003 {
1753 if (upordown < 0) 2004 if (upordown < 0)
1754 scrollBar.setUp (); 2005 scrollBar.setUp ();
… …
1770 break; 2021 break;
1771 case R_SB_ALIGN_BOTTOM: 2022 case R_SB_ALIGN_BOTTOM:
1772 csrO = scrollBar.bot - scrollBar.top; 2023 csrO = scrollBar.bot - scrollBar.top;
1773 break; 2024 break;
1774 } 2025 }
2026
1775 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
1776 || scrollbar_above_slider(ev.y) 2028 || scrollbar_above_slider (ev.y)
1777 || scrollbar_below_slider(ev.y)) 2029 || scrollbar_below_slider (ev.y))
1778 scr_move_to ( scrollbar_position(ev.y) - csrO, 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1779 scrollbar_size()); 2031
1780 scrollBar.setMotion (); 2032 scrollBar.setMotion ();
1781 break; 2033 break;
1782 2034
1783 case Button1: 2035 case Button1:
1784 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2036 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1786 /* FALLTHROUGH */ 2038 /* FALLTHROUGH */
1787 2039
1788 case Button3: 2040 case Button3:
1789 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
1790 { 2042 {
1791 if (scrollbar_above_slider(ev.y)) 2043 if (scrollbar_above_slider (ev.y))
1792# ifdef RXVT_SCROLL_FULL 2044# ifdef RXVT_SCROLL_FULL
1793 scr_page (UP, TermWin.nrow - 1); 2045 scr_page (UP, nrow - 1);
1794# else 2046# else
1795 scr_page (UP, TermWin.nrow / 4); 2047 scr_page (UP, nrow / 4);
1796# endif 2048# endif
1797 else if (scrollbar_below_slider(ev.y)) 2049 else if (scrollbar_below_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2050# ifdef RXVT_SCROLL_FULL
1799 scr_page (DN, TermWin.nrow - 1); 2051 scr_page (DN, nrow - 1);
1800# else 2052# else
1801 scr_page (DN, TermWin.nrow / 4); 2053 scr_page (DN, nrow / 4);
1802# endif 2054# endif
1803 else 2055 else
1804 scrollBar.setMotion (); 2056 scrollBar.setMotion ();
1805 } 2057 }
1806 else 2058 else
1807 { 2059 {
1808 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
1809 (TermWin.nrow 2061 (nrow
1810 * scrollbar_position(ev.y) 2062 * scrollbar_position (ev.y)
1811 / scrollbar_size())); 2063 / scrollbar_size ()));
1812 } 2064 }
2065
1813 break; 2066 break;
1814 } 2067 }
1815 } 2068 }
2069
1816 return; 2070 return;
1817 } 2071 }
1818#if MENUBAR
1819 /*
1820 * Menubar window processing of button press
1821 */
1822 if (isMenuBarWindow(ev.window))
1823 menubar_control (ev);
1824#endif
1825} 2072}
1826 2073
1827void 2074void
1828rxvt_term::button_release (const XButtonEvent &ev) 2075rxvt_term::button_release (XButtonEvent &ev)
1829{ 2076{
1830 int reportmode = 0; 2077 int reportmode = 0;
1831 2078
1832 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
1833 if (!bypass_keystate) 2080 if (!bypass_keystate)
1834 reportmode = !!(PrivateModes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
1835 2082
1836 if (scrollbar_isUpDn()) 2083 if (scrollbar_isUpDn ())
1837 { 2084 {
1838 scrollBar.setIdle (); 2085 scrollBar.setIdle ();
1839 scrollbar_show (0); 2086 scrollbar_show (0);
1840#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1841 refresh_type &= ~SMOOTH_REFRESH;
1842#endif
1843
1844 } 2087 }
2088
1845#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
1846 pending_scroll_selection=0; 2090 if (sel_scroll_ev.active)
2091 sel_scroll_ev.stop();
1847#endif 2092#endif
2093
1848 if (ev.window == TermWin.vt) 2094 if (ev.window == vt)
1849 { 2095 {
1850#ifdef RXVT_GRAPHICS 2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
1851 if (ev.subwindow != None) 2097 return;
1852 rxvt_Gr_ButtonRelease(ev.x, ev.y);
1853 else
1854#endif
1855 2098
1856 { 2099#if ISO_14755
2100 // 5.4
2101 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2102 return;
2103#endif
2104
1857 if (reportmode) 2105 if (reportmode)
2106 {
2107 /* mouse report from vt window */
2108 /* don't report release of wheel "buttons" */
2109 if (ev.button >= 4)
2110 return;
2111#ifdef MOUSE_REPORT_DOUBLECLICK
2112 /* only report the release of 'slow' single clicks */
2113 if (MEvent.button != AnyButton
2114 && (ev.button != MEvent.button
2115 || (ev.time - MEvent.time
2116 > MULTICLICK_TIME / 2)))
1858 { 2117 {
1859 /* mouse report from vt window */
1860 /* don't report release of wheel "buttons" */
1861 if (ev.button >= 4)
1862 return;
1863#ifdef MOUSE_REPORT_DOUBLECLICK
1864 /* only report the release of 'slow' single clicks */
1865 if (MEvent.button != AnyButton
1866 && (ev.button != MEvent.button
1867 || (ev.time - MEvent.time
1868 > MULTICLICK_TIME / 2)))
1869 {
1870 MEvent.clicks = 0; 2118 MEvent.clicks = 0;
1871 MEvent.button = AnyButton;
1872 mouse_report (ev);
1873 }
1874#else /* MOUSE_REPORT_DOUBLECLICK */
1875 MEvent.button = AnyButton; 2119 MEvent.button = AnyButton;
1876 mouse_report (ev); 2120 mouse_report (ev);
2121 }
2122#else /* MOUSE_REPORT_DOUBLECLICK */
2123 MEvent.button = AnyButton;
2124 mouse_report (ev);
1877#endif /* MOUSE_REPORT_DOUBLECLICK */ 2125#endif /* MOUSE_REPORT_DOUBLECLICK */
1878 return; 2126 return;
2127 }
2128
2129 /*
2130 * dumb hack to compensate for the failure of click-and-drag
2131 * when overriding mouse reporting
2132 */
2133 if (priv_modes & PrivMode_mouse_report
2134 && bypass_keystate
2135 && ev.button == Button1 && MEvent.clicks <= 1)
2136 selection_extend (ev.x, ev.y, 0);
2137
2138 switch (ev.button)
2139 {
2140 case Button1:
2141 case Button3:
2142 selection_make (ev.time);
2143 break;
2144
2145 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2148 break;
2149
2150#ifdef MOUSE_WHEEL
2151 case Button4:
2152 case Button5:
2153 {
2154 int i;
2155 page_dirn v;
2156
2157 v = ev.button == Button4 ? UP : DN;
2158
2159 if (ev.state & ShiftMask)
2160 i = 1;
2161 else if (OPTION (Opt_mouseWheelScrollPage))
2162 i = nrow - 1;
2163 else
2164 i = 5;
2165
2166# ifdef MOUSE_SLIP_WHEELING
2167 if (ev.state & ControlMask)
2168 {
2169 mouse_slip_wheel_speed += v ? -1 : 1;
2170 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2171 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2172
2173 if (slip_wheel_ev.at < NOW)
2174 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2175
2176 slip_wheel_ev.start ();
2177 }
2178 else
2179 {
2180# endif
2181 scr_page (v, i);
2182 scrollbar_show (1);
2183# ifdef MOUSE_SLIP_WHEELING
2184 }
2185# endif
1879 } 2186 }
1880 /*
1881 * dumb hack to compensate for the failure of click-and-drag
1882 * when overriding mouse reporting
1883 */
1884 if (PrivateModes & PrivMode_mouse_report
1885 && bypass_keystate
1886 && ev.button == Button1 && MEvent.clicks <= 1)
1887 selection_extend (ev.x, ev.y, 0);
1888
1889 switch (ev.button)
1890 {
1891 case Button1:
1892 case Button3:
1893 selection_make (ev.time);
1894 break; 2187 break;
1895 case Button2:
1896 selection_request (ev.time, ev.x, ev.y);
1897 break;
1898#ifdef MOUSE_WHEEL
1899 case Button4:
1900 case Button5:
1901 {
1902 int i;
1903 page_dirn v;
1904
1905 v = (ev.button == Button4) ? UP : DN;
1906 if (ev.state & ShiftMask)
1907 i = 1;
1908 else if ((Options & Opt_mouseWheelScrollPage))
1909 i = TermWin.nrow - 1;
1910 else
1911 i = 5;
1912# ifdef MOUSE_SLIP_WHEELING
1913 if (ev.state & ControlMask)
1914 {
1915 mouse_slip_wheel_speed += (v ? -1 : 1);
1916 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1917 }
1918# endif 2188#endif
1919# ifdef JUMP_MOUSE_WHEEL
1920 scr_page (v, i);
1921 scr_refresh (SMOOTH_REFRESH);
1922 scrollbar_show (1);
1923# else
1924 while (i--)
1925 {
1926 scr_page (v, 1);
1927 scr_refresh (SMOOTH_REFRESH);
1928 scrollbar_show (1);
1929 }
1930# endif
1931
1932 }
1933 break;
1934#endif
1935
1936 } 2189 }
1937 }
1938 } 2190 }
1939#ifdef MENUBAR
1940 else if (isMenuBarWindow(ev.window))
1941 menubar_control (ev);
1942#endif
1943} 2191}
1944
1945 2192
1946#ifdef TRANSPARENT 2193#ifdef TRANSPARENT
2194#if TINTING
2195/* taken from aterm-0.4.2 */
2196
2197typedef uint32_t RUINT32T;
2198
2199void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2200{
2201 int sh_r, sh_g, sh_b;
2202 RUINT32T mask_r, mask_g, mask_b;
2203 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2204 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206 int i;
2207
2208 Visual *visual = display->visual;
2209
2210 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2211
2212 /* for convenience */
2213 mask_r = visual->red_mask;
2214 mask_g = visual->green_mask;
2215 mask_b = visual->blue_mask;
2216
2217 /* boring lookup table pre-initialization */
2218 switch (srcImage->bits_per_pixel) {
2219 case 15:
2220 if ((mask_r != 0x7c00) ||
2221 (mask_g != 0x03e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+32;
2228 sh_r = 10;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 16:
2233 if ((mask_r != 0xf800) ||
2234 (mask_g != 0x07e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+64;
2241 sh_r = 11;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 24:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 case 32:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 default:
2272 return; /* we do not support this color depth */
2273 }
2274
2275 /* prepare limits for color transformation (each channel is handled separately) */
2276 if (shade < 0) {
2277 shade = -shade;
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = 65535-rm;
2282 lower_lim_g = 65535-gm;
2283 lower_lim_b = 65535-bm;
2284
2285 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2286 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2287 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2288
2289 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2290 } else {
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2295
2296 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2297 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2298 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2299 }
2300
2301 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2302 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2303 {
2304 unsigned int tmp;
2305
2306 tmp = lower_lim_r;
2307 lower_lim_r = lower_lim_b;
2308 lower_lim_b = tmp;
2309
2310 tmp = upper_lim_r;
2311 upper_lim_r = upper_lim_b;
2312 upper_lim_b = tmp;
2313 }
2314
2315 /* fill our lookup tables */
2316 for (i = 0; i <= mask_r>>sh_r; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2320 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2321 lookup_r[i] = (tmp/65535)<<sh_r;
2322 }
2323 for (i = 0; i <= mask_g>>sh_g; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2327 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2328 lookup_g[i] = (tmp/65535)<<sh_g;
2329 }
2330 for (i = 0; i <= mask_b>>sh_b; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2334 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2335 lookup_b[i] = (tmp/65535)<<sh_b;
2336 }
2337
2338 /* apply table to input image (replacing colors by newly calculated ones) */
2339 switch (srcImage->bits_per_pixel)
2340 {
2341 case 15:
2342 {
2343 unsigned short *p1, *pf, *p, *pl;
2344 p1 = (unsigned short *) srcImage->data;
2345 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2346 while (p1 < pf)
2347 {
2348 p = p1;
2349 pl = p1 + srcImage->width;
2350 for (; p < pl; p++)
2351 {
2352 *p = lookup_r[(*p & 0x7c00)>>10] |
2353 lookup_g[(*p & 0x03e0)>> 5] |
2354 lookup_b[(*p & 0x001f)];
2355 }
2356 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2357 }
2358 break;
2359 }
2360 case 16:
2361 {
2362 unsigned short *p1, *pf, *p, *pl;
2363 p1 = (unsigned short *) srcImage->data;
2364 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2365 while (p1 < pf)
2366 {
2367 p = p1;
2368 pl = p1 + srcImage->width;
2369 for (; p < pl; p++)
2370 {
2371 *p = lookup_r[(*p & 0xf800)>>11] |
2372 lookup_g[(*p & 0x07e0)>> 5] |
2373 lookup_b[(*p & 0x001f)];
2374 }
2375 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2376 }
2377 break;
2378 }
2379 case 24:
2380 {
2381 unsigned char *p1, *pf, *p, *pl;
2382 p1 = (unsigned char *) srcImage->data;
2383 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2384 while (p1 < pf)
2385 {
2386 p = p1;
2387 pl = p1 + srcImage->width * 3;
2388 for (; p < pl; p += 3)
2389 {
2390 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2391 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2392 p[2] = lookup_r[(p[2] & 0x0000ff)];
2393 }
2394 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2395 }
2396 break;
2397 }
2398 case 32:
2399 {
2400 RUINT32T *p1, *pf, *p, *pl;
2401 p1 = (RUINT32T *) srcImage->data;
2402 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2403
2404 while (p1 < pf)
2405 {
2406 p = p1;
2407 pl = p1 + srcImage->width;
2408 for (; p < pl; p++)
2409 {
2410 *p = lookup_r[(*p & 0xff0000)>>16] |
2411 lookup_g[(*p & 0x00ff00)>> 8] |
2412 lookup_b[(*p & 0x0000ff)] |
2413 (*p & ~0xffffff);
2414 }
2415 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2416 }
2417 break;
2418 }
2419 }
2420
2421 free (lookup);
2422}
2423#endif
2424
1947/* 2425/*
1948 * Check our parents are still who we think they are. 2426 * Check our parents are still who we think they are.
1949 * Do transparency updates if required 2427 * Do transparency updates if required
1950 */ 2428 */
1951int 2429int
1952rxvt_term::check_our_parents () 2430rxvt_term::check_our_parents ()
1953{ 2431{
1954 int i, pchanged, aformat, have_pixmap, rootdepth; 2432 int i, pchanged, aformat, have_pixmap, rootdepth;
1955 unsigned long nitems, bytes_after; 2433 unsigned long nitems, bytes_after;
1956 Atom atype; 2434 Atom atype;
1957 unsigned char *prop = NULL; 2435 unsigned char *prop = NULL;
1958 Window root, oldp, *list; 2436 Window root, oldp, *list;
1959 Pixmap rootpixmap = None; 2437 Pixmap rootpixmap = None;
1960 XWindowAttributes wattr, wrootattr; 2438 XWindowAttributes wattr, wrootattr;
2439 dDisp;
1961 2440
1962 pchanged = 0; 2441 pchanged = 0;
1963 2442
1964 if (!(Options & Opt_transparent)) 2443 if (!OPTION (Opt_transparent))
1965 return pchanged; /* Don't try any more */ 2444 return pchanged; /* Don't try any more */
1966 2445
1967 XGetWindowAttributes(display->display, display->root, &wrootattr); 2446 XGetWindowAttributes (disp, display->root, &wrootattr);
1968 rootdepth = wrootattr.depth; 2447 rootdepth = wrootattr.depth;
1969 2448
1970 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2449 XGetWindowAttributes (disp, parent[0], &wattr);
2450
1971 if (rootdepth != wattr.depth) 2451 if (rootdepth != wattr.depth)
1972 { 2452 {
1973 if (am_transparent) 2453 if (am_transparent)
1974 { 2454 {
1975 pchanged = 1; 2455 pchanged = 1;
1976 XSetWindowBackground(display->display, TermWin.vt, 2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1977 PixColors[Color_bg]);
1978 am_transparent = am_pixmap_trans = 0; 2457 am_transparent = am_pixmap_trans = 0;
1979 } 2458 }
2459
1980 return pchanged; /* Don't try any more */ 2460 return pchanged; /* Don't try any more */
1981 } 2461 }
1982 2462
1983 /* Get all X ops out of the queue so that our information is up-to-date. */ 2463 /* Get all X ops out of the queue so that our information is up-to-date. */
1984 XSync(display->display, False); 2464 XSync (disp, False);
1985 2465
1986 /* 2466 /*
1987 * Make the frame window set by the window manager have 2467 * Make the frame window set by the window manager have
1988 * the root background. Some window managers put multiple nested frame 2468 * the root background. Some window managers put multiple nested frame
1989 * windows for each client, so we have to take care about that. 2469 * windows for each client, so we have to take care about that.
1990 */ 2470 */
1991 i = (xa[XA_XROOTPMAPID] != 0 2471 i = (xa[XA_XROOTPMAP_ID]
1992 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID], 2472 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success)); 2474 &nitems, &bytes_after, &prop) == Success);
2475
1995 if (!i || prop == NULL) 2476 if (!i || prop == NULL)
2477 i = (xa[XA_ESETROOT_PMAP_ID]
2478 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2479 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480 &nitems, &bytes_after, &prop) == Success);
2481
2482 if (!i || prop == NULL
2483#if TINTING
2484 || !rs[Rs_color + Color_tint]
2485#endif
2486 )
1996 have_pixmap = 0; 2487 have_pixmap = 0;
1997 else 2488 else
1998 { 2489 {
1999 have_pixmap = 1; 2490 have_pixmap = 1;
2000 rootpixmap = *((Pixmap *)prop); 2491 rootpixmap = *(Pixmap *)prop;
2001 XFree(prop); 2492 XFree (prop);
2002 } 2493 }
2494
2003 if (have_pixmap) 2495 if (have_pixmap)
2004 { 2496 {
2005 /* 2497 /*
2006 * Copy display->root pixmap transparency 2498 * Copy display->root pixmap transparency
2007 */ 2499 */
2008 int sx, sy, nx, ny; 2500 int sx, sy, nx, ny;
2009 unsigned int nw, nh; 2501 unsigned int nw, nh;
2010 Window cr; 2502 Window cr;
2011 XImage *image; 2503 XImage *image;
2012 GC gc; 2504 GC gc;
2013 XGCValues gcvalue; 2505 XGCValues gcvalue;
2014 2506
2015 XTranslateCoordinates(display->display, TermWin.parent[0], display->root, 2507 XTranslateCoordinates (disp, parent[0], display->root,
2016 0, 0, &sx, &sy, &cr); 2508 0, 0, &sx, &sy, &cr);
2017 nw = (unsigned int)szHint.width; 2509 nw = (unsigned int)szHint.width;
2018 nh = (unsigned int)szHint.height; 2510 nh = (unsigned int)szHint.height;
2019 nx = ny = 0; 2511 nx = ny = 0;
2512
2020 if (sx < 0) 2513 if (sx < 0)
2021 { 2514 {
2022 nw += sx; 2515 nw += sx;
2023 nx = -sx; 2516 nx = -sx;
2024 sx = 0; 2517 sx = 0;
2025 } 2518 }
2519
2026 if (sy < 0) 2520 if (sy < 0)
2027 { 2521 {
2028 nh += sy; 2522 nh += sy;
2029 ny = -sy; 2523 ny = -sy;
2030 sy = 0; 2524 sy = 0;
2031 } 2525 }
2526
2032 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2527 min_it (nw, (unsigned int) (wrootattr.width - sx));
2033 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2528 min_it (nh, (unsigned int) (wrootattr.height - sy));
2529
2530 XSync (disp, False);
2034 allowedxerror = -1; 2531 allowedxerror = -1;
2035 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2036 ZPixmap); 2533
2037 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2534 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2038 /* XXX: may need a delay here? */ 2535 /* XXX: may need a delay here? */
2039 allowedxerror = 0; 2536 allowedxerror = 0;
2537
2040 if (image == NULL) 2538 if (image == NULL)
2041 { 2539 {
2042 if (am_transparent && am_pixmap_trans) 2540 if (am_transparent && am_pixmap_trans)
2043 { 2541 {
2044 pchanged = 1; 2542 pchanged = 1;
2045 if (TermWin.pixmap != None) 2543 if (pixmap != None)
2046 { 2544 {
2047 XFreePixmap(display->display, TermWin.pixmap); 2545 XFreePixmap (disp, pixmap);
2048 TermWin.pixmap = None; 2546 pixmap = None;
2049 } 2547 }
2050 } 2548 }
2549
2051 am_pixmap_trans = 0; 2550 am_pixmap_trans = 0;
2052 } 2551 }
2053 else 2552 else
2054 { 2553 {
2055 if (TermWin.pixmap != None) 2554 if (pixmap != None)
2056 XFreePixmap(display->display, TermWin.pixmap); 2555 XFreePixmap (disp, pixmap);
2057 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt, 2556
2058 (unsigned int)szHint.width, 2557#if TINTING
2558 if (ISSET_PIXCOLOR (Color_tint))
2559 {
2560 unsigned short rm, gm, bm;
2561 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562
2563 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2564
2565 ShadeXImage (display, image, shade, rm, gm, bm);
2566 }
2567#endif
2568
2569 pixmap = XCreatePixmap (disp, vt,
2059 (unsigned int)szHint.height, 2570 szHint.width, szHint.height, image->depth);
2060 (unsigned int)image->depth);
2061 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue); 2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2062 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0, 2572 XPutImage (disp, pixmap, gc, image, 0, 0,
2063 nx, ny, (unsigned int)image->width,
2064 (unsigned int)image->height); 2573 nx, ny, image->width, image->height);
2065 XFreeGC(display->display, gc); 2574 XFreeGC (disp, gc);
2066 XDestroyImage(image); 2575 XDestroyImage (image);
2067 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2068 TermWin.pixmap); 2577 XClearWindow (disp, parent[0]);
2578
2069 if (!am_transparent || !am_pixmap_trans) 2579 if (!am_transparent || !am_pixmap_trans)
2070 pchanged = 1; 2580 pchanged = 1;
2581
2071 am_transparent = am_pixmap_trans = 1; 2582 am_transparent = am_pixmap_trans = 1;
2072 } 2583 }
2073 } 2584 }
2585
2074 if (!am_pixmap_trans) 2586 if (am_pixmap_trans)
2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2588 else
2075 { 2589 {
2076 unsigned int n; 2590 unsigned int n;
2077 /* 2591 /*
2078 * InheritPixmap transparency 2592 * InheritPixmap transparency
2079 */ 2593 */
2080 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root));
2081 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2082 i++)
2083 { 2595 {
2084 oldp = TermWin.parent[i]; 2596 oldp = parent[i];
2085 XQueryTree(display->display, TermWin.parent[i - 1], &root, 2597 XQueryTree (disp, parent[i - 1], &root,
2086 &TermWin.parent[i], &list, &n); 2598 &parent[i], &list, &n);
2087 XFree(list); 2599 XFree (list);
2088 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2600
2089 if (TermWin.parent[i] == display->root) 2601 if (parent[i] == display->root)
2090 { 2602 {
2091 if (oldp != None) 2603 if (oldp != None)
2092 pchanged = 1; 2604 pchanged = 1;
2605
2093 break; 2606 break;
2094 } 2607 }
2608
2095 if (oldp != TermWin.parent[i]) 2609 if (oldp != parent[i])
2096 pchanged = 1; 2610 pchanged = 1;
2097 } 2611 }
2612
2098 n = 0; 2613 n = 0;
2614
2099 if (pchanged) 2615 if (pchanged)
2100 { 2616 {
2101 for (; n < (unsigned int)i; n++) 2617 for (; n < (unsigned int)i; n++)
2102 { 2618 {
2103 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr); 2619 XGetWindowAttributes (disp, parent[n], &wattr);
2104 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2105 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2106 { 2621 {
2107 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2108 break; 2623 break;
2109 } 2624 }
2110 } 2625 }
2111 } 2626 }
2112 if (n > (int)(sizeof(TermWin.parent) 2627
2113 / sizeof(TermWin.parent[0]))) 2628 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2114 { 2629 {
2115 D_X((stderr, "InheritPixmap Turning off")); 2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2116 XSetWindowBackground(display->display, TermWin.parent[0], 2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2117 PixColors[Color_fg]);
2118 XSetWindowBackground(display->display, TermWin.vt,
2119 PixColors[Color_bg]);
2120 am_transparent = 0; 2632 am_transparent = 0;
2121 /* XXX: also turn off Opt_transparent? */ 2633 /* XXX: also turn off Opt_transparent? */
2122 } 2634 }
2123 else 2635 else
2124 { 2636 {
2125 /* wait (an arbitrary period) for the WM to do its thing
2126 * needed for fvwm2.2.2 (and before?) */
2127# ifdef HAVE_NANOSLEEP
2128 struct timespec rqt;
2129
2130 rqt.tv_sec = 1;
2131 rqt.tv_nsec = 0;
2132 nanosleep(&rqt, NULL);
2133# else
2134 sleep(1);
2135# endif
2136 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2137 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2138 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n], 2638 {
2139 ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2140 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2640 XClearWindow (disp, parent[n]);
2141 ParentRelative); 2641 }
2642
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2142 am_transparent = 1; 2644 am_transparent = 1;
2143 } 2645 }
2646
2144 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2145 TermWin.parent[i] = None; 2648 parent[i] = None;
2649 }
2650
2651 if (scrollBar.win)
2146 } 2652 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle ();
2655 scrollbar_show (0);
2656 }
2657
2658 if (am_transparent)
2659 {
2660 want_refresh = want_full_refresh = 1;
2661 if (am_pixmap_trans)
2662 flush ();
2663 }
2664
2147 return pchanged; 2665 return pchanged;
2148} 2666}
2149#endif 2667#endif
2150 2668
2151/*}}} */ 2669/*}}} */
2670
2671bool
2672rxvt_term::cmd_parse ()
2673{
2674 bool flag = false;
2675 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here
2677
2678 for (;;)
2679 {
2680 if (ch == NOCHAR)
2681 {
2682 seq_begin = cmdbuf_ptr;
2683 ch = next_char ();
2684
2685 if (ch == NOCHAR)
2686 break;
2687 }
2688
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 {
2691 if (!seen_input)
2692 {
2693 seen_input = 1;
2694 // many badly-written programs (e.g. jed) contain a race condition:
2695 // they first read the screensize and then install a SIGWINCH handler.
2696 // some window managers resize the window early, and these programs
2697 // then sometimes get the size wrong.
2698 // unfortunately other programs are even more buggy and dislike
2699 // being sent SIGWINCH, so only do it when we were in fact being
2700 // resized.
2701 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH);
2703 }
2704
2705 /* Read a text string from the input buffer */
2706 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false;
2708 int nlines = 0;
2709 wchar_t *str = buf;
2710 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711
2712 for (;;)
2713 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break;
2716
2717 *str++ = ch;
2718
2719 if (ch == C0_LF || str >= eol)
2720 {
2721 if (ch == C0_LF)
2722 nlines++;
2723
2724 refresh_count++;
2725
2726 if (!OPTION (Opt_jumpScroll)
2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 {
2729 refreshnow = true;
2730 refresh_count = 0;
2731 ch = NOCHAR;
2732 break;
2733 }
2734
2735 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1)
2737 {
2738 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2739 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2740 scr_add_lines (buf, str - buf, nlines);
2741
2742 nlines = 0;
2743 str = buf;
2744 eol = str + min (ncol, UBUFSIZ);
2745 }
2746
2747 if (str >= eol)
2748 {
2749 if (eol >= buf + UBUFSIZ)
2750 {
2751 ch = NOCHAR;
2752 break;
2753 }
2754 else
2755 eol = min (eol + ncol, buf + UBUFSIZ);
2756 }
2757
2758 }
2759
2760 seq_begin = cmdbuf_ptr;
2761 ch = next_char ();
2762 }
2763
2764 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2765 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2766 scr_add_lines (buf, str - buf, nlines);
2767
2768 /*
2769 * If there have been a lot of new lines, then update the screen
2770 * What the heck I'll cheat and only refresh less than every page-full.
2771 * the number of pages between refreshes is refresh_limit, which
2772 * is incremented here because we must be doing flat-out scrolling.
2773 */
2774 if (refreshnow)
2775 {
2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2777 refresh_limit++;
2778 else
2779 {
2780 flag = true;
2781 scr_refresh ();
2782 want_refresh = 1;
2783 }
2784 }
2785
2786 }
2787 else
2788 {
2789 try
2790 {
2791 process_nonprinting (ch);
2792 }
2793 catch (const class out_of_input &o)
2794 {
2795 // we ran out of input, retry later
2796 cmdbuf_ptr = seq_begin;
2797 break;
2798 }
2799
2800 ch = NOCHAR;
2801 }
2802 }
2803
2804 return flag;
2805}
2806
2807// read the next character
2808wchar_t
2809rxvt_term::next_char () NOTHROW
2810{
2811 while (cmdbuf_ptr < cmdbuf_endp)
2812 {
2813 // assume 7-bit to be ascii ALWAYS
2814 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2815 return *cmdbuf_ptr++;
2816
2817 wchar_t wc;
2818 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2819
2820 if (len == (size_t)-2)
2821 {
2822 // the mbstate stores incomplete sequences. didn't know this :/
2823 cmdbuf_ptr = cmdbuf_endp;
2824 break;
2825 }
2826
2827 if (len == (size_t)-1)
2828 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2829
2830 // assume wchar == unicode
2831 cmdbuf_ptr += len;
2832 return wc & UNICODE_MASK;
2833 }
2834
2835 return NOCHAR;
2836}
2837
2838// read the next octet
2839uint32_t
2840rxvt_term::next_octet () NOTHROW
2841{
2842 return cmdbuf_ptr < cmdbuf_endp
2843 ? (unsigned char)*cmdbuf_ptr++
2844 : NOCHAR;
2845}
2846
2847static class out_of_input out_of_input;
2848
2849/* rxvt_cmd_getc () - Return next input character */
2850/*
2851 * Return the next input character after first passing any keyboard input
2852 * to the command.
2853 */
2854wchar_t
2855rxvt_term::cmd_getc () THROW ((class out_of_input))
2856{
2857 wchar_t c = next_char ();
2858
2859 if (c == NOCHAR)
2860 throw out_of_input;
2861
2862 return c;
2863}
2864
2865uint32_t
2866rxvt_term::cmd_get8 () THROW ((class out_of_input))
2867{
2868 uint32_t c = next_octet ();
2869
2870 if (c == NOCHAR)
2871 throw out_of_input;
2872
2873 return c;
2874}
2152 2875
2153/*{{{ print pipe */ 2876/*{{{ print pipe */
2154/*----------------------------------------------------------------------*/ 2877/*----------------------------------------------------------------------*/
2155#ifdef PRINTPIPE 2878#ifdef PRINTPIPE
2156FILE * 2879FILE *
2157rxvt_term::popen_printer () 2880rxvt_term::popen_printer ()
2158{ 2881{
2159 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2882 FILE *stream = popen (rs[Rs_print_pipe], "w");
2160 2883
2161 if (stream == NULL) 2884 if (stream == NULL)
2162 rxvt_print_error("can't open printer pipe"); 2885 rxvt_warn ("can't open printer pipe, not printing.\n");
2886
2163 return stream; 2887 return stream;
2164} 2888}
2165 2889
2166int 2890int
2167rxvt_term::pclose_printer (FILE *stream) 2891rxvt_term::pclose_printer (FILE *stream)
2168{ 2892{
2169 fflush (stream); 2893 fflush (stream);
2170 /* pclose() reported not to work on SunOS 4.1.3 */
2171# if defined (__sun__) /* TODO: RESOLVE THIS */
2172 /* pclose works provided SIGCHLD handler uses waitpid */
2173 return pclose (stream); /* return fclose (stream); */
2174# else
2175 return pclose (stream); 2894 return pclose (stream);
2176# endif
2177} 2895}
2178 2896
2179/* 2897/*
2180 * simulate attached vt100 printer 2898 * simulate attached vt100 printer
2181 */ 2899 */
2182void 2900void
2183rxvt_term::process_print_pipe () 2901rxvt_term::process_print_pipe ()
2184{ 2902{
2185 int done; 2903 int done;
2186 FILE *fd; 2904 FILE *fd;
2187 2905
2188 if ((fd = popen_printer ()) == NULL) 2906 if ((fd = popen_printer ()) == NULL)
2189 return; 2907 return;
2190 2908
2191 /* 2909 /*
2192 * Send all input to the printer until either ESC[4i or ESC[?4i 2910 * Send all input to the printer until either ESC[4i or ESC[?4i
2193 * is received. 2911 * is received.
2194 */ 2912 */
2195 for (done = 0; !done;) 2913 for (done = 0; !done;)
2196 { 2914 {
2197 unsigned char buf[8]; 2915 unsigned char buf[8];
2198 unsigned char ch; 2916 unicode_t ch;
2199 unsigned int i, len; 2917 unsigned int i, len;
2200 2918
2201 if ((ch = cmd_getc ()) != C0_ESC) 2919 if ((ch = cmd_getc ()) != C0_ESC)
2202 { 2920 {
2203 if (putc(ch, fd) == EOF) 2921 if (putc (ch, fd) == EOF)
2204 break; /* done = 1 */ 2922 break; /* done = 1 */
2205 } 2923 }
2206 else 2924 else
2207 { 2925 {
2208 len = 0; 2926 len = 0;
… …
2219 { 2937 {
2220 if ((buf[len++] = cmd_getc ()) == 'i') 2938 if ((buf[len++] = cmd_getc ()) == 'i')
2221 break; /* done = 1 */ 2939 break; /* done = 1 */
2222 } 2940 }
2223 } 2941 }
2942
2224 for (i = 0; i < len; i++) 2943 for (i = 0; i < len; i++)
2225 if (putc(buf[i], fd) == EOF) 2944 if (putc (buf[i], fd) == EOF)
2226 { 2945 {
2227 done = 1; 2946 done = 1;
2228 break; 2947 break;
2229 } 2948 }
2230 } 2949 }
2231 } 2950 }
2951
2232 pclose_printer (fd); 2952 pclose_printer (fd);
2233} 2953}
2234#endif /* PRINTPIPE */ 2954#endif /* PRINTPIPE */
2235/*}}} */ 2955/*}}} */
2236 2956
2237/* *INDENT-OFF* */ 2957/* *INDENT-OFF* */
2238enum { 2958enum {
2239 C1_40 = 0x40, 2959 C1_40 = 0x40,
2240 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2960 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2241 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2961 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2242 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2962 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2243 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2963 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2244}; 2964};
2245/* *INDENT-ON* */ 2965/* *INDENT-ON* */
2246 2966
2247/*{{{ process non-printing single characters */ 2967/*{{{ process non-printing single characters */
2248void 2968void
2249rxvt_term::process_nonprinting (unsigned char ch) 2969rxvt_term::process_nonprinting (unicode_t ch)
2250{ 2970{
2251 switch (ch) 2971 switch (ch)
2252 { 2972 {
2973 case C0_ESC:
2974 process_escape_seq ();
2975 break;
2253 case C0_ENQ: /* terminal Status */ 2976 case C0_ENQ: /* terminal Status */
2254 if (rs[Rs_answerbackstring]) 2977 if (rs[Rs_answerbackstring])
2255 tt_write( 2978 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2256 (const unsigned char *)rs[Rs_answerbackstring],
2257 (unsigned int)STRLEN(rs[Rs_answerbackstring]));
2258 else 2979 else
2259 tt_write((unsigned char *)VT100_ANS, 2980 tt_write (VT100_ANS, strlen (VT100_ANS));
2260 (unsigned int)STRLEN(VT100_ANS));
2261 break; 2981 break;
2262 case C0_BEL: /* bell */ 2982 case C0_BEL: /* bell */
2263 scr_bell (); 2983 scr_bell ();
2264 break; 2984 break;
2265 case C0_BS: /* backspace */ 2985 case C0_BS: /* backspace */
… …
2280 scr_charset_choose (1); 3000 scr_charset_choose (1);
2281 break; 3001 break;
2282 case C0_SI: /* shift in - acs */ 3002 case C0_SI: /* shift in - acs */
2283 scr_charset_choose (0); 3003 scr_charset_choose (0);
2284 break; 3004 break;
3005
3006#ifdef EIGHT_BIT_CONTROLS
3007 // 8-bit controls
3008 case 0x90: /* DCS */
3009 process_dcs_seq ();
3010 break;
3011 case 0x9b: /* CSI */
3012 process_csi_seq ();
3013 break;
3014 case 0x9d: /* CSI */
3015 process_osc_seq ();
3016 break;
3017#endif
2285 } 3018 }
2286} 3019}
2287/*}}} */ 3020/*}}} */
2288 3021
2289 3022
2290/*{{{ process VT52 escape sequences */ 3023/*{{{ process VT52 escape sequences */
2291void 3024void
2292rxvt_term::process_escape_vt52 (unsigned char ch) 3025rxvt_term::process_escape_vt52 (unicode_t ch)
2293{ 3026{
2294 int row, col; 3027 int row, col;
2295 3028
2296 switch (ch) 3029 switch (ch)
2297 { 3030 {
… …
2327 row = cmd_getc () - ' '; 3060 row = cmd_getc () - ' ';
2328 col = cmd_getc () - ' '; 3061 col = cmd_getc () - ' ';
2329 scr_gotorc (row, col, 0); 3062 scr_gotorc (row, col, 0);
2330 break; 3063 break;
2331 case 'Z': /* identify the terminal type */ 3064 case 'Z': /* identify the terminal type */
2332 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 3065 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2333 break; 3066 break;
2334 case '<': /* turn off VT52 mode */ 3067 case '<': /* turn off VT52 mode */
2335 PrivMode(0, PrivMode_vt52); 3068 PrivMode (0, PrivMode_vt52);
2336 break; 3069 break;
2337 case 'F': /* use special graphics character set */ 3070 case 'F': /* use special graphics character set */
2338 case 'G': /* use regular character set */ 3071 case 'G': /* use regular character set */
2339 /* unimplemented */ 3072 /* unimplemented */
2340 break; 3073 break;
… …
2349 3082
2350/*{{{ process escape sequences */ 3083/*{{{ process escape sequences */
2351void 3084void
2352rxvt_term::process_escape_seq () 3085rxvt_term::process_escape_seq ()
2353{ 3086{
2354 unsigned char ch = cmd_getc (); 3087 unicode_t ch = cmd_getc ();
2355 3088
2356 if (PrivateModes & PrivMode_vt52) 3089 if (priv_modes & PrivMode_vt52)
2357 { 3090 {
2358 process_escape_vt52 (ch); 3091 process_escape_vt52 (ch);
2359 return; 3092 return;
2360 } 3093 }
2361 3094
… …
2376 scr_charset_set (2, (unsigned int)cmd_getc ()); 3109 scr_charset_set (2, (unsigned int)cmd_getc ());
2377 break; 3110 break;
2378 case '+': 3111 case '+':
2379 scr_charset_set (3, (unsigned int)cmd_getc ()); 3112 scr_charset_set (3, (unsigned int)cmd_getc ());
2380 break; 3113 break;
2381#ifdef MULTICHAR_SET 3114#if ENABLE_FRILLS
2382 case '$':
2383 scr_charset_set (-2, (unsigned int)cmd_getc ());
2384 break;
2385#endif
2386#ifndef NO_FRILLS
2387 case '6': 3115 case '6':
2388 scr_backindex (); 3116 scr_backindex ();
2389 break; 3117 break;
2390#endif 3118#endif
2391 case '7': 3119 case '7':
2392 scr_cursor (SAVE); 3120 scr_cursor (SAVE);
2393 break; 3121 break;
2394 case '8': 3122 case '8':
2395 scr_cursor (RESTORE); 3123 scr_cursor (RESTORE);
2396 break; 3124 break;
2397#ifndef NO_FRILLS 3125#if ENABLE_FRILLS
2398 case '9': 3126 case '9':
2399 scr_forwardindex (); 3127 scr_forwardindex ();
2400 break; 3128 break;
2401#endif 3129#endif
2402 case '=': 3130 case '=':
2403 case '>': 3131 case '>':
2404 PrivMode((ch == '='), PrivMode_aplKP); 3132 PrivMode ((ch == '='), PrivMode_aplKP);
2405 break; 3133 break;
2406 3134
2407 case C1_40: 3135 case C1_40:
2408 cmd_getc (); 3136 cmd_getc ();
2409 break; 3137 break;
… …
2412 break; 3140 break;
2413 3141
2414 /* 8.3.87: NEXT LINE */ 3142 /* 8.3.87: NEXT LINE */
2415 case C1_NEL: /* ESC E */ 3143 case C1_NEL: /* ESC E */
2416 { 3144 {
2417 uint32_t nlcr[] = { '\n', '\r' }; 3145 wchar_t nlcr[] = { C0_LF, C0_CR };
2418 scr_add_lines (nlcr, 1, 2); 3146 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2419 } 3147 }
2420 break; 3148 break;
2421 3149
2422 /* kidnapped escape sequence: Should be 8.3.48 */ 3150 /* kidnapped escape sequence: Should be 8.3.48 */
2423 case C1_ESA: /* ESC G */ 3151 case C1_ESA: /* ESC G */
… …
2433 case C1_RI: /* ESC M */ 3161 case C1_RI: /* ESC M */
2434 scr_index (DN); 3162 scr_index (DN);
2435 break; 3163 break;
2436 3164
2437 /* 8.3.142: SINGLE-SHIFT TWO */ 3165 /* 8.3.142: SINGLE-SHIFT TWO */
2438 /*case C1_SS2: scr_single_shift (2); break; */ 3166 /*case C1_SS2: scr_single_shift (2); break; */
2439 3167
2440 /* 8.3.143: SINGLE-SHIFT THREE */ 3168 /* 8.3.143: SINGLE-SHIFT THREE */
2441 /*case C1_SS3: scr_single_shift (3); break; */ 3169 /*case C1_SS3: scr_single_shift (3); break; */
2442 3170
2443 /* 8.3.27: DEVICE CONTROL STRING */ 3171 /* 8.3.27: DEVICE CONTROL STRING */
2444 case C1_DCS: /* ESC P */ 3172 case C1_DCS: /* ESC P */
2445 process_dcs_seq (); 3173 process_dcs_seq ();
2446 break; 3174 break;
2447 3175
2448 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3176 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2449 case C1_SCI: /* ESC Z */ 3177 case C1_SCI: /* ESC Z */
2450 tt_write((const unsigned char *)ESCZ_ANSWER, 3178 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2451 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2452 break; /* steal obsolete ESC [ c */ 3179 break; /* steal obsolete ESC [ c */
2453 3180
2454 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3181 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2455 case C1_CSI: /* ESC [ */ 3182 case C1_CSI: /* ESC [ */
2456 process_csi_seq (); 3183 process_csi_seq ();
… …
2461 process_osc_seq (); 3188 process_osc_seq ();
2462 break; 3189 break;
2463 3190
2464 /* 8.3.106: RESET TO INITIAL STATE */ 3191 /* 8.3.106: RESET TO INITIAL STATE */
2465 case 'c': 3192 case 'c':
3193 mbstate.reset ();
2466 scr_poweron (); 3194 scr_poweron ();
2467 scrollbar_show (1); 3195 scrollbar_show (1);
2468 break; 3196 break;
2469 3197
2470 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3198 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2482 3210
2483/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3211/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2484/* *INDENT-OFF* */ 3212/* *INDENT-OFF* */
2485enum { 3213enum {
2486 CSI_ICH = 0x40, 3214 CSI_ICH = 0x40,
2487 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3215 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2488 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3216 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2489 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3217 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2490 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3218 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2491 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3219 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2492 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3220 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2496 3224
2497#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 3225#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2498 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 3226 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2499 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 3227 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2500#define get_byte_array_bit(array, bit) \ 3228#define get_byte_array_bit(array, bit) \
2501 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 3229 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2502 3230
2503const unsigned char csi_defaults[] = 3231const unsigned char csi_defaults[] =
2504 { 3232 {
2505 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 3233 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2506 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 3234 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2507 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3235 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2508 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3236 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2509 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3237 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2510 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3238 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2511 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3239 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2512 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3240 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2513 }; 3241 };
2514/* *INDENT-ON* */ 3242/* *INDENT-ON* */
2515 3243
2516void 3244void
2517rxvt_term::process_csi_seq () 3245rxvt_term::process_csi_seq ()
2518{ 3246{
2519 unsigned char ch, priv, i; 3247 unicode_t ch, priv, i;
2520 unsigned int nargs, p; 3248 unsigned int nargs, p;
2521 int n, ndef; 3249 int n, ndef;
2522 int arg[ESC_ARGS]; 3250 int arg[ESC_ARGS];
2523 3251
2524 for (nargs = ESC_ARGS; nargs > 0;) 3252 for (nargs = ESC_ARGS; nargs > 0;)
2525 arg[--nargs] = 0; 3253 arg[--nargs] = 0;
2526 3254
2527 priv = 0; 3255 priv = 0;
… …
2529 if (ch >= '<' && ch <= '?') 3257 if (ch >= '<' && ch <= '?')
2530 { /* '<' '=' '>' '?' */ 3258 { /* '<' '=' '>' '?' */
2531 priv = ch; 3259 priv = ch;
2532 ch = cmd_getc (); 3260 ch = cmd_getc ();
2533 } 3261 }
3262
2534 /* read any numerical arguments */ 3263 /* read any numerical arguments */
2535 for (n = -1; ch < CSI_ICH; ) 3264 for (n = -1; ch < CSI_ICH; )
2536 { 3265 {
2537 if (isdigit(ch)) 3266 if (isdigit (ch))
2538 { 3267 {
2539 if (n < 0) 3268 if (n < 0)
2540 n = ch - '0'; 3269 n = ch - '0';
2541 else 3270 else
2542 n = n * 10 + ch - '0'; 3271 n = n * 10 + ch - '0';
… …
2545 { 3274 {
2546 if (nargs < ESC_ARGS) 3275 if (nargs < ESC_ARGS)
2547 arg[nargs++] = n; 3276 arg[nargs++] = n;
2548 n = -1; 3277 n = -1;
2549 } 3278 }
2550 else if (ch == '\b') 3279 else if (IS_CONTROL (ch))
2551 {
2552 scr_backspace ();
2553 }
2554 else if (ch == C0_ESC)
2555 {
2556 process_escape_seq ();
2557 return;
2558 }
2559 else if (ch < ' ')
2560 {
2561 process_nonprinting (ch); 3280 process_nonprinting (ch);
2562 } 3281
2563 ch = cmd_getc (); 3282 ch = cmd_getc ();
2564 } 3283 }
2565 3284
2566 if (ch > CSI_7F) 3285 if (ch > CSI_7F)
2567 return; 3286 return;
2568 3287
2569 if (nargs < ESC_ARGS) 3288 if (nargs < ESC_ARGS)
2570 arg[nargs++] = n; 3289 arg[nargs++] = n;
2571 3290
2572 i = ch - CSI_ICH; 3291 i = ch - CSI_ICH;
2573 ndef = get_byte_array_bit(csi_defaults, i); 3292 ndef = get_byte_array_bit (csi_defaults, i);
2574 for (p = 0; p < nargs; p++) 3293 for (p = 0; p < nargs; p++)
2575 if (arg[p] == -1) 3294 if (arg[p] == -1)
2576 arg[p] = ndef; 3295 arg[p] = ndef;
2577 3296
2578#ifdef DEBUG_CMD 3297#ifdef DEBUG_CMD
2579 fprintf(stderr, "CSI "); 3298 fprintf (stderr, "CSI ");
2580 for (p = 0; p < nargs; p++) 3299 for (p = 0; p < nargs; p++)
2581 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 3300 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2582 fprintf(stderr, "%c\n", ch); 3301 fprintf (stderr, "%c\n", ch);
2583#endif 3302#endif
2584 3303
2585 /* 3304 /*
2586 * private mode handling 3305 * private mode handling
2587 */ 3306 */
… …
2589 { 3308 {
2590 switch (priv) 3309 switch (priv)
2591 { 3310 {
2592 case '>': 3311 case '>':
2593 if (ch == CSI_DA) /* secondary device attributes */ 3312 if (ch == CSI_DA) /* secondary device attributes */
2594 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 3313 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2595 break; 3314 break;
2596 case '?': 3315 case '?':
2597 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3316 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2598 process_terminal_mode (ch, priv, nargs, arg); 3317 process_terminal_mode (ch, priv, nargs, arg);
2599 break; 3318 break;
… …
2602 } 3321 }
2603 3322
2604 switch (ch) 3323 switch (ch)
2605 { 3324 {
2606 /* 3325 /*
2607 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 3326 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2608 */ 3327 */
2609#ifdef PRINTPIPE 3328#ifdef PRINTPIPE
2610 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 3329 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2611 switch (arg[0]) 3330 switch (arg[0])
2612 { 3331 {
… …
2704 3423
2705 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3424 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2706 arg[0] = -arg[0]; 3425 arg[0] = -arg[0];
2707 /* FALLTHROUGH */ 3426 /* FALLTHROUGH */
2708 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3427 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2709 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3428 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2710 break; 3429 break;
2711 3430
2712 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3431 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2713 tt_write((const unsigned char *)VT100_ANS, 3432 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2714 (unsigned int)(sizeof(VT100_ANS) - 1));
2715 break; 3433 break;
2716 3434
2717 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3435 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2718 process_sgr_mode (nargs, arg); 3436 process_sgr_mode (nargs, arg);
2719 break; 3437 break;
2720 3438
2721 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 3439 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2722 switch (arg[0]) 3440 switch (arg[0])
2723 { 3441 {
2724 case 5: /* DSR requested */ 3442 case 5: /* DSR requested */
2725 tt_printf("\033[0n"); 3443 tt_printf ("\033[0n");
2726 break; 3444 break;
2727 case 6: /* CPR requested */ 3445 case 6: /* CPR requested */
2728 scr_report_position (); 3446 scr_report_position ();
2729 break; 3447 break;
2730#if defined (ENABLE_DISPLAY_ANSWER)
2731 case 7: /* unofficial extension */ 3448 case 7: /* unofficial extension */
3449 if (OPTION (Opt_insecure))
2732 tt_printf("%-.250s\n", rs[Rs_display_name]); 3450 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2733 break; 3451 break;
2734#endif
2735 case 8: /* unofficial extension */ 3452 case 8: /* unofficial extension */
2736 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3453 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2737 break; 3454 break;
2738 } 3455 }
2739 break; 3456 break;
2740 3457
2741 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3458 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2774 break; 3491 break;
2775 3492
2776 case CSI_RM: /* 8.3.107: RESET MODE */ 3493 case CSI_RM: /* 8.3.107: RESET MODE */
2777 if (arg[0] == 4) 3494 if (arg[0] == 4)
2778 scr_insert_mode (0); 3495 scr_insert_mode (0);
3496 else if (arg[0] == 20)
3497 priv_modes &= ~PrivMode_LFNL;
2779 break; 3498 break;
2780 3499
2781 case CSI_SM: /* 8.3.126: SET MODE */ 3500 case CSI_SM: /* 8.3.126: SET MODE */
2782 if (arg[0] == 4) 3501 if (arg[0] == 4)
2783 scr_insert_mode (1); 3502 scr_insert_mode (1);
3503 else if (arg[0] == 20)
3504 priv_modes |= PrivMode_LFNL;
2784 break; 3505 break;
2785 3506
2786 /* 3507 /*
2787 * PRIVATE USE beyond this point. All CSI_7? sequences here 3508 * PRIVATE USE beyond this point. All CSI_7? sequences here
2788 */ 3509 */
… …
2800 break; 3521 break;
2801 case CSI_75: 3522 case CSI_75:
2802 scr_cursor (RESTORE); 3523 scr_cursor (RESTORE);
2803 break; 3524 break;
2804 3525
2805#ifndef NO_FRILLS 3526#if ENABLE_FRILLS
2806 case CSI_74: 3527 case CSI_74:
2807 process_window_ops (arg, nargs); 3528 process_window_ops (arg, nargs);
2808 break; 3529 break;
2809#endif 3530#endif
2810 3531
2811 case CSI_78: /* DECREQTPARM */ 3532 case CSI_78: /* DECREQTPARM */
2812 if (arg[0] == 0 || arg[0] == 1) 3533 if (arg[0] == 0 || arg[0] == 1)
2813 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3534 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2814 /* FALLTHROUGH */ 3535 break;
2815 3536
2816 default: 3537 default:
2817 break; 3538 break;
2818 } 3539 }
2819} 3540}
2820/*}}} */ 3541/*}}} */
2821 3542
2822#ifndef NO_FRILLS 3543#if ENABLE_FRILLS
2823/* ARGSUSED */ 3544/* ARGSUSED */
2824void 3545void
2825rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3546rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2826{ 3547{
2827 int x, y; 3548 int x, y;
2828#if 0
2829 char *s;
2830#endif
2831 XWindowAttributes wattr; 3549 XWindowAttributes wattr;
2832 Window wdummy; 3550 Window wdummy;
3551 dDisp;
2833 3552
2834 if (nargs == 0) 3553 if (nargs == 0)
2835 return; 3554 return;
3555
2836 switch (args[0]) 3556 switch (args[0])
2837 { 3557 {
2838 /* 3558 /*
2839 * commands 3559 * commands
2840 */ 3560 */
2841 case 1: /* deiconify window */ 3561 case 1: /* deiconify window */
2842 XMapWindow(display->display, TermWin.parent[0]); 3562 XMapWindow (disp, parent[0]);
2843 break; 3563 break;
2844 case 2: /* iconify window */ 3564 case 2: /* iconify window */
2845 XIconifyWindow(display->display, TermWin.parent[0], 3565 XIconifyWindow (disp, parent[0], display->screen);
2846 DefaultScreen(display->display));
2847 break; 3566 break;
2848 case 3: /* set position (pixels) */ 3567 case 3: /* set position (pixels) */
2849 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]); 3568 XMoveWindow (disp, parent[0], args[1], args[2]);
2850 break; 3569 break;
2851 case 4: /* set size (pixels) */ 3570 case 4: /* set size (pixels) */
2852 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3571 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2853 break; 3572 break;
2854 case 5: /* raise window */ 3573 case 5: /* raise window */
2855 XRaiseWindow(display->display, TermWin.parent[0]); 3574 XRaiseWindow (disp, parent[0]);
2856 break; 3575 break;
2857 case 6: /* lower window */ 3576 case 6: /* lower window */
2858 XLowerWindow(display->display, TermWin.parent[0]); 3577 XLowerWindow (disp, parent[0]);
2859 break; 3578 break;
2860 case 7: /* refresh window */ 3579 case 7: /* refresh window */
2861 scr_touch (true); 3580 scr_touch (true);
2862 break; 3581 break;
2863 case 8: /* set size (chars) */ 3582 case 8: /* set size (chars) */
2864 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3583 set_widthheight ((unsigned int) (args[2] * fwidth),
2865 (unsigned int)(args[1] * TermWin.fheight)); 3584 (unsigned int) (args[1] * fheight));
2866 break; 3585 break;
3586
3587 //case 9: NYI, TODO, restore maximized window or maximize window
2867 default: 3588 default:
2868 if (args[0] >= 24) /* set height (chars) */ 3589 if (args[0] >= 24) /* set height (chars) */
2869 set_widthheight ((unsigned int)TermWin.width, 3590 set_widthheight ((unsigned int)width,
2870 (unsigned int)(args[1] * TermWin.fheight)); 3591 (unsigned int) (args[1] * fheight));
2871 break; 3592 break;
3593
3594
2872 /* 3595 /*
2873 * reports - some output format copied from XTerm 3596 * reports - some output format copied from XTerm
2874 */ 3597 */
2875 case 11: /* report window state */ 3598 case 11: /* report window state */
2876 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3599 XGetWindowAttributes (disp, parent[0], &wattr);
2877 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3600 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2878 break; 3601 break;
2879 case 13: /* report window position */ 3602 case 13: /* report window position */
2880 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3603 XGetWindowAttributes (disp, parent[0], &wattr);
2881 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root, 3604 XTranslateCoordinates (disp, parent[0], wattr.root,
2882 -wattr.border_width, -wattr.border_width, 3605 -wattr.border_width, -wattr.border_width,
2883 &x, &y, &wdummy); 3606 &x, &y, &wdummy);
2884 tt_printf("\033[3;%d;%dt", x, y); 3607 tt_printf ("\033[3;%d;%dt", x, y);
2885 break; 3608 break;
2886 case 14: /* report window size (pixels) */ 3609 case 14: /* report window size (pixels) */
2887 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 3610 XGetWindowAttributes (disp, parent[0], &wattr);
2888 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3611 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2889 break; 3612 break;
3613 case 18: /* report text area size (chars) */
3614 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3615 break;
2890 case 18: /* report window size (chars) */ 3616 case 19: /* report window size (chars) */
2891 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3617 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2892 break; 3618 break;
2893#if 0 /* XXX: currently disabled due to security concerns */
2894 case 20: /* report icon label */ 3619 case 20: /* report icon label */
3620 {
3621 char *s;
2895 XGetIconName(display->display, TermWin.parent[0], &s); 3622 XGetIconName (disp, parent[0], &s);
2896 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3623 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s);
3625 }
2897 break; 3626 break;
2898 case 21: /* report window title */ 3627 case 21: /* report window title */
3628 {
3629 char *s;
2899 XFetchName(display->display, TermWin.parent[0], &s); 3630 XFetchName (disp, parent[0], &s);
2900 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3631 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3632 XFree (s);
3633 }
2901 break; 3634 break;
2902#endif
2903
2904 } 3635 }
2905} 3636}
2906#endif 3637#endif
2907 3638
2908/*----------------------------------------------------------------------*/ 3639/*----------------------------------------------------------------------*/
2909/* 3640/*
2910 * get input up until STRING TERMINATOR (or BEL) 3641 * get input up until STRING TERMINATOR (or BEL)
2911 * ends_how is terminator used. returned input must be free()d 3642 * ends_how is terminator used. returned input must be free()'d
2912 */ 3643 */
2913unsigned char * 3644char *
2914rxvt_term::get_to_st (unsigned char *ends_how) 3645rxvt_term::get_to_st (unicode_t &ends_how)
2915{ 3646{
2916 int seen_esc = 0; /* seen escape? */ 3647 unicode_t ch;
3648 bool seen_esc = false;
2917 unsigned int n = 0; 3649 unsigned int n = 0;
2918 unsigned char *s; 3650 wchar_t string[STRING_MAX];
2919 unsigned char ch, string[STRING_MAX];
2920 3651
2921 for (; (ch = cmd_getc ());) 3652 while ((ch = cmd_getc ()) != NOCHAR)
2922 { 3653 {
2923 if (ch == C0_BEL 3654 if (seen_esc)
2924 || ch == CHAR_ST 3655 {
2925 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3656 if (ch == 0x5c) /* 7bit ST */
2926 break; 3657 break;
3658 else
3659 return NULL;
3660 }
2927 if (ch == C0_ESC) 3661 else if (ch == C0_ESC)
2928 { 3662 {
2929 seen_esc = 1; 3663 seen_esc = true;
2930 continue; 3664 continue;
2931 } 3665 }
2932 else if (ch == '\t') 3666 else if (ch == C0_BEL || ch == CHAR_ST)
2933 ch = ' '; /* translate '\t' to space */ 3667 break;
2934 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3668 else if (ch < 0x20)
2935 return NULL; /* other control character - exit */ 3669 return NULL; /* other control character - exit */
2936 if (n < sizeof(string) - 1) 3670
3671 seen_esc = false;
3672
3673 if (n >= STRING_MAX - 1)
3674 // stop at some sane length
3675 return NULL;
3676
3677 if (ch == C0_SYN)
3678 string[n++] = cmd_get8 ();
3679 else
2937 string[n++] = ch; 3680 string[n++] = ch;
2938 seen_esc = 0;
2939 } 3681 }
3682
2940 string[n++] = '\0'; 3683 string[n++] = '\0';
2941 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3684
2942 return NULL;
2943 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3685 ends_how = (ch == 0x5c ? C0_ESC : ch);
2944 STRNCPY(s, string, n); 3686
2945 return s; 3687 return rxvt_wcstombs (string);
2946} 3688}
2947 3689
2948/*----------------------------------------------------------------------*/ 3690/*----------------------------------------------------------------------*/
2949/* 3691/*
2950 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3692 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2951 */ 3693 */
2952void 3694void
2953rxvt_term::process_dcs_seq () 3695rxvt_term::process_dcs_seq ()
2954{ 3696{
2955 unsigned char eh, *s; 3697 char *s;
3698 unicode_t eh;
3699
2956 /* 3700 /*
2957 * Not handled yet 3701 * Not handled yet
2958 */ 3702 */
2959 s = get_to_st (&eh); 3703 s = get_to_st (eh);
2960 if (s) 3704 if (s)
2961 free(s); 3705 free (s);
3706
2962 return; 3707 return;
2963} 3708}
2964 3709
2965/*----------------------------------------------------------------------*/ 3710/*----------------------------------------------------------------------*/
2966/* 3711/*
2967 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3712 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2968 */ 3713 */
2969void 3714void
2970rxvt_term::process_osc_seq () 3715rxvt_term::process_osc_seq ()
2971{ 3716{
2972 unsigned char ch, eh, *s; 3717 unicode_t ch, eh;
2973 int arg; 3718 int arg;
2974 3719
2975 ch = cmd_getc (); 3720 ch = cmd_getc ();
2976 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3721 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2977 arg = arg * 10 + (ch - '0'); 3722 arg = arg * 10 + (ch - '0');
2978 3723
2979 if (ch == ';') 3724 if (ch == ';')
2980 { 3725 {
2981 s = get_to_st (&eh); 3726 char *s = get_to_st (eh);
3727
2982 if (s) 3728 if (s)
2983 { 3729 {
2984 /*
2985 * rxvt_menubar_dispatch() violates the constness of the string,
2986 * so do it here
2987 */
2988 if (arg == XTerm_Menu)
2989#if 0 /* XXX: currently disabled due to security concerns */
2990 menubar_dispatch ((char *)s);
2991#else
2992 (void)0;
2993#endif
2994 else
2995 xterm_seq (arg, (char *)s, eh); 3730 process_xterm_seq (arg, s, eh);
2996 free(s); 3731 free (s);
2997 } 3732 }
3733 }
3734}
3735
3736void
3737rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3738{
3739 if (str[0] == '?' && !str[1])
2998 } 3740 {
3741 unsigned short r, g, b;
3742 pix_colors_focused[color].get (display, r, g, b);
3743 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3744 }
3745 else
3746 set_window_color (color, str);
2999} 3747}
3748
3000/* 3749/*
3001 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3750 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3002 * 0 = change iconName/title
3003 * 1 = change iconName
3004 * 2 = change title
3005 * 4 = change color
3006 * 12 = change text color
3007 * 13 = change mouse foreground color
3008 * 17 = change highlight character colour
3009 * 18 = change bold character color
3010 * 19 = change underlined character color
3011 * 46 = change logfile (not implemented)
3012 * 50 = change font
3013 *
3014 * rxvt extensions:
3015 * 10 = menu (may change in future)
3016 * 20 = bg pixmap
3017 * 39 = change default fg color
3018 * 49 = change default bg color
3019 * 55 = dump scrollback buffer and all of screen
3020 */ 3751 */
3021void 3752void
3022rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3753rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3023{ 3754{
3024 int changed = 0; 3755 int color;
3025 int color;
3026 char *buf, *name; 3756 char *buf, *name;
3757 bool query = str[0] == '?' && !str[1];
3758 int saveop = op;
3759 dDisp;
3027 3760
3028 assert(str != NULL); 3761 assert (str != NULL);
3029 switch (op) 3762 switch (op)
3030 { 3763 {
3031 case XTerm_name: 3764 case XTerm_name:
3032 set_title (str); 3765 set_title (str);
3033 /* FALLTHROUGH */ 3766 /* FALLTHROUGH */
3034 case XTerm_iconName: 3767 case XTerm_iconName:
3035 set_iconName (str); 3768 set_icon_name (str);
3036 break; 3769 break;
3037 case XTerm_title: 3770 case XTerm_title:
3038 set_title (str); 3771 set_title (str);
3039 break; 3772 break;
3773 case XTerm_property:
3774 if (str[0] == '?')
3775 {
3776 Atom prop = display->atom (str + 1);
3777 Atom actual_type;
3778 int actual_format;
3779 unsigned long nitems;
3780 unsigned long bytes_after;
3781 unsigned char *value = 0;
3782 const char *str = "";
3783
3784 if (prop
3785 && XGetWindowProperty (disp, parent[0],
3786 prop, 0, 1<<16, 0, AnyPropertyType,
3787 &actual_type, &actual_format,
3788 &nitems, &bytes_after, &value) == Success
3789 && actual_type != None
3790 && actual_format == 8)
3791 str = (const char *)(value);
3792
3793 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3794
3795 XFree (value);
3796 }
3797 else
3798 {
3799 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3800
3801 if (eq)
3802 {
3803 *eq = 0;
3804 set_utf8_property (display->atom (str), eq + 1);
3805 }
3806 else
3807 XDeleteProperty (disp, parent[0],
3808 display->atom (str));
3809 }
3810 break;
3811
3040 case XTerm_Color: 3812 case XTerm_Color:
3041 for (buf = (char *)str; buf && *buf;) 3813 for (buf = (char *)str; buf && *buf;)
3042 { 3814 {
3043 if ((name = STRCHR(buf, ';')) == NULL) 3815 if ((name = strchr (buf, ';')) == NULL)
3044 break; 3816 break;
3817
3045 *name++ = '\0'; 3818 *name++ = '\0';
3046 color = atoi(buf); 3819 color = atoi (buf) + minCOLOR;
3047 if (color < 0 || color >= TOTAL_COLORS) 3820
3821 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3048 break; 3822 break;
3823
3049 if ((buf = STRCHR(name, ';')) != NULL) 3824 if ((buf = strchr (name, ';')) != NULL)
3050 *buf++ = '\0'; 3825 *buf++ = '\0';
3826
3827 if (name[0] == '?' && !name[1])
3828 {
3829 unsigned short r, g, b;
3830 pix_colors_focused[color].get (display, r, g, b);
3831 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3832 }
3833 else
3051 set_window_color (color + minCOLOR, name); 3834 set_window_color (color, name);
3052 } 3835 }
3836 break;
3837 case XTerm_Color00:
3838 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3839 break;
3840 case XTerm_Color01:
3841 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3053 break; 3842 break;
3054#ifndef NO_CURSORCOLOR 3843#ifndef NO_CURSORCOLOR
3055 case XTerm_Color_cursor: 3844 case XTerm_Color_cursor:
3056 set_window_color (Color_cursor, str); 3845 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3057 break; 3846 break;
3058#endif 3847#endif
3059 case XTerm_Color_pointer: 3848 case XTerm_Color_pointer_fg:
3060 set_window_color (Color_pointer, str); 3849 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3850 break;
3851 case XTerm_Color_pointer_bg:
3852 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3061 break; 3853 break;
3062#ifndef NO_BOLD_UNDERLINE_REVERSE 3854#ifndef NO_BOLD_UNDERLINE_REVERSE
3063 case XTerm_Color_BD:
3064 set_window_color (Color_BD, str);
3065 break;
3066 case XTerm_Color_UL:
3067 set_window_color (Color_UL, str);
3068 break;
3069 case XTerm_Color_RV: 3855 case XTerm_Color_RV:
3070 set_window_color (Color_RV, str); 3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3071 break; 3857 break;
3858 case Rxvt_Color_BD:
3859 case URxvt_Color_BD:
3860 process_color_seq (op, Color_BD, str, resp);
3861 break;
3862 case Rxvt_Color_UL:
3863 case URxvt_Color_UL:
3864 process_color_seq (op, Color_UL, str, resp);
3865 break;
3866 case URxvt_Color_IT:
3867 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3868 break;
3072#endif 3869#endif
3870#if TRANSPARENT && TINTING
3871 case URxvt_Color_tint:
3872 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3873 check_our_parents ();
3874 if (am_transparent)
3875 want_full_refresh = want_refresh = 1;
3876 break;
3877#endif
3073 3878
3074 case XTerm_Menu: 3879 case Rxvt_Pixmap:
3075 /* 3880 {
3076 * rxvt_menubar_dispatch() violates the constness of the string,
3077 * so DON'T do it here
3078 */
3079 break;
3080 case XTerm_Pixmap:
3081 if (*str != ';') 3881 if (*str != ';')
3082 { 3882 {
3083#if XPM_BACKGROUND 3883#if XPM_BACKGROUND
3084 scale_pixmap (""); /* reset to default scaling */ 3884 scale_pixmap (""); /* reset to default scaling */
3085 set_bgPixmap (str); /* change pixmap */ 3885 set_bgPixmap (str); /* change pixmap */
3086#endif
3087 scr_touch (true); 3886 scr_touch (true);
3887#endif
3088 } 3888 }
3889
3890 int changed = 0;
3891
3089 while ((str = STRCHR(str, ';')) != NULL) 3892 while ((str = strchr (str, ';')) != NULL)
3090 { 3893 {
3091 str++; 3894 str++;
3092#if XPM_BACKGROUND 3895#if XPM_BACKGROUND
3093 changed += scale_pixmap (str); 3896 changed += scale_pixmap (str);
3094#endif 3897#endif
3095
3096 } 3898 }
3899
3097 if (changed) 3900 if (changed)
3098 { 3901 {
3099#ifdef XPM_BACKGROUND 3902#ifdef XPM_BACKGROUND
3100 resize_pixmap (); 3903 resize_pixmap ();
3101#endif
3102 scr_touch (true); 3904 scr_touch (true);
3905#endif
3103 } 3906 }
3907 }
3104 break; 3908 break;
3105 3909
3106 case XTerm_restoreFG: 3910 case Rxvt_restoreFG:
3107 set_window_color (Color_fg, str); 3911 set_window_color (Color_fg, str);
3108 break; 3912 break;
3109 case XTerm_restoreBG: 3913 case Rxvt_restoreBG:
3110 set_window_color (Color_bg, str); 3914 set_window_color (Color_bg, str);
3111 break; 3915 break;
3916
3112 case XTerm_logfile: 3917 case XTerm_logfile:
3918 // TODO, when secure mode?
3113 break; 3919 break;
3114 case XTerm_font: 3920
3115 change_font (0, str);
3116 break;
3117#if 0 3921#if 0
3118 case XTerm_dumpscreen: /* no error notices */ 3922 case Rxvt_dumpscreen: /* no error notices */
3119 { 3923 {
3120 int fd; 3924 int fd;
3121 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3925 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3122 { 3926 {
3123 scr_dump (fd); 3927 scr_dump (fd);
3124 close(fd); 3928 close (fd);
3125 } 3929 }
3126 } 3930 }
3127 break; 3931 break;
3128#endif 3932#endif
3933 case XTerm_font:
3934 op = URxvt_font;
3935 case URxvt_font:
3936#if ENABLE_STYLES
3937 case URxvt_boldFont:
3938 case URxvt_italicFont:
3939 case URxvt_boldItalicFont:
3940#endif
3941 if (query)
3942 tt_printf ("\33]%d;%-.250s%c", saveop,
3943 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3944 ? fontset[op - URxvt_font]->fontdesc : "",
3945 resp);
3946 else
3947 {
3948 const char *&res = rs[Rs_font + (op - URxvt_font)];
3129 3949
3950 res = strdup (str);
3951 allocated.push_back ((void *)res);
3952 set_fonts ();
3953 }
3954 break;
3955
3956#if ENABLE_FRILLS
3957 case URxvt_locale:
3958 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3960 else
3961 {
3962 set_locale (str);
3963 pty->set_utf8_mode (enc_utf8);
3964 init_xlocale ();
3965 }
3966 break;
3967
3968 case URxvt_view_up:
3969 case URxvt_view_down:
3970 {
3971 int lines = atoi (str);
3972
3973 if (lines)
3974 scr_page (op == URxvt_view_up ? UP : DN, lines);
3975 else
3976 scr_erase_savelines ();
3977 }
3978
3979 break;
3980#endif
3981
3982#if ENABLE_PERL
3983 case URxvt_perl:
3984 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3985 ; // no responses yet
3986 break;
3987#endif
3130 } 3988 }
3131} 3989}
3132/*----------------------------------------------------------------------*/ 3990/*----------------------------------------------------------------------*/
3133 3991
3134/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3992/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3142 * so no need for fancy checking 4000 * so no need for fancy checking
3143 */ 4001 */
3144int 4002int
3145rxvt_term::privcases (int mode, unsigned long bit) 4003rxvt_term::privcases (int mode, unsigned long bit)
3146{ 4004{
3147 int state; 4005 int state;
3148 4006
3149 if (mode == 's') 4007 if (mode == 's')
3150 { 4008 {
3151 SavedModes |= (PrivateModes & bit); 4009 SavedModes |= (priv_modes & bit);
3152 return -1; 4010 return -1;
3153 } 4011 }
3154 else 4012 else
3155 { 4013 {
3156 if (mode == 'r') 4014 if (mode == 'r')
3157 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4015 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3158 else 4016 else
3159 state = (mode == 't') ? !(PrivateModes & bit) : mode; 4017 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3160 PrivMode(state, bit); 4018 PrivMode (state, bit);
3161 } 4019 }
4020
3162 return state; 4021 return state;
3163} 4022}
3164 4023
3165/* we're not using priv _yet_ */ 4024/* we're not using priv _yet_ */
3166void 4025void
3167rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 4026rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3168{ 4027{
3169 unsigned int i, j; 4028 unsigned int i, j;
3170 int state; 4029 int state;
4030
3171 static const struct 4031 static const struct
3172 { 4032 {
3173 const int argval; 4033 const int argval;
3174 const unsigned long bit; 4034 const unsigned long bit;
3175 } 4035 }
4036
3176 argtopriv[] = { 4037 argtopriv[] = {
3177 { 1, PrivMode_aplCUR }, 4038 { 1, PrivMode_aplCUR },
3178 { 2, PrivMode_vt52 }, 4039 { 2, PrivMode_vt52 },
3179 { 3, PrivMode_132 }, 4040 { 3, PrivMode_132 },
3180 { 4, PrivMode_smoothScroll }, 4041 { 4, PrivMode_smoothScroll },
3181 { 5, PrivMode_rVideo }, 4042 { 5, PrivMode_rVideo },
3182 { 6, PrivMode_relOrigin }, 4043 { 6, PrivMode_relOrigin },
3183 { 7, PrivMode_Autowrap }, 4044 { 7, PrivMode_Autowrap },
4045 // 8, bi-directional support mode
3184 { 9, PrivMode_MouseX10 }, 4046 { 9, PrivMode_MouseX10 },
3185#ifdef menuBar_esc 4047 // 18, 19 printing-related
3186 { menuBar_esc, PrivMode_menuBar }, 4048 { 25, PrivMode_VisibleCursor },
3187#endif
3188#ifdef scrollBar_esc 4049#ifdef scrollBar_esc
3189 { scrollBar_esc, PrivMode_scrollBar }, 4050 { scrollBar_esc, PrivMode_scrollBar },
3190#endif 4051#endif
3191 { 25, PrivMode_VisibleCursor },
3192 { 35, PrivMode_ShiftKeys }, 4052 { 35, PrivMode_ShiftKeys }, // rxvt extension
3193 { 40, PrivMode_132OK }, 4053 { 40, PrivMode_132OK },
4054 // 41 xterm more fixes NYI
4055 // 45 margin bell NYI
4056 // 46 start logging
3194 { 47, PrivMode_Screen }, 4057 { 47, PrivMode_Screen },
3195 { 66, PrivMode_aplKP }, 4058 { 66, PrivMode_aplKP },
3196#ifndef NO_BACKSPACE_KEY 4059#ifndef NO_BACKSPACE_KEY
3197 { 67, PrivMode_BackSpace }, 4060 { 67, PrivMode_BackSpace },
3198#endif 4061#endif
3199 { 1000, PrivMode_MouseX11 }, 4062 { 1000, PrivMode_MouseX11 },
4063 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4064 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4065 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3200 { 1010, PrivMode_TtyOutputInh }, 4066 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3201 { 1011, PrivMode_Keypress }, 4067 { 1011, PrivMode_Keypress }, // rxvt extension
4068 // 1035 enable modifiers for alt, numlock NYI
4069 // 1036 send ESC for meta keys NYI
4070 // 1037 send DEL for keypad delete NYI
3202 { 1047, PrivMode_Screen }, 4071 { 1047, PrivMode_Screen },
4072 // 1048 save and restore cursor
3203 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4073 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4074 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3204 }; 4075 };
3205 4076
3206 if (nargs == 0) 4077 if (nargs == 0)
3207 return; 4078 return;
3208 4079
… …
3215 for (i = 0; i < nargs; i++) 4086 for (i = 0; i < nargs; i++)
3216 { 4087 {
3217 state = -1; 4088 state = -1;
3218 4089
3219 /* basic handling */ 4090 /* basic handling */
3220 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 4091 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3221 if (argtopriv[j].argval == arg[i]) 4092 if (argtopriv[j].argval == arg[i])
3222 { 4093 {
3223 state = privcases (mode, argtopriv[j].bit); 4094 state = privcases (mode, argtopriv[j].bit);
3224 break; 4095 break;
3225 } 4096 }
3226 4097
3227 /* extra handling for values with state unkept */ 4098 /* extra handling for values with state unkept */
3228 if (state == -1)
3229 switch (arg[i]) 4099 switch (arg[i])
3230 { 4100 {
4101#if ENABLE_STYLES
4102 case 1021:
4103 set_option (Opt_intensityStyles, mode);
4104
4105 scr_touch (true);
4106 break;
4107#endif
3231 case 1048: /* alternative cursor save */ 4108 case 1048: /* alternative cursor save */
4109 case 1049:
4110 if (OPTION (Opt_secondaryScreen))
3232 if (mode == 0) 4111 if (mode == 0)
3233 scr_cursor (RESTORE); 4112 scr_cursor (RESTORE);
3234 else if (mode == 1) 4113 else if (mode == 1)
3235 scr_cursor (SAVE); 4114 scr_cursor (SAVE);
3236 /* FALLTHROUGH */
3237 default:
3238 continue; /* for(;i;) */
3239 }
3240
3241 /* extra handling for values with valid 0 or 1 state */
3242 switch (arg[i])
3243 {
3244 /* case 1: - application cursor keys */
3245 case 2: /* VT52 mode */
3246 /* oddball mode. should be set regardless of set/reset
3247 * parameter. Return from VT52 mode with an ESC < from
3248 * within VT52 mode
3249 */
3250 PrivMode(1, PrivMode_vt52);
3251 break; 4115 break;
4116 }
4117
4118 if (state >= 0)
4119 /* extra handling for values with valid 0 or 1 state */
4120 switch (arg[i])
4121 {
4122 /* case 1: - application cursor keys */
4123 case 2: /* VT52 mode */
4124 /* oddball mode. should be set regardless of set/reset
4125 * parameter. Return from VT52 mode with an ESC < from
4126 * within VT52 mode
4127 */
4128 PrivMode (1, PrivMode_vt52);
4129 break;
3252 case 3: /* 80/132 */ 4130 case 3: /* 80/132 */
3253 if (PrivateModes & PrivMode_132OK) 4131 if (priv_modes & PrivMode_132OK)
3254 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 4132 set_widthheight (((state ? 132 : 80) * fwidth), height);
3255 (unsigned int)TermWin.height);
3256 break; 4133 break;
3257 case 4: /* smooth scrolling */ 4134 case 4: /* smooth scrolling */
3258 if (state)
3259 Options &= ~Opt_jumpScroll;
3260 else
3261 Options |= Opt_jumpScroll; 4135 set_option (Opt_jumpScroll, !state);
3262 break; 4136 break;
3263 case 5: /* reverse video */ 4137 case 5: /* reverse video */
3264 scr_rvideo_mode (state); 4138 scr_rvideo_mode (state);
3265 break; 4139 break;
3266 case 6: /* relative/absolute origins */ 4140 case 6: /* relative/absolute origins */
3267 scr_relative_origin (state); 4141 scr_relative_origin (state);
3268 break; 4142 break;
3269 case 7: /* autowrap */ 4143 case 7: /* autowrap */
3270 scr_autowrap (state); 4144 scr_autowrap (state);
3271 break; 4145 break;
3272 /* case 8: - auto repeat, can't do on a per window basis */ 4146 /* case 8: - auto repeat, can't do on a per window basis */
3273 case 9: /* X10 mouse reporting */ 4147 case 9: /* X10 mouse reporting */
3274 if (state) /* orthogonal */ 4148 if (state) /* orthogonal */
3275 PrivateModes &= ~(PrivMode_MouseX11); 4149 priv_modes &= ~PrivMode_MouseX11;
3276 break; 4150 break;
3277#ifdef menuBar_esc
3278 case menuBar_esc:
3279#ifdef MENUBAR
3280 map_menuBar (state);
3281#endif
3282 break;
3283#endif
3284#ifdef scrollBar_esc 4151#ifdef scrollBar_esc
3285 case scrollBar_esc: 4152 case scrollBar_esc:
3286 if (scrollbar_mapping (state)) 4153 if (scrollbar_mapping (state))
3287 { 4154 {
3288 resize_all_windows (0, 0, 0); 4155 resize_all_windows (0, 0, 0);
3289 scr_touch (true); 4156 scr_touch (true);
3290 } 4157 }
3291 break; 4158 break;
3292#endif 4159#endif
3293 case 25: /* visible/invisible cursor */ 4160 case 25: /* visible/invisible cursor */
3294 scr_cursor_visible (state); 4161 scr_cursor_visible (state);
3295 break; 4162 break;
3296 /* case 35: - shift keys */ 4163 /* case 35: - shift keys */
3297 /* case 40: - 80 <--> 132 mode */ 4164 /* case 40: - 80 <--> 132 mode */
3298 case 47: /* secondary screen */ 4165 case 47: /* secondary screen */
3299 scr_change_screen (state); 4166 scr_change_screen (state);
3300 break; 4167 break;
3301 /* case 66: - application key pad */ 4168 /* case 66: - application key pad */
3302 /* case 67: - backspace key */ 4169 /* case 67: - backspace key */
3303 case 1000: /* X11 mouse reporting */ 4170 case 1000: /* X11 mouse reporting */
3304 if (state) /* orthogonal */ 4171 if (state) /* orthogonal */
3305 PrivateModes &= ~(PrivMode_MouseX10); 4172 priv_modes &= ~PrivMode_MouseX10;
3306 break; 4173 break;
3307#if 0 4174#if 0
3308 case 1001: 4175 case 1001:
3309 break; /* X11 mouse highlighting */ 4176 break; /* X11 mouse highlighting */
3310#endif 4177#endif
3311 case 1010: /* scroll to bottom on TTY output inhibit */ 4178 case 1010: /* scroll to bottom on TTY output inhibit */
3312 if (state)
3313 Options &= ~Opt_scrollTtyOutput;
3314 else
3315 Options |= Opt_scrollTtyOutput; 4179 set_option (Opt_scrollTtyOutput, !state);
3316 break; 4180 break;
3317 case 1011: /* scroll to bottom on key press */ 4181 case 1011: /* scroll to bottom on key press */
3318 if (state)
3319 Options |= Opt_scrollTtyKeypress; 4182 set_option (Opt_scrollTtyKeypress, state);
3320 else
3321 Options &= ~Opt_scrollTtyKeypress;
3322 break; 4183 break;
3323 case 1047: /* secondary screen w/ clearing */ 4184 case 1047: /* secondary screen w/ clearing last */
3324 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4185 if (OPTION (Opt_secondaryScreen))
3325 if (current_screen != PRIMARY) 4186 if (current_screen != PRIMARY)
3326 scr_erase_screen (2); 4187 scr_erase_screen (2);
3327 scr_change_screen (state); 4188 scr_change_screen (state);
3328 /* FALLTHROUGH */
3329 default:
3330 break; 4189 break;
4190 case 1049: /* secondary screen w/ clearing first */
4191 scr_change_screen (state);
4192 if (OPTION (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY)
4194 scr_erase_screen (2);
4195 break;
4196 default:
4197 break;
3331 } 4198 }
3332 } 4199 }
3333} 4200}
3334/*}}} */ 4201/*}}} */
3335 4202
3336/*{{{ process sgr sequences */ 4203/*{{{ process sgr sequences */
3337void 4204void
3338rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4205rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3339{ 4206{
3340 unsigned int i; 4207 unsigned int i;
3341 short rendset; 4208 short rendset;
3342 int rendstyle; 4209 int rendstyle;
3343 4210
3344 if (nargs == 0) 4211 if (nargs == 0)
3345 { 4212 {
3346 scr_rendition (0, ~RS_None); 4213 scr_rendition (0, ~RS_None);
3347 return; 4214 return;
3348 } 4215 }
4216
3349 for (i = 0; i < nargs; i++) 4217 for (i = 0; i < nargs; i++)
3350 { 4218 {
3351 rendset = -1; 4219 rendset = -1;
3352 switch (arg[i]) 4220 switch (arg[i])
3353 { 4221 {
… …
3355 rendset = 0, rendstyle = ~RS_None; 4223 rendset = 0, rendstyle = ~RS_None;
3356 break; 4224 break;
3357 case 1: 4225 case 1:
3358 rendset = 1, rendstyle = RS_Bold; 4226 rendset = 1, rendstyle = RS_Bold;
3359 break; 4227 break;
4228 //case 2: // low intensity
4229 case 3:
4230 rendset = 1, rendstyle = RS_Italic;
4231 break;
3360 case 4: 4232 case 4:
3361 rendset = 1, rendstyle = RS_Uline; 4233 rendset = 1, rendstyle = RS_Uline;
3362 break; 4234 break;
3363 case 5: 4235 case 5: // slowly blinking
4236 case 6: // rapidly blinking
3364 rendset = 1, rendstyle = RS_Blink; 4237 rendset = 1, rendstyle = RS_Blink;
3365 break; 4238 break;
4239 //case 6: // scoansi light background
3366 case 7: 4240 case 7:
3367 rendset = 1, rendstyle = RS_RVid; 4241 rendset = 1, rendstyle = RS_RVid;
3368 break; 4242 break;
3369 case 22: 4243 case 8:
4244 // invisible. NYI
4245 break;
4246 //case 9: // crossed out
4247 //case 10: // scoansi acs off, primary font
4248 //case 11: // scoansi acs on, first alt font
4249 //case 12: // scoansi acs on, |0x80, second alt font
4250 //...
4251 //case 19: // ninth alt font
4252 //case 20: // gothic
4253 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3370 rendset = 0, rendstyle = RS_Bold; 4254 rendset = 0, rendstyle = RS_Bold;
4255 break;
4256 case 22: // normal intensity
4257 rendset = 0, rendstyle = RS_Bold;
4258 break;
4259 case 23: // disable italic
4260 rendset = 0, rendstyle = RS_Italic;
3371 break; 4261 break;
3372 case 24: 4262 case 24:
3373 rendset = 0, rendstyle = RS_Uline; 4263 rendset = 0, rendstyle = RS_Uline;
3374 break; 4264 break;
3375 case 25: 4265 case 25:
3376 rendset = 0, rendstyle = RS_Blink; 4266 rendset = 0, rendstyle = RS_Blink;
3377 break; 4267 break;
4268 case 26: // variable spacing (iso 8613)
4269 rendset = 0, rendstyle = RS_Blink;
4270 break;
3378 case 27: 4271 case 27:
3379 rendset = 0, rendstyle = RS_RVid; 4272 rendset = 0, rendstyle = RS_RVid;
3380 break; 4273 break;
4274 //case 28: // visible. NYI
4275 //case 29: // not crossed-out
3381 } 4276 }
4277
3382 if (rendset != -1) 4278 if (rendset != -1)
3383 { 4279 {
3384 scr_rendition (rendset, rendstyle); 4280 scr_rendition (rendset, rendstyle);
3385 continue; /* for(;i;) */ 4281 continue; /* for (;i;) */
3386 } 4282 }
3387 4283
3388 switch (arg[i]) 4284 switch (arg[i])
3389 { 4285 {
3390 case 30: 4286 case 30:
… …
3393 case 33: 4289 case 33:
3394 case 34: 4290 case 34:
3395 case 35: 4291 case 35:
3396 case 36: 4292 case 36:
3397 case 37: 4293 case 37:
3398 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 4294 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3399 Color_fg);
3400 break; 4295 break;
3401#ifdef TTY_256COLOR 4296 case 38: // set fg color, ISO 8613-6
3402 case 38:
3403 if (nargs > i + 2 && arg[i + 1] == 5) 4297 if (nargs > i + 2 && arg[i + 1] == 5)
3404 { 4298 {
3405 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 4299 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3406 Color_fg);
3407 i += 2; 4300 i += 2;
3408 } 4301 }
3409 break; 4302 break;
3410#endif
3411 case 39: /* default fg */ 4303 case 39: /* default fg */
3412 scr_color (Color_fg, Color_fg); 4304 scr_color (Color_fg, Color_fg);
3413 break; 4305 break;
3414 4306
3415 case 40: 4307 case 40:
… …
3418 case 43: 4310 case 43:
3419 case 44: 4311 case 44:
3420 case 45: 4312 case 45:
3421 case 46: 4313 case 46:
3422 case 47: 4314 case 47:
3423 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 4315 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3424 Color_bg);
3425 break; 4316 break;
3426#ifdef TTY_256COLOR 4317 case 48: // set bg color, ISO 8613-6
3427 case 48:
3428 if (nargs > i + 2 && arg[i + 1] == 5) 4318 if (nargs > i + 2 && arg[i + 1] == 5)
3429 { 4319 {
3430 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 4320 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3431 Color_bg);
3432 i += 2; 4321 i += 2;
3433 } 4322 }
3434 break; 4323 break;
3435#endif
3436 case 49: /* default bg */ 4324 case 49: /* default bg */
3437 scr_color (Color_bg, Color_bg); 4325 scr_color (Color_bg, Color_bg);
3438 break; 4326 break;
3439 4327
3440#ifndef NO_BRIGHTCOLOR 4328 //case 50: // not variable spacing
4329
4330#if ENABLE_FRILLS
3441 case 90: 4331 case 90:
3442 case 91: /* set bright fg color */ 4332 case 91: /* set bright fg color */
3443 case 92: 4333 case 92:
3444 case 93: 4334 case 93:
3445 case 94: 4335 case 94:
3446 case 95: 4336 case 95:
3447 case 96: 4337 case 96:
3448 case 97: 4338 case 97:
3449 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 4339 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3450 Color_fg);
3451 break; 4340 break;
3452 case 100: 4341 case 100:
3453 case 101: /* set bright bg color */ 4342 case 101: /* set bright bg color */
3454 case 102: 4343 case 102:
3455 case 103: 4344 case 103:
3456 case 104: 4345 case 104:
3457 case 105: 4346 case 105:
3458 case 106: 4347 case 106:
3459 case 107: 4348 case 107:
3460 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 4349 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3461 Color_bg);
3462 break; 4350 break;
3463#endif 4351#endif
3464
3465 } 4352 }
3466 } 4353 }
3467} 4354}
3468/*}}} */ 4355/*}}} */
3469 4356
3470/*{{{ process Rob Nation's own graphics mode sequences */ 4357/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3471void 4358void
3472rxvt_term::process_graphics () 4359rxvt_term::process_graphics ()
3473{ 4360{
3474 unsigned char ch, cmd = cmd_getc (); 4361 unicode_t ch, cmd = cmd_getc ();
3475 4362
3476#ifndef RXVT_GRAPHICS
3477 if (cmd == 'Q') 4363 if (cmd == 'Q')
3478 { /* query graphics */ 4364 { /* query graphics */
3479 tt_printf("\033G0\n"); /* no graphics */ 4365 tt_printf ("\033G0\012"); /* no graphics */
3480 return; 4366 return;
3481 } 4367 }
3482 /* swallow other graphics sequences until terminating ':' */ 4368 /* swallow other graphics sequences until terminating ':' */
3483 do 4369 do
3484 ch = cmd_getc (); 4370 ch = cmd_getc ();
3485 while (ch != ':'); 4371 while (ch != ':');
3486#else
3487 unsigned int nargs;
3488 int args[NGRX_PTS];
3489 unsigned char *text = NULL;
3490
3491 if (cmd == 'Q')
3492 { /* query graphics */
3493 tt_printf("\033G1\n"); /* yes, graphics (color) */
3494 return;
3495 }
3496 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3497 {
3498 int neg;
3499
3500 ch = cmd_getc ();
3501 neg = (ch == '-');
3502 if (neg || ch == '+')
3503 ch = cmd_getc ();
3504
3505 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3506 args[nargs] = args[nargs] * 10 + (ch - '0');
3507 if (neg)
3508 args[nargs] = -args[nargs];
3509
3510 nargs++;
3511 args[nargs] = 0;
3512 if (ch != ';')
3513 break;
3514 }
3515
3516 if ((cmd == 'T') && (nargs >= 5))
3517 {
3518 int i, len = args[4];
3519
3520 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3521
3522 if (text != NULL)
3523 {
3524 for (i = 0; i < len; i++)
3525 text[i] = cmd_getc ();
3526 text[len] = '\0';
3527 }
3528 }
3529 Gr_do_graphics (cmd, nargs, args, text);
3530#endif
3531} 4372}
3532/*}}} */ 4373/*}}} */
3533 4374
3534/* ------------------------------------------------------------------------- */ 4375/* ------------------------------------------------------------------------- */
3535 4376
3536/* 4377/*
3537 * Send printf() formatted output to the command. 4378 * Send printf () formatted output to the command.
3538 * Only use for small amounts of data. 4379 * Only use for small amounts of data.
3539 */ 4380 */
3540void 4381void
3541rxvt_term::tt_printf (const char *fmt,...) 4382rxvt_term::tt_printf (const char *fmt,...)
3542{ 4383{
3543 va_list arg_ptr; 4384 va_list arg_ptr;
3544 unsigned char buf[256]; 4385 char buf[256];
3545 4386
3546 va_start (arg_ptr, fmt); 4387 va_start (arg_ptr, fmt);
3547 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4388 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3548 va_end (arg_ptr); 4389 va_end (arg_ptr);
3549 tt_write (buf, STRLEN (buf)); 4390 tt_write (buf, strlen (buf));
3550} 4391}
3551 4392
3552/* ---------------------------------------------------------------------- */ 4393/* ---------------------------------------------------------------------- */
3553/* Write data to the pty as typed by the user, pasted with the mouse, 4394/* Write data to the pty as typed by the user, pasted with the mouse,
3554 * or generated by us in response to a query ESC sequence. 4395 * or generated by us in response to a query ESC sequence.
3555 */ 4396 */
4397const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4398
3556void 4399void
3557rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4400rxvt_term::tt_write (const char *data, unsigned int len)
3558{ 4401{
3559 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4402 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4403 return;
3560 4404
3561 if (len) 4405 if (pty->pty < 0)
4406 return;
4407
4408 if (v_buflen == 0)
4409 {
4410 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4411
4412 if ((unsigned int)written == len)
4413 return;
4414
4415 data += written;
4416 len -= written;
3562 { 4417 }
4418
4419 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4420
4421 memcpy (v_buffer + v_buflen, data, len);
4422 v_buflen += len;
4423
4424 pty_ev.set (EVENT_READ | EVENT_WRITE);
4425}
4426
4427void rxvt_term::pty_write ()
4428{
4429 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4430
4431 if (written > 0)
4432 {
4433 v_buflen -= written;
4434
3563 if (v_buflen == 0) 4435 if (v_buflen == 0)
3564 { 4436 {
3565 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3566
3567 if ((unsigned int)written == len)
3568 return;
3569
3570 data += written;
3571 len -= written;
3572 }
3573
3574
3575 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3576
3577 memcpy (v_buffer + v_buflen, data, len);
3578 v_buflen += len;
3579 }
3580
3581 for (;;)
3582 {
3583 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3584
3585 if (written > 0)
3586 {
3587 v_buflen -= written;
3588
3589 if (v_buflen == 0)
3590 {
3591 free (v_buffer); 4437 free (v_buffer);
3592 v_buffer = 0; 4438 v_buffer = 0;
3593 v_buflen = 0; 4439 v_buflen = 0;
3594 4440
3595 pty_ev.set (EVENT_READ); 4441 pty_ev.set (EVENT_READ);
3596 return;
3597 }
3598
3599 memmove (v_buffer, v_buffer + written, v_buflen);
3600 }
3601 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3602 // original code just ignores this...
3603 destroy ();
3604 else
3605 {
3606 pty_ev.set (EVENT_READ | EVENT_WRITE);
3607 return; 4442 return;
3608 } 4443 }
4444
4445 memmove (v_buffer, v_buffer + written, v_buflen);
3609 } 4446 }
4447 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4448 pty_ev.set (EVENT_READ);
3610} 4449}
3611 4450
3612/*----------------------- end-of-file (C source) -----------------------*/ 4451/*----------------------- end-of-file (C source) -----------------------*/
3613 4452

Diff Legend

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