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

Diff Legend

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