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

Diff Legend

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