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.56 by pcg, Tue Feb 24 00:02:44 2004 UTC vs.
Revision 1.272 by root, Thu Jan 19 16:22:12 2006 UTC

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

Diff Legend

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