ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.39 by pcg, Mon Feb 9 07:15:46 2004 UTC vs.
Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC

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

Diff Legend

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