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.57 by pcg, Tue Feb 24 16:25: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;
699 932
700 if (n > 0 && s < count) 933 if (n > 0 && s < count)
701 { 934 {
702 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 935 memmove (cmdbuf_base, cmdbuf_ptr,
703 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 936 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
704 cmdbuf_ptr = cmdbuf_base; 937 cmdbuf_ptr = cmdbuf_base;
705 cmdbuf_endp -= n; 938 cmdbuf_endp -= n;
706 s += n; 939 s += n;
707 } 940 }
708 941
709 if (count > s) 942 if (count > s)
710 { 943 {
711 rxvt_print_error ("data loss: cmd_write too large"); 944 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
712 count = s; 945 count = s;
713 } 946 }
714 947
715 for (; count--;) 948 for (; count--;)
716 *cmdbuf_endp++ = *str++; 949 *cmdbuf_endp++ = *str++;
717 950
718 cmd_parse (); 951 cmd_parse ();
719 952
720 return 0; 953 return 0;
721} 954}
722#endif /* MENUBAR_MAX */ 955#endif
723 956
724void 957void
725rxvt_term::flush () 958rxvt_term::flush ()
726{ 959{
960 flush_ev.stop ();
961
727#ifdef TRANSPARENT 962#ifdef TRANSPARENT
728 if (want_full_refresh) 963 if (want_full_refresh)
729 { 964 {
730 want_full_refresh = 0; 965 want_full_refresh = 0;
731 scr_clear (); 966 scr_clear ();
732 scr_touch (false); 967 scr_touch (false);
733 want_refresh = 1;
734 } 968 }
735#endif 969#endif
736 970
737 if (want_refresh) 971 if (want_refresh)
738 { 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
739 scr_refresh (refresh_type); 1011 scr_refresh ();
740 scrollbar_show (1); 1012 scrollbar_show (1);
741#ifdef USE_XIM 1013#ifdef USE_XIM
742 IMSendSpot (); 1014 IMSendSpot ();
743#endif 1015#endif
744
745 } 1016 }
746 1017
747 display->flush (); 1018 display->flush ();
748} 1019}
749 1020
750void 1021void
751rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
752{ 1023{
753 SET_R (this); 1024 make_current ();
754 SET_LOCALE (locale);
755 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;
756 flush (); 1039 flush ();
757} 1040}
758 1041
759#ifdef CURSOR_BLINK 1042#ifdef CURSOR_BLINK
760void 1043void
… …
778 w.start (w.at + TEXT_BLINK_INTERVAL); 1061 w.start (w.at + TEXT_BLINK_INTERVAL);
779 } 1062 }
780} 1063}
781#endif 1064#endif
782 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
783bool 1127bool
784rxvt_term::pty_fill () 1128rxvt_term::pty_fill ()
785{ 1129{
786 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 }
787 1137
788 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
789 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
790 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
791 1141
792 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
793 1143
794 if (n > 0) 1144 if (r > 0)
795 { 1145 {
796 cmdbuf_endp += n; 1146 cmdbuf_endp += r;
797 return true; 1147 return true;
798 } 1148 }
799 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))
800 destroy (); 1161 destroy ();
1162 }
801 1163
802 return false; 1164 return false;
803} 1165}
804 1166
805void 1167void
806rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
807{ 1169{
808 SET_R (this); 1170 make_current ();
809 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;
810 1177
811 if (revents & EVENT_WRITE) 1178 if (revents & EVENT_WRITE)
812 tt_write (0, 0); 1179 pty_write ();
813 else if (revents & EVENT_READ)
814 {
815 bool flag = true;
816
817 // loop, but don't allow a single term to monopolize us
818 // the number of loops is fully arbitrary, and thus wrong
819 while (flag && pty_fill ())
820 {
821 if (!seen_input)
822 {
823 seen_input = 1;
824 /* once we know the shell is running, send the screen size. Again! */
825 tt_winch ();
826 }
827
828 if (cmd_parse ())
829 break;
830 }
831 }
832} 1180}
833 1181
834bool 1182void
835rxvt_term::cmd_parse () 1183rxvt_term::pointer_unblank ()
836{ 1184{
837 bool flag = false; 1185 XDefineCursor (display->display, vt, TermWin_cursor);
838 uint32_t ch = NOCHAR; 1186 recolour_cursor ();
839 1187
840 for (;;) 1188#ifdef POINTER_BLANK
841 { 1189 hidden_pointer = 0;
842 if (ch == NOCHAR)
843 ch = next_char ();
844 1190
845 if (ch == NOCHAR) // TODO: improve 1191 if (OPTION (Opt_pointerBlank))
846 break; 1192 pointer_ev.start (NOW + pointerBlankDelay);
847 1193#endif
848 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
849 {
850 /* Read a text string from the input buffer */
851 uint32_t buf[BUFSIZ];
852 bool refreshnow = false;
853 int nlines = 0;
854 uint32_t *str = buf;
855
856 *str++ = ch;
857
858 for (;;)
859 {
860 ch = next_char ();
861
862 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
863 break;
864 else
865 {
866 *str++ = ch;
867
868 if (ch == '\n')
869 {
870 nlines++;
871 refresh_count++;
872
873 if (! (Options & Opt_jumpScroll)
874 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
875 {
876 refreshnow = true;
877 flag = false;
878 ch = NOCHAR;
879 break;
880 }
881
882 // scr_add_lines only works for nlines < TermWin.nrow - 1.
883 if (nlines >= TermWin.nrow - 1)
884 {
885 scr_add_lines (buf, nlines, str - buf);
886 nlines = 0;
887 str = buf;
888 }
889 }
890
891 if (str >= buf + BUFSIZ)
892 {
893 ch = NOCHAR;
894 break;
895 }
896 }
897 }
898
899 scr_add_lines (buf, nlines, str - buf);
900
901 /*
902 * If there have been a lot of new lines, then update the screen
903 * What the heck I'll cheat and only refresh less than every page-full.
904 * the number of pages between refreshes is refresh_limit, which
905 * is incremented here because we must be doing flat-out scrolling.
906 *
907 * refreshing should be correct for small scrolls, because of the
908 * time-out
909 */
910 if (refreshnow)
911 {
912 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
913 refresh_limit++;
914
915 scr_refresh (refresh_type);
916 }
917
918 }
919 else
920 {
921 switch (ch)
922 {
923 default:
924 process_nonprinting (ch);
925 break;
926 case C0_ESC: /* escape char */
927 process_escape_seq ();
928 break;
929 /*case 0x9b: */ /* CSI */
930 /* process_csi_seq (); */
931 }
932
933 ch = NOCHAR;
934 }
935 }
936
937 return flag;
938}
939
940// read the next character, currently handles UTF-8
941// will probably handle all sorts of other stuff in the future
942uint32_t
943rxvt_term::next_char ()
944{
945 while (cmdbuf_ptr < cmdbuf_endp)
946 {
947 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
948 return *cmdbuf_ptr++;
949
950 wchar_t wc;
951 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
952
953 if (len == (size_t)-2)
954 return NOCHAR;
955
956 if (len == (size_t)-1)
957 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
958
959 // assume wchar == unicode
960 cmdbuf_ptr += len;
961 return wc;
962 }
963
964 return NOCHAR;
965}
966
967/* rxvt_cmd_getc () - Return next input character */
968/*
969 * Return the next input character after first passing any keyboard input
970 * to the command.
971 */
972uint32_t
973rxvt_term::cmd_getc ()
974{
975 for (;;)
976 {
977 uint32_t c = next_char ();
978 if (c != NOCHAR)
979 return c;
980
981 // incomplete sequences should occur rarely, still, a better solution
982 // would be preferred. either setjmp/longjmp or better design.
983 fcntl (cmd_fd, F_SETFL, 0);
984 pty_fill ();
985 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
986 }
987} 1194}
988 1195
989#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
990void 1197void
991rxvt_term::pointer_unblank ()
992{
993 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
994 recolour_cursor ();
995
996 hidden_pointer = 0;
997
998 if (Options & Opt_pointerBlank)
999 pointer_ev.start (NOW + pointerBlankDelay);
1000}
1001
1002void
1003rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
1004{ 1199{
1005 if (! (Options & Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
1006 return; 1201 return;
1007 1202
1008 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
1009 XFlush (display->display); 1204 XFlush (display->display);
1010 1205
1011 hidden_pointer = 1; 1206 hidden_pointer = 1;
1012} 1207}
1013 1208
1014void 1209void
1015rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1016{ 1211{
1017 SET_R (this); 1212 make_current ();
1018 SET_LOCALE (locale);
1019 1213
1020 pointer_blank (); 1214 pointer_blank ();
1021} 1215}
1022#endif 1216#endif
1023 1217
… …
1030 x = ev.x; 1224 x = ev.x;
1031 y = ev.y; 1225 y = ev.y;
1032 pixel_position (&x, &y); 1226 pixel_position (&x, &y);
1033 1227
1034 if (MEvent.button == AnyButton) 1228 if (MEvent.button == AnyButton)
1035 {
1036 button_number = 3; 1229 button_number = 3;
1037 }
1038 else 1230 else
1039 { 1231 {
1040 button_number = MEvent.button - Button1; 1232 button_number = MEvent.button - Button1;
1041 /* add 0x3D for wheel events, like xterm does */ 1233 /* add 0x3D for wheel events, like xterm does */
1042 if (button_number >= 3) 1234 if (button_number >= 3)
1043 button_number += (64 - 3); 1235 button_number += (64 - 3);
1044 } 1236 }
1045 1237
1046 if (PrivateModes & PrivMode_MouseX10) 1238 if (priv_modes & PrivMode_MouseX10)
1047 { 1239 {
1048 /* 1240 /*
1049 * do not report ButtonRelease 1241 * do not report ButtonRelease
1050 * no state info allowed 1242 * no state info allowed
1051 */ 1243 */
… …
1066 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1258 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1067 + ((MEvent.state & ControlMask) ? 16 : 0); 1259 + ((MEvent.state & ControlMask) ? 16 : 0);
1068#ifdef MOUSE_REPORT_DOUBLECLICK 1260#ifdef MOUSE_REPORT_DOUBLECLICK
1069 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1261 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1070#endif 1262#endif
1071
1072 } 1263 }
1073 1264
1074#ifdef DEBUG_MOUSEREPORT 1265#if DEBUG_MOUSEREPORT
1075 fprintf (stderr, "Mouse ["); 1266 fprintf (stderr, "Mouse [");
1076 if (key_state & 16) 1267 if (key_state & 16)
1077 fputc ('C', stderr); 1268 fputc ('C', stderr);
1078 if (key_state & 4) 1269 if (key_state & 4)
1079 fputc ('S', stderr); 1270 fputc ('S', stderr);
… …
1083 fputc ('2', stderr); 1274 fputc ('2', stderr);
1084 fprintf (stderr, "]: <%d>, %d/%d\n", 1275 fprintf (stderr, "]: <%d>, %d/%d\n",
1085 button_number, 1276 button_number,
1086 x + 1, 1277 x + 1,
1087 y + 1); 1278 y + 1);
1088#else 1279#endif
1280
1089 tt_printf ("\033[M%c%c%c", 1281 tt_printf ("\033[M%c%c%c",
1090 (32 + button_number + key_state), 1282 (32 + button_number + key_state),
1091 (32 + x + 1), 1283 (32 + x + 1),
1092 (32 + y + 1)); 1284 (32 + y + 1));
1093#endif
1094} 1285}
1095 1286
1096#ifdef USING_W11LIB 1287#ifdef USING_W11LIB
1097void 1288void
1098rxvt_W11_process_x_event (XEvent *ev) 1289rxvt_W11_process_x_event (XEvent *ev)
… …
1105 1296
1106/*{{{ process an X event */ 1297/*{{{ process an X event */
1107void 1298void
1108rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1109{ 1300{
1110 SET_R (this); 1301 make_current ();
1111 SET_LOCALE (locale);
1112 1302
1113#if defined(CURSOR_BLINK) 1303 dDisp;
1114 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1115 {
1116 if (hidden_cursor)
1117 {
1118 hidden_cursor = 0;
1119 want_refresh = 1;
1120 }
1121 1304
1122 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1305 if (ev.xany.window == vt
1123 } 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1124#endif 1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1125
1126#if defined(POINTER_BLANK)
1127 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1128 {
1129 if (ev.type == MotionNotify
1130 || ev.type == ButtonPress
1131 || ev.type == ButtonRelease)
1132 if (hidden_pointer)
1133 pointer_unblank ();
1134
1135 if (ev.type == KeyPress && hidden_pointer == 0)
1136 pointer_blank ();
1137 }
1138#endif
1139
1140#ifdef USE_XIM
1141 if (XFilterEvent (&ev, None))
1142 return; 1308 return;
1143#endif
1144 1309
1310 // for XQueryPointer
1145 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1146 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1147 unsigned int unused_mask; 1313 unsigned int unused_mask;
1148
1149#ifdef DEBUG_X
1150 const char *const eventnames[] =
1151 { /* mason - this matches my system */
1152 "",
1153 "",
1154 "KeyPress",
1155 "KeyRelease",
1156 "ButtonPress",
1157 "ButtonRelease",
1158 "MotionNotify",
1159 "EnterNotify",
1160 "LeaveNotify",
1161 "FocusIn",
1162 "FocusOut",
1163 "KeymapNotify",
1164 "Expose",
1165 "GraphicsExpose",
1166 "NoExpose",
1167 "VisibilityNotify",
1168 "CreateNotify",
1169 "DestroyNotify",
1170 "UnmapNotify",
1171 "MapNotify",
1172 "MapRequest",
1173 "ReparentNotify",
1174 "ConfigureNotify",
1175 "ConfigureRequest",
1176 "GravityNotify",
1177 "ResizeRequest",
1178 "CirculateNotify",
1179 "CirculateRequest",
1180 "PropertyNotify",
1181 "SelectionClear",
1182 "SelectionRequest",
1183 "SelectionNotify",
1184 "ColormapNotify",
1185 "ClientMessage",
1186 "MappingNotify"
1187 };
1188#endif
1189
1190#ifdef DEBUG_X
1191 struct timeval tp;
1192 struct tm *ltt;
1193 (void)gettimeofday (&tp, NULL);
1194 ltt = localtime (& (tp.tv_sec));
1195 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));
1196#endif
1197 1314
1198 switch (ev.type) 1315 switch (ev.type)
1199 { 1316 {
1200 case KeyPress: 1317 case KeyPress:
1318#if ISO_14755
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1201 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)))
1202 break; 1389 break;
1203 1390
1204#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1205 case KeyRelease:
1206 {
1207 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)
1208 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1209 else 1396#endif
1210 {
1211 KeySym ks;
1212
1213 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1214 if (ks == XK_Control_L || ks == XK_Control_R)
1215 mouse_slip_wheel_speed = 0;
1216 }
1217 break; 1397 break;
1218 } 1398 }
1219#endif
1220 1399
1221 case ButtonPress: 1400 case ButtonPress:
1222 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1223 break; 1402 break;
1224 1403
… …
1226 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1227 break; 1406 break;
1228 1407
1229 case ClientMessage: 1408 case ClientMessage:
1230 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1231 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1232 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
1233#ifdef OFFIX_DND 1430#ifdef OFFIX_DND
1234 /* OffiX Dnd (drag 'n' drop) protocol */ 1431 /* OffiX Dnd (drag 'n' drop) protocol */
1235 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1236 && (ev.xclient.data.l[0] == DndFile 1433 && (ev.xclient.data.l[0] == DndFile
1237 || ev.xclient.data.l[0] == DndDir 1434 || ev.xclient.data.l[0] == DndDir
1238 || ev.xclient.data.l[0] == DndLink)) 1435 || ev.xclient.data.l[0] == DndLink))
1239 { 1436 {
1240 /* Get Dnd data */ 1437 /* Get Dnd data */
1241 Atom ActualType; 1438 Atom ActualType;
1242 int ActualFormat; 1439 int ActualFormat;
1243 unsigned char *data; 1440 unsigned char *data;
1244 unsigned long Size, RemainingBytes; 1441 unsigned long Size, RemainingBytes;
1245 1442
1246 XGetWindowProperty (display->display, display->root, 1443 XGetWindowProperty (disp, display->root,
1247 xa[XA_DNDSELECTION], 1444 xa[XA_DNDSELECTION],
1248 0L, 1000000L, 1445 0L, 1000000L,
1249 False, AnyPropertyType, 1446 False, AnyPropertyType,
1250 &ActualType, &ActualFormat, 1447 &ActualType, &ActualFormat,
1251 &Size, &RemainingBytes, 1448 &Size, &RemainingBytes,
1252 &data); 1449 &data);
1253 XChangeProperty (display->display, display->root, 1450 set_string_property (XA_CUT_BUFFER0, data);
1254 XA_CUT_BUFFER0, XA_STRING, 1451 XFree (data);
1255 8, PropModeReplace,
1256 data, STRLEN (data));
1257 selection_paste (display->root, XA_CUT_BUFFER0, True); 1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1258 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1259 } 1454 }
1260#endif /* OFFIX_DND */ 1455#endif /* OFFIX_DND */
1261 break; 1456 break;
1262 1457
1263 case MappingNotify: 1458 case MappingNotify:
1264 XRefreshKeyboardMapping (& (ev.xmapping)); 1459 XRefreshKeyboardMapping (&ev.xmapping);
1265 break; 1460 break;
1266 1461
1267 /* 1462 /*
1268 * XXX: this is not the _current_ arrangement 1463 * XXX: this is not the _current_ arrangement
1269 * Here's my conclusion: 1464 * Here's my conclusion:
… …
1288 break; 1483 break;
1289 } 1484 }
1290 break; 1485 break;
1291 1486
1292 case FocusIn: 1487 case FocusIn:
1293 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])
1294 { 1497 {
1295 TermWin.focus = 1; 1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1296 want_refresh = 1; 1499 ;
1297#ifdef USE_XIM
1298 if (Input_Context != NULL)
1299 XSetICFocus (Input_Context);
1300#endif
1301#ifdef CURSOR_BLINK
1302 if (Options & Opt_cursorBlink)
1303 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1304#endif
1305 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
1306 } 1513 }
1307 break; 1514 break;
1308 1515
1309 case FocusOut:
1310 if (TermWin.focus)
1311 {
1312 TermWin.focus = 0;
1313 want_refresh = 1;
1314#ifdef USE_XIM
1315 if (Input_Context != NULL)
1316 XUnsetICFocus (Input_Context);
1317#endif
1318#ifdef CURSOR_BLINK
1319 if (Options & Opt_cursorBlink)
1320 cursor_blink_ev.stop ();
1321 hidden_cursor = 0;
1322#endif
1323
1324 }
1325 break;
1326
1327 case ConfigureNotify: 1516 case PropertyNotify:
1328 if (ev.xconfigure.window == TermWin.parent[0]) 1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1329 { 1518 && ev.xproperty.state == PropertyNewValue)
1330 int height, width; 1519 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 1520
1332 do
1333 { /* Wrap lots of configures into one */
1334 width = ev.xconfigure.width;
1335 height = ev.xconfigure.height;
1336 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1337 }
1338 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1339
1340 if (szHint.width != width || szHint.height != height)
1341 {
1342 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1343 resize_all_windows (width, height, 1);
1344 }
1345#ifdef DEBUG_SIZE
1346 else
1347 {
1348 D_SIZE ((stderr, "Size: Not resizing"));
1349 }
1350#endif
1351#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1352 if (Options & Opt_transparent)
1353 {
1354 check_our_parents ();
1355 if (am_transparent)
1356 want_full_refresh = 1;
1357 }
1358#endif
1359
1360 }
1361 break; 1521 break;
1362 1522
1363 case SelectionClear: 1523 case SelectionClear:
1364 display->set_selection_owner (0); 1524 selection_clear ();
1365 break; 1525 break;
1366 1526
1367 case SelectionNotify: 1527 case SelectionNotify:
1368 if (selection_wait == Sel_normal) 1528 if (selection_wait == Sel_normal)
1369 selection_paste (ev.xselection.requestor, 1529 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1370 ev.xselection.property, True);
1371 break; 1530 break;
1372 1531
1373 case SelectionRequest: 1532 case SelectionRequest:
1374 selection_send (ev.xselectionrequest); 1533 selection_send (ev.xselectionrequest);
1375 break; 1534 break;
1376 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
1377 case UnmapNotify: 1544 case UnmapNotify:
1378 TermWin.mapped = 0; 1545 mapped = 0;
1379#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1380 text_blink_ev.stop (); 1547 text_blink_ev.stop ();
1381#endif 1548#endif
1382 break; 1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1383
1384 case MapNotify:
1385 TermWin.mapped = 1;
1386#ifdef TEXT_BLINK
1387 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1388#endif
1389 break; 1550 break;
1390 1551
1391#ifdef TRANSPARENT 1552#ifdef TRANSPARENT
1392 case ReparentNotify: 1553 case ReparentNotify:
1393 rootwin_cb (ev); 1554 rootwin_cb (ev);
1394 break; 1555 break;
1395#endif /* TRANSPARENT */ 1556#endif /* TRANSPARENT */
1396 1557
1397 case GraphicsExpose: 1558 case GraphicsExpose:
1398 case Expose: 1559 case Expose:
1399 if (ev.xany.window == TermWin.vt) 1560 if (ev.xany.window == vt)
1400 { 1561 {
1401#ifdef NO_SLOW_LINK_SUPPORT 1562 do
1402 scr_expose (ev.xexpose.x, ev.xexpose.y, 1563 scr_expose (ev.xexpose.x, ev.xexpose.y,
1403 ev.xexpose.width, ev.xexpose.height, False); 1564 ev.xexpose.width, ev.xexpose.height, False);
1404#else 1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1405 // 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))
1406 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1407 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1408 //scr_expose (ev.xexpose.x, 0, 1572
1409 // ev.xexpose.width, TermWin.height, False);
1410#endif
1411 want_refresh = 1; 1573 want_refresh = 1;
1412 } 1574 }
1413 else 1575 else
1414 { 1576 {
1415 XEvent unused_event; 1577 XEvent unused_event;
1416 1578
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1418 Expose, 1580 ;
1419 &unused_event)) ; 1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1420 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1582 ;
1421 GraphicsExpose, 1583
1422 &unused_event)) ;
1423 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1424 { 1585 {
1425 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1426 scrollbar_show (0); 1587 scrollbar_show (0);
1427 } 1588 }
1428#ifdef MENUBAR 1589
1429 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1590#ifdef TRANSPARENT
1430 menubar_expose (); 1591 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window);
1431#endif 1593#endif
1432 } 1594 }
1433 break; 1595 break;
1434 1596
1435 case MotionNotify: 1597 case MotionNotify:
1436#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1437 if (hidden_pointer) 1599 if (hidden_pointer)
1438 pointer_unblank (); 1600 pointer_unblank ();
1439#endif 1601#endif
1440#if MENUBAR 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1441 if (isMenuBarWindow (ev.xany.window)) 1603 break;
1604
1605 if (ev.xany.window == vt)
1442 { 1606 {
1443 menubar_control (ev.xbutton); 1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1444 break; 1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1445 } 1609 ; // nop
1446#endif
1447 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1448 break;
1449
1450 if (ev.xany.window == TermWin.vt)
1451 {
1452 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1453 { 1611 {
1454 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1455 ; 1613 ;
1456 1614
1457 XQueryPointer (display->display, TermWin.vt, 1615 XQueryPointer (disp, vt,
1458 &unused_root, &unused_child, 1616 &unused_root, &unused_child,
1459 &unused_root_x, &unused_root_y, 1617 &unused_root_x, &unused_root_y,
1460 & (ev.xbutton.x), & (ev.xbutton.y), 1618 &ev.xbutton.x, &ev.xbutton.y,
1461 &unused_mask); 1619 &ev.xbutton.state);
1462#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
1463 /* deal with a `jumpy' mouse */ 1621 /* deal with a `jumpy' mouse */
1464 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1622 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1465 { 1623 {
1466#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
1467 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1633 selection_extend (ev.xbutton.x, ev.xbutton.y,
1468 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1634 ev.xbutton.state & Button3Mask ? 2 : 0);
1635
1469#ifdef SELECTION_SCROLLING 1636#ifdef SELECTION_SCROLLING
1470 if (ev.xbutton.y < TermWin.int_bwidth 1637 if (ev.xbutton.y < int_bwidth
1471 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1638 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1472 { 1639 {
1473 int dist; 1640 int dist;
1474
1475 pending_scroll_selection=1;
1476 1641
1477 /* don't clobber the current delay if we are 1642 /* don't clobber the current delay if we are
1478 * already in the middle of scrolling. 1643 * already in the middle of scrolling.
1479 */ 1644 */
1480 if (scroll_selection_delay<=0) 1645 if (!sel_scroll_ev.active)
1481 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1646 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1482 1647
1483 /* save the event params so we can highlight 1648 /* save the event params so we can highlight
1484 * the selection in the pending-scroll loop 1649 * the selection in the pending-scroll loop
1485 */ 1650 */
1486 selection_save_x=ev.xbutton.x; 1651 selection_save_x = ev.xbutton.x;
1487 selection_save_y=ev.xbutton.y; 1652 selection_save_y = ev.xbutton.y;
1488 selection_save_state=
1489 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1653 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1490 1654
1491 /* calc number of lines to scroll */ 1655 /* calc number of lines to scroll */
1492 if (ev.xbutton.y<TermWin.int_bwidth) 1656 if (ev.xbutton.y < int_bwidth)
1493 { 1657 {
1494 scroll_selection_dir = UP; 1658 scroll_selection_dir = UP;
1495 dist = TermWin.int_bwidth - ev.xbutton.y; 1659 dist = int_bwidth - ev.xbutton.y;
1496 } 1660 }
1497 else 1661 else
1498 { 1662 {
1499 scroll_selection_dir = DN; 1663 scroll_selection_dir = DN;
1500 dist = ev.xbutton.y - 1664 dist = ev.xbutton.y - (int_bwidth + height);
1501 (TermWin.int_bwidth + TermWin.height);
1502 } 1665 }
1666
1503 scroll_selection_lines= (Pixel2Height (dist)/ 1667 scroll_selection_lines = Pixel2Height (dist)
1504 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1668 / SELECTION_SCROLL_LINE_SPEEDUP
1669 + 1;
1505 MIN_IT (scroll_selection_lines, 1670 min_it (scroll_selection_lines,
1506 SELECTION_SCROLL_MAX_LINES); 1671 SELECTION_SCROLL_MAX_LINES);
1507 } 1672 }
1508 else 1673 else
1509 { 1674 {
1510 /* we are within the text window, so we 1675 /* we are within the text window, so we
1511 * shouldn't be scrolling 1676 * shouldn't be scrolling
1512 */ 1677 */
1513 pending_scroll_selection = 0; 1678 if (sel_scroll_ev.active)
1679 sel_scroll_ev.stop();
1514 } 1680 }
1515#endif 1681#endif
1516#ifdef MOUSE_THRESHOLD 1682#ifdef MOUSE_THRESHOLD
1517
1518 } 1683 }
1519#endif 1684#endif
1520
1521 } 1685 }
1522 } 1686 }
1523 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1524 { 1688 {
1525 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1689 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1526 MotionNotify, &ev)) ; 1690 MotionNotify, &ev))
1691 ;
1692
1527 XQueryPointer (display->display, scrollBar.win, 1693 XQueryPointer (disp, scrollBar.win,
1528 &unused_root, &unused_child, 1694 &unused_root, &unused_child,
1529 &unused_root_x, &unused_root_y, 1695 &unused_root_x, &unused_root_y,
1530 & (ev.xbutton.x), & (ev.xbutton.y), 1696 &ev.xbutton.x, &ev.xbutton.y,
1531 &unused_mask); 1697 &unused_mask);
1532 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1533 scrollbar_size ()); 1699 scrollbar_size ());
1534 scr_refresh (refresh_type); 1700 want_refresh = 1;
1535 refresh_limit = 0; 1701 refresh_limit = 0;
1536 scrollbar_show (1); 1702 scrollbar_show (1);
1537 } 1703 }
1538 break; 1704 break;
1539 } 1705 }
1540}
1541 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
1542void 1807void
1543rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1544{ 1809{
1545 SET_R (this); 1810 make_current ();
1546 SET_LOCALE (locale);
1547 1811
1548 switch (ev.type) 1812 switch (ev.type)
1549 { 1813 {
1550 case PropertyNotify: 1814 case PropertyNotify:
1551 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1552 {
1553 if (ev.xproperty.state == PropertyNewValue)
1554 selection_property (ev.xproperty.window, ev.xproperty.atom);
1555 break;
1556 }
1557#ifdef TRANSPARENT
1558 else
1559 {
1560 /* 1815 /*
1561 * 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,
1562 * 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.
1563 */ 1818 */
1564 if (xa[XA_XROOTPMAPID] == 0)
1565 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1566
1567 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])
1568 return; 1821 return;
1569 }
1570 1822
1571 /* FALLTHROUGH */ 1823 /* FALLTHROUGH */
1572 case ReparentNotify: 1824 case ReparentNotify:
1573 if ((Options & Opt_transparent) && check_our_parents ()) 1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1574 if (am_transparent)
1575 want_full_refresh = 1; 1826 want_refresh = want_full_refresh = 1;
1576 break; 1827 break;
1577#endif
1578 } 1828 }
1579} 1829}
1830#endif
1580 1831
1581void 1832void
1582rxvt_term::button_press (XButtonEvent &ev) 1833rxvt_term::button_press (XButtonEvent &ev)
1583{ 1834{
1584 int reportmode = 0, clickintime; 1835 int reportmode = 0, clickintime;
1585 1836
1586 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1837 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1838
1587 if (!bypass_keystate) 1839 if (!bypass_keystate)
1588 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1840 reportmode = !! (priv_modes & PrivMode_mouse_report);
1841
1589 /* 1842 /*
1590 * VT window processing of button press 1843 * VT window processing of button press
1591 */ 1844 */
1592 if (ev.window == TermWin.vt) 1845 if (ev.window == vt)
1593 { 1846 {
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
1594 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1856 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1857
1595 if (reportmode) 1858 if (reportmode)
1596 { 1859 {
1597 /* mouse report from vt window */ 1860 /* mouse report from vt window */
1598 /* save the xbutton state (for ButtonRelease) */ 1861 /* save the xbutton state (for ButtonRelease) */
1599 MEvent.state = ev.state; 1862 MEvent.state = ev.state;
1600#ifdef MOUSE_REPORT_DOUBLECLICK 1863#ifdef MOUSE_REPORT_DOUBLECLICK
1601 if (ev.button == MEvent.button && clickintime) 1864 if (ev.button == MEvent.button && clickintime)
1602 { 1865 {
1603 /* same button, within alloted time */ 1866 /* same button, within alloted time */
1604 MEvent.clicks++; 1867 MEvent.clicks++;
1868
1605 if (MEvent.clicks > 1) 1869 if (MEvent.clicks > 1)
1606 { 1870 {
1607 /* only report double clicks */ 1871 /* only report double clicks */
1608 MEvent.clicks = 2; 1872 MEvent.clicks = 2;
1609 mouse_report (ev); 1873 mouse_report (ev);
… …
1628 } 1892 }
1629 else 1893 else
1630 { 1894 {
1631 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
1632 MEvent.clicks = 0; 1896 MEvent.clicks = 0;
1897
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1633 switch (ev.button) 1899 switch (ev.button)
1634 { 1900 {
1635 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
1636 /* allow shift+left click to extend selection */ 1910 /* allow shift+left click to extend selection */
1637 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1638 { 1912 {
1639 if (MEvent.button == Button1 && clickintime) 1913 if (MEvent.button == Button1 && clickintime)
1640 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1641 else 1915 else
1642 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
1643 } 1917 }
1644 else 1918 else
1645 { 1919 {
1646 if (MEvent.button == Button1 && clickintime) 1920 if (MEvent.button == Button1 && clickintime)
1647 MEvent.clicks++; 1921 MEvent.clicks++;
1648 else 1922 else
1649 MEvent.clicks = 1; 1923 MEvent.clicks = 1;
1650 1924
1651 selection_click (MEvent.clicks, ev.x, ev.y); 1925 selection_click (MEvent.clicks, ev.x, ev.y);
1652 } 1926 }
1653 1927
1654 MEvent.button = Button1; 1928 MEvent.button = Button1;
1655 break; 1929 break;
1656 1930
1657 case Button3: 1931 case Button3:
1658 if (MEvent.button == Button3 && clickintime) 1932 if (MEvent.button == Button3 && clickintime)
1659 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1660 else 1934 else
1661 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1936
1662 MEvent.button = Button3; 1937 MEvent.button = Button3;
1663 break; 1938 break;
1664 } 1939 }
1665 } 1940 }
1941
1666 MEvent.time = ev.time; 1942 MEvent.time = ev.time;
1667 return; 1943 return;
1668 } 1944 }
1669 1945
1670 /* 1946 /*
… …
1736 upordown = 1; /* down */ 2012 upordown = 1; /* down */
1737 } 2013 }
1738 if (upordown) 2014 if (upordown)
1739 { 2015 {
1740#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2016#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1741 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2017 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1742#endif 2018#endif
1743 if (scr_page (upordown < 0 ? UP : DN, 1)) 2019 if (scr_page (upordown < 0 ? UP : DN, 1))
1744 { 2020 {
1745 if (upordown < 0) 2021 if (upordown < 0)
1746 scrollBar.setUp (); 2022 scrollBar.setUp ();
… …
1762 break; 2038 break;
1763 case R_SB_ALIGN_BOTTOM: 2039 case R_SB_ALIGN_BOTTOM:
1764 csrO = scrollBar.bot - scrollBar.top; 2040 csrO = scrollBar.bot - scrollBar.top;
1765 break; 2041 break;
1766 } 2042 }
2043
1767 if (scrollBar.style == R_SB_XTERM 2044 if (scrollBar.style == R_SB_XTERM
1768 || scrollbar_above_slider (ev.y) 2045 || scrollbar_above_slider (ev.y)
1769 || scrollbar_below_slider (ev.y)) 2046 || scrollbar_below_slider (ev.y))
1770 scr_move_to ( scrollbar_position (ev.y) - csrO, 2047 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1771 scrollbar_size ()); 2048
1772 scrollBar.setMotion (); 2049 scrollBar.setMotion ();
1773 break; 2050 break;
1774 2051
1775 case Button1: 2052 case Button1:
1776 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2053 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1780 case Button3: 2057 case Button3:
1781 if (scrollBar.style != R_SB_XTERM) 2058 if (scrollBar.style != R_SB_XTERM)
1782 { 2059 {
1783 if (scrollbar_above_slider (ev.y)) 2060 if (scrollbar_above_slider (ev.y))
1784# ifdef RXVT_SCROLL_FULL 2061# ifdef RXVT_SCROLL_FULL
1785 scr_page (UP, TermWin.nrow - 1); 2062 scr_page (UP, nrow - 1);
1786# else 2063# else
1787 scr_page (UP, TermWin.nrow / 4); 2064 scr_page (UP, nrow / 4);
1788# endif 2065# endif
1789 else if (scrollbar_below_slider (ev.y)) 2066 else if (scrollbar_below_slider (ev.y))
1790# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
1791 scr_page (DN, TermWin.nrow - 1); 2068 scr_page (DN, nrow - 1);
1792# else 2069# else
1793 scr_page (DN, TermWin.nrow / 4); 2070 scr_page (DN, nrow / 4);
1794# endif 2071# endif
1795 else 2072 else
1796 scrollBar.setMotion (); 2073 scrollBar.setMotion ();
1797 } 2074 }
1798 else 2075 else
1799 { 2076 {
1800 scr_page ((ev.button == Button1 ? DN : UP), 2077 scr_page ((ev.button == Button1 ? DN : UP),
1801 (TermWin.nrow 2078 (nrow
1802 * scrollbar_position (ev.y) 2079 * scrollbar_position (ev.y)
1803 / scrollbar_size ())); 2080 / scrollbar_size ()));
1804 } 2081 }
2082
1805 break; 2083 break;
1806 } 2084 }
1807 } 2085 }
2086
1808 return; 2087 return;
1809 } 2088 }
1810#if MENUBAR
1811 /*
1812 * Menubar window processing of button press
1813 */
1814 if (isMenuBarWindow (ev.window))
1815 menubar_control (ev);
1816#endif
1817} 2089}
1818 2090
1819void 2091void
1820rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
1821{ 2093{
1822 int reportmode = 0; 2094 int reportmode = 0;
1823 2095
1824 csrO = 0; /* reset csr Offset */ 2096 csrO = 0; /* reset csr Offset */
1825 if (!bypass_keystate) 2097 if (!bypass_keystate)
1826 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2098 reportmode = !! (priv_modes & PrivMode_mouse_report);
1827 2099
1828 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
1829 { 2101 {
1830 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
1831 scrollbar_show (0); 2103 scrollbar_show (0);
1832#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1833 refresh_type &= ~SMOOTH_REFRESH;
1834#endif
1835
1836 } 2104 }
2105
1837#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
1838 pending_scroll_selection=0; 2107 if (sel_scroll_ev.active)
2108 sel_scroll_ev.stop();
1839#endif 2109#endif
2110
1840 if (ev.window == TermWin.vt) 2111 if (ev.window == vt)
1841 { 2112 {
2113#if ISO_14755
2114 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return;
2117#endif
1842 if (reportmode) 2118 if (reportmode)
1843 { 2119 {
1844 /* mouse report from vt window */ 2120 /* mouse report from vt window */
1845 /* don't report release of wheel "buttons" */ 2121 /* don't report release of wheel "buttons" */
1846 if (ev.button >= 4) 2122 if (ev.button >= 4)
… …
1860 MEvent.button = AnyButton; 2136 MEvent.button = AnyButton;
1861 mouse_report (ev); 2137 mouse_report (ev);
1862#endif /* MOUSE_REPORT_DOUBLECLICK */ 2138#endif /* MOUSE_REPORT_DOUBLECLICK */
1863 return; 2139 return;
1864 } 2140 }
2141
1865 /* 2142 /*
1866 * dumb hack to compensate for the failure of click-and-drag 2143 * dumb hack to compensate for the failure of click-and-drag
1867 * when overriding mouse reporting 2144 * when overriding mouse reporting
1868 */ 2145 */
1869 if (PrivateModes & PrivMode_mouse_report 2146 if (priv_modes & PrivMode_mouse_report
1870 && bypass_keystate 2147 && bypass_keystate
1871 && ev.button == Button1 && MEvent.clicks <= 1) 2148 && ev.button == Button1 && MEvent.clicks <= 1)
1872 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;
1873 2153
1874 switch (ev.button) 2154 switch (ev.button)
1875 { 2155 {
1876 case Button1: 2156 case Button1:
1877 case Button3: 2157 case Button3:
1878 selection_make (ev.time); 2158 selection_make (ev.time);
1879 break; 2159 break;
2160
1880 case Button2: 2161 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width)
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
1881 selection_request (ev.time, ev.x, ev.y); 2164 selection_request (ev.time);
2165
1882 break; 2166 break;
2167
1883#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
1884 case Button4: 2169 case Button4:
1885 case Button5: 2170 case Button5:
1886 { 2171 {
1887 int i; 2172 int i;
1888 page_dirn v; 2173 page_dirn v;
1889 2174
1890 v = (ev.button == Button4) ? UP : DN; 2175 v = ev.button == Button4 ? UP : DN;
2176
1891 if (ev.state & ShiftMask) 2177 if (ev.state & ShiftMask)
1892 i = 1; 2178 i = 1;
1893 else if ((Options & Opt_mouseWheelScrollPage)) 2179 else if (OPTION (Opt_mouseWheelScrollPage))
1894 i = TermWin.nrow - 1; 2180 i = nrow - 1;
1895 else 2181 else
1896 i = 5; 2182 i = 5;
2183
1897# ifdef MOUSE_SLIP_WHEELING 2184# ifdef MOUSE_SLIP_WHEELING
1898 if (ev.state & ControlMask) 2185 if (ev.state & ControlMask)
1899 { 2186 {
1900 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)
1901 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
1902 } 2202 }
1903# endif 2203# endif
1904# ifdef JUMP_MOUSE_WHEEL
1905 scr_page (v, i);
1906 scr_refresh (SMOOTH_REFRESH);
1907 scrollbar_show (1);
1908# else
1909 while (i--)
1910 {
1911 scr_page (v, 1);
1912 scr_refresh (SMOOTH_REFRESH);
1913 scrollbar_show (1);
1914 }
1915# endif
1916
1917 } 2204 }
1918 break; 2205 break;
1919#endif 2206#endif
1920
1921 } 2207 }
1922 } 2208 }
1923#ifdef MENUBAR
1924 else if (isMenuBarWindow (ev.window))
1925 menubar_control (ev);
1926#endif
1927} 2209}
1928
1929 2210
1930#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
1931/* 2443/*
1932 * Check our parents are still who we think they are. 2444 * Check our parents are still who we think they are.
1933 * Do transparency updates if required 2445 * Do transparency updates if required
1934 */ 2446 */
1935int 2447int
1936rxvt_term::check_our_parents () 2448rxvt_term::check_our_parents ()
1937{ 2449{
1938 int i, pchanged, aformat, have_pixmap, rootdepth; 2450 int i, pchanged, aformat, have_pixmap, rootdepth;
1939 unsigned long nitems, bytes_after; 2451 unsigned long nitems, bytes_after;
1940 Atom atype; 2452 Atom atype;
1941 unsigned char *prop = NULL; 2453 unsigned char *prop = NULL;
1942 Window root, oldp, *list; 2454 Window root, oldp, *list;
1943 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
1944 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2457 dDisp;
1945 2458
1946 pchanged = 0; 2459 pchanged = 0;
1947 2460
1948 if (! (Options & Opt_transparent)) 2461 if (!OPTION (Opt_transparent))
1949 return pchanged; /* Don't try any more */ 2462 return pchanged; /* Don't try any more */
1950 2463
1951 XGetWindowAttributes (display->display, display->root, &wrootattr); 2464 XGetWindowAttributes (disp, display->root, &wrootattr);
1952 rootdepth = wrootattr.depth; 2465 rootdepth = wrootattr.depth;
1953 2466
1954 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2467 XGetWindowAttributes (disp, parent[0], &wattr);
2468
1955 if (rootdepth != wattr.depth) 2469 if (rootdepth != wattr.depth)
1956 { 2470 {
1957 if (am_transparent) 2471 if (am_transparent)
1958 { 2472 {
1959 pchanged = 1; 2473 pchanged = 1;
1960 XSetWindowBackground (display->display, TermWin.vt, 2474 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1961 PixColors[Color_bg]);
1962 am_transparent = am_pixmap_trans = 0; 2475 am_transparent = am_pixmap_trans = 0;
1963 } 2476 }
2477
1964 return pchanged; /* Don't try any more */ 2478 return pchanged; /* Don't try any more */
1965 } 2479 }
1966 2480
1967 /* 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. */
1968 XSync (display->display, False); 2482 XSync (disp, False);
1969 2483
1970 /* 2484 /*
1971 * Make the frame window set by the window manager have 2485 * Make the frame window set by the window manager have
1972 * the root background. Some window managers put multiple nested frame 2486 * the root background. Some window managers put multiple nested frame
1973 * 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.
1974 */ 2488 */
1975 i = (xa[XA_XROOTPMAPID] != 0 2489 i = (xa[XA_XROOTPMAP_ID]
1976 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2490 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1977 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2491 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1978 &nitems, &bytes_after, &prop) == Success)); 2492 &nitems, &bytes_after, &prop) == Success);
2493
1979 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 )
1980 have_pixmap = 0; 2505 have_pixmap = 0;
1981 else 2506 else
1982 { 2507 {
1983 have_pixmap = 1; 2508 have_pixmap = 1;
1984 rootpixmap = * ((Pixmap *)prop); 2509 rootpixmap = *(Pixmap *)prop;
1985 XFree (prop); 2510 XFree (prop);
1986 } 2511 }
2512
1987 if (have_pixmap) 2513 if (have_pixmap)
1988 { 2514 {
1989 /* 2515 /*
1990 * Copy display->root pixmap transparency 2516 * Copy display->root pixmap transparency
1991 */ 2517 */
1992 int sx, sy, nx, ny; 2518 int sx, sy, nx, ny;
1993 unsigned int nw, nh; 2519 unsigned int nw, nh;
1994 Window cr; 2520 Window cr;
1995 XImage *image; 2521 XImage *image;
1996 GC gc; 2522 GC gc;
1997 XGCValues gcvalue; 2523 XGCValues gcvalue;
1998 2524
1999 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2525 XTranslateCoordinates (disp, parent[0], display->root,
2000 0, 0, &sx, &sy, &cr); 2526 0, 0, &sx, &sy, &cr);
2001 nw = (unsigned int)szHint.width; 2527 nw = (unsigned int)szHint.width;
2002 nh = (unsigned int)szHint.height; 2528 nh = (unsigned int)szHint.height;
2003 nx = ny = 0; 2529 nx = ny = 0;
2530
2004 if (sx < 0) 2531 if (sx < 0)
2005 { 2532 {
2006 nw += sx; 2533 nw += sx;
2007 nx = -sx; 2534 nx = -sx;
2008 sx = 0; 2535 sx = 0;
2009 } 2536 }
2537
2010 if (sy < 0) 2538 if (sy < 0)
2011 { 2539 {
2012 nh += sy; 2540 nh += sy;
2013 ny = -sy; 2541 ny = -sy;
2014 sy = 0; 2542 sy = 0;
2015 } 2543 }
2544
2016 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2545 min_it (nw, (unsigned int) (wrootattr.width - sx));
2017 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2546 min_it (nh, (unsigned int) (wrootattr.height - sy));
2547
2548 XSync (disp, False);
2018 allowedxerror = -1; 2549 allowedxerror = -1;
2019 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2550 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2020 ZPixmap); 2551
2021 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2552 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2022 /* XXX: may need a delay here? */ 2553 /* XXX: may need a delay here? */
2023 allowedxerror = 0; 2554 allowedxerror = 0;
2555
2024 if (image == NULL) 2556 if (image == NULL)
2025 { 2557 {
2026 if (am_transparent && am_pixmap_trans) 2558 if (am_transparent && am_pixmap_trans)
2027 { 2559 {
2028 pchanged = 1; 2560 pchanged = 1;
2029 if (TermWin.pixmap != None) 2561 if (pixmap != None)
2030 { 2562 {
2031 XFreePixmap (display->display, TermWin.pixmap); 2563 XFreePixmap (disp, pixmap);
2032 TermWin.pixmap = None; 2564 pixmap = None;
2033 } 2565 }
2034 } 2566 }
2567
2035 am_pixmap_trans = 0; 2568 am_pixmap_trans = 0;
2036 } 2569 }
2037 else 2570 else
2038 { 2571 {
2039 if (TermWin.pixmap != None) 2572 if (pixmap != None)
2040 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
2041 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2587 pixmap = XCreatePixmap (disp, vt,
2042 (unsigned int)szHint.width,
2043 (unsigned int)szHint.height, 2588 szHint.width, szHint.height, image->depth);
2044 (unsigned int)image->depth);
2045 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2589 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2046 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2590 XPutImage (disp, pixmap, gc, image, 0, 0,
2047 nx, ny, (unsigned int)image->width,
2048 (unsigned int)image->height); 2591 nx, ny, image->width, image->height);
2049 XFreeGC (display->display, gc); 2592 XFreeGC (disp, gc);
2050 XDestroyImage (image); 2593 XDestroyImage (image);
2051 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2594 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2052 TermWin.pixmap); 2595 XClearWindow (disp, parent[0]);
2596
2053 if (!am_transparent || !am_pixmap_trans) 2597 if (!am_transparent || !am_pixmap_trans)
2054 pchanged = 1; 2598 pchanged = 1;
2599
2055 am_transparent = am_pixmap_trans = 1; 2600 am_transparent = am_pixmap_trans = 1;
2056 } 2601 }
2057 } 2602 }
2603
2058 if (!am_pixmap_trans) 2604 if (am_pixmap_trans)
2605 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2606 else
2059 { 2607 {
2060 unsigned int n; 2608 unsigned int n;
2061 /* 2609 /*
2062 * InheritPixmap transparency 2610 * InheritPixmap transparency
2063 */ 2611 */
2064 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2065 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2612 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2066 i++)
2067 { 2613 {
2068 oldp = TermWin.parent[i]; 2614 oldp = parent[i];
2069 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2615 XQueryTree (disp, parent[i - 1], &root,
2070 &TermWin.parent[i], &list, &n); 2616 &parent[i], &list, &n);
2071 XFree (list); 2617 XFree (list);
2072 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2618
2073 if (TermWin.parent[i] == display->root) 2619 if (parent[i] == display->root)
2074 { 2620 {
2075 if (oldp != None) 2621 if (oldp != None)
2076 pchanged = 1; 2622 pchanged = 1;
2623
2077 break; 2624 break;
2078 } 2625 }
2626
2079 if (oldp != TermWin.parent[i]) 2627 if (oldp != parent[i])
2080 pchanged = 1; 2628 pchanged = 1;
2081 } 2629 }
2630
2082 n = 0; 2631 n = 0;
2632
2083 if (pchanged) 2633 if (pchanged)
2084 { 2634 {
2085 for (; n < (unsigned int)i; n++) 2635 for (; n < (unsigned int)i; n++)
2086 { 2636 {
2087 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2637 XGetWindowAttributes (disp, parent[n], &wattr);
2088 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2089 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2638 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2090 { 2639 {
2091 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2640 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2092 break; 2641 break;
2093 } 2642 }
2094 } 2643 }
2095 } 2644 }
2096 if (n > (int) (sizeof (TermWin.parent) 2645
2097 / sizeof (TermWin.parent[0]))) 2646 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2098 { 2647 {
2099 D_X ((stderr, "InheritPixmap Turning off")); 2648 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2100 XSetWindowBackground (display->display, TermWin.parent[0], 2649 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2101 PixColors[Color_fg]);
2102 XSetWindowBackground (display->display, TermWin.vt,
2103 PixColors[Color_bg]);
2104 am_transparent = 0; 2650 am_transparent = 0;
2105 /* XXX: also turn off Opt_transparent? */ 2651 /* XXX: also turn off Opt_transparent? */
2106 } 2652 }
2107 else 2653 else
2108 { 2654 {
2655#if WAIT_FOR_WM
2109 /* wait (an arbitrary period) for the WM to do its thing 2656 /* wait (an arbitrary period) for the WM to do its thing
2110 * needed for fvwm2.2.2 (and before?) */ 2657 * needed for fvwm2.2.2 (and before?) */
2111# ifdef HAVE_NANOSLEEP
2112 struct timespec rqt;
2113
2114 rqt.tv_sec = 1;
2115 rqt.tv_nsec = 0;
2116 nanosleep (&rqt, NULL);
2117# else
2118 sleep (1); 2658 sleep (1);
2119# endif 2659#endif
2120 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2121 for (n = 0; n < (unsigned int)i; n++) 2660 for (n = 0; n < (unsigned int)i; n++)
2122 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2661 {
2123 ParentRelative); 2662 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2124 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2663 XClearWindow (disp, parent[n]);
2125 ParentRelative); 2664 }
2665
2666 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2126 am_transparent = 1; 2667 am_transparent = 1;
2127 } 2668 }
2669
2128 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2670 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2129 TermWin.parent[i] = None; 2671 parent[i] = None;
2672 }
2673
2674 if (scrollBar.win)
2130 } 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
2131 return pchanged; 2688 return pchanged;
2132} 2689}
2133#endif 2690#endif
2134 2691
2135/*}}} */ 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}
2136 2896
2137/*{{{ print pipe */ 2897/*{{{ print pipe */
2138/*----------------------------------------------------------------------*/ 2898/*----------------------------------------------------------------------*/
2139#ifdef PRINTPIPE 2899#ifdef PRINTPIPE
2140FILE * 2900FILE *
2141rxvt_term::popen_printer () 2901rxvt_term::popen_printer ()
2142{ 2902{
2143 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2903 FILE *stream = popen (rs[Rs_print_pipe], "w");
2144 2904
2145 if (stream == NULL) 2905 if (stream == NULL)
2146 rxvt_print_error ("can't open printer pipe"); 2906 rxvt_warn ("can't open printer pipe, not printing.\n");
2907
2147 return stream; 2908 return stream;
2148} 2909}
2149 2910
2150int 2911int
2151rxvt_term::pclose_printer (FILE *stream) 2912rxvt_term::pclose_printer (FILE *stream)
2152{ 2913{
2153 fflush (stream); 2914 fflush (stream);
2154 /* pclose () reported not to work on SunOS 4.1.3 */
2155# if defined (__sun__) /* TODO: RESOLVE THIS */
2156 /* pclose works provided SIGCHLD handler uses waitpid */
2157 return pclose (stream); /* return fclose (stream); */
2158# else
2159 return pclose (stream); 2915 return pclose (stream);
2160# endif
2161} 2916}
2162 2917
2163/* 2918/*
2164 * simulate attached vt100 printer 2919 * simulate attached vt100 printer
2165 */ 2920 */
2166void 2921void
2167rxvt_term::process_print_pipe () 2922rxvt_term::process_print_pipe ()
2168{ 2923{
2169 int done; 2924 int done;
2170 FILE *fd; 2925 FILE *fd;
2171 2926
2172 if ((fd = popen_printer ()) == NULL) 2927 if ((fd = popen_printer ()) == NULL)
2173 return; 2928 return;
2174 2929
2175 /* 2930 /*
2176 * 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
2177 * is received. 2932 * is received.
2178 */ 2933 */
2179 for (done = 0; !done;) 2934 for (done = 0; !done;)
2180 { 2935 {
2181 unsigned char buf[8]; 2936 unsigned char buf[8];
2182 unsigned char ch; 2937 unicode_t ch;
2183 unsigned int i, len; 2938 unsigned int i, len;
2184 2939
2185 if ((ch = cmd_getc ()) != C0_ESC) 2940 if ((ch = cmd_getc ()) != C0_ESC)
2186 { 2941 {
2187 if (putc (ch, fd) == EOF) 2942 if (putc (ch, fd) == EOF)
2188 break; /* done = 1 */ 2943 break; /* done = 1 */
… …
2203 { 2958 {
2204 if ((buf[len++] = cmd_getc ()) == 'i') 2959 if ((buf[len++] = cmd_getc ()) == 'i')
2205 break; /* done = 1 */ 2960 break; /* done = 1 */
2206 } 2961 }
2207 } 2962 }
2963
2208 for (i = 0; i < len; i++) 2964 for (i = 0; i < len; i++)
2209 if (putc (buf[i], fd) == EOF) 2965 if (putc (buf[i], fd) == EOF)
2210 { 2966 {
2211 done = 1; 2967 done = 1;
2212 break; 2968 break;
2213 } 2969 }
2214 } 2970 }
2215 } 2971 }
2972
2216 pclose_printer (fd); 2973 pclose_printer (fd);
2217} 2974}
2218#endif /* PRINTPIPE */ 2975#endif /* PRINTPIPE */
2219/*}}} */ 2976/*}}} */
2220 2977
2221/* *INDENT-OFF* */ 2978/* *INDENT-OFF* */
2222enum { 2979enum {
2223 C1_40 = 0x40, 2980 C1_40 = 0x40,
2224 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,
2225 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,
2226 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,
2227 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,
2228}; 2985};
2229/* *INDENT-ON* */ 2986/* *INDENT-ON* */
2230 2987
2231/*{{{ process non-printing single characters */ 2988/*{{{ process non-printing single characters */
2232void 2989void
2233rxvt_term::process_nonprinting (unsigned char ch) 2990rxvt_term::process_nonprinting (unicode_t ch)
2234{ 2991{
2235 switch (ch) 2992 switch (ch)
2236 { 2993 {
2994 case C0_ESC:
2995 process_escape_seq ();
2996 break;
2237 case C0_ENQ: /* terminal Status */ 2997 case C0_ENQ: /* terminal Status */
2238 if (rs[Rs_answerbackstring]) 2998 if (rs[Rs_answerbackstring])
2239 tt_write ( 2999 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2240 (const unsigned char *)rs[Rs_answerbackstring],
2241 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2242 else 3000 else
2243 tt_write ((unsigned char *)VT100_ANS, 3001 tt_write (VT100_ANS, strlen (VT100_ANS));
2244 (unsigned int)STRLEN (VT100_ANS));
2245 break; 3002 break;
2246 case C0_BEL: /* bell */ 3003 case C0_BEL: /* bell */
2247 scr_bell (); 3004 scr_bell ();
2248 break; 3005 break;
2249 case C0_BS: /* backspace */ 3006 case C0_BS: /* backspace */
… …
2264 scr_charset_choose (1); 3021 scr_charset_choose (1);
2265 break; 3022 break;
2266 case C0_SI: /* shift in - acs */ 3023 case C0_SI: /* shift in - acs */
2267 scr_charset_choose (0); 3024 scr_charset_choose (0);
2268 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
2269 } 3039 }
2270} 3040}
2271/*}}} */ 3041/*}}} */
2272 3042
2273 3043
2274/*{{{ process VT52 escape sequences */ 3044/*{{{ process VT52 escape sequences */
2275void 3045void
2276rxvt_term::process_escape_vt52 (unsigned char ch) 3046rxvt_term::process_escape_vt52 (unicode_t ch)
2277{ 3047{
2278 int row, col; 3048 int row, col;
2279 3049
2280 switch (ch) 3050 switch (ch)
2281 { 3051 {
… …
2333 3103
2334/*{{{ process escape sequences */ 3104/*{{{ process escape sequences */
2335void 3105void
2336rxvt_term::process_escape_seq () 3106rxvt_term::process_escape_seq ()
2337{ 3107{
2338 unsigned char ch = cmd_getc (); 3108 unicode_t ch = cmd_getc ();
2339 3109
2340 if (PrivateModes & PrivMode_vt52) 3110 if (priv_modes & PrivMode_vt52)
2341 { 3111 {
2342 process_escape_vt52 (ch); 3112 process_escape_vt52 (ch);
2343 return; 3113 return;
2344 } 3114 }
2345 3115
… …
2360 scr_charset_set (2, (unsigned int)cmd_getc ()); 3130 scr_charset_set (2, (unsigned int)cmd_getc ());
2361 break; 3131 break;
2362 case '+': 3132 case '+':
2363 scr_charset_set (3, (unsigned int)cmd_getc ()); 3133 scr_charset_set (3, (unsigned int)cmd_getc ());
2364 break; 3134 break;
2365#ifdef MULTICHAR_SET 3135#if ENABLE_FRILLS
2366 case '$':
2367 scr_charset_set (-2, (unsigned int)cmd_getc ());
2368 break;
2369#endif
2370#ifndef NO_FRILLS
2371 case '6': 3136 case '6':
2372 scr_backindex (); 3137 scr_backindex ();
2373 break; 3138 break;
2374#endif 3139#endif
2375 case '7': 3140 case '7':
2376 scr_cursor (SAVE); 3141 scr_cursor (SAVE);
2377 break; 3142 break;
2378 case '8': 3143 case '8':
2379 scr_cursor (RESTORE); 3144 scr_cursor (RESTORE);
2380 break; 3145 break;
2381#ifndef NO_FRILLS 3146#if ENABLE_FRILLS
2382 case '9': 3147 case '9':
2383 scr_forwardindex (); 3148 scr_forwardindex ();
2384 break; 3149 break;
2385#endif 3150#endif
2386 case '=': 3151 case '=':
… …
2396 break; 3161 break;
2397 3162
2398 /* 8.3.87: NEXT LINE */ 3163 /* 8.3.87: NEXT LINE */
2399 case C1_NEL: /* ESC E */ 3164 case C1_NEL: /* ESC E */
2400 { 3165 {
2401 uint32_t nlcr[] = { '\n', '\r' }; 3166 wchar_t nlcr[] = { C0_LF, C0_CR };
2402 scr_add_lines (nlcr, 1, 2); 3167 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2403 } 3168 }
2404 break; 3169 break;
2405 3170
2406 /* kidnapped escape sequence: Should be 8.3.48 */ 3171 /* kidnapped escape sequence: Should be 8.3.48 */
2407 case C1_ESA: /* ESC G */ 3172 case C1_ESA: /* ESC G */
… …
2417 case C1_RI: /* ESC M */ 3182 case C1_RI: /* ESC M */
2418 scr_index (DN); 3183 scr_index (DN);
2419 break; 3184 break;
2420 3185
2421 /* 8.3.142: SINGLE-SHIFT TWO */ 3186 /* 8.3.142: SINGLE-SHIFT TWO */
2422 /*case C1_SS2: scr_single_shift (2); break; */ 3187 /*case C1_SS2: scr_single_shift (2); break; */
2423 3188
2424 /* 8.3.143: SINGLE-SHIFT THREE */ 3189 /* 8.3.143: SINGLE-SHIFT THREE */
2425 /*case C1_SS3: scr_single_shift (3); break; */ 3190 /*case C1_SS3: scr_single_shift (3); break; */
2426 3191
2427 /* 8.3.27: DEVICE CONTROL STRING */ 3192 /* 8.3.27: DEVICE CONTROL STRING */
2428 case C1_DCS: /* ESC P */ 3193 case C1_DCS: /* ESC P */
2429 process_dcs_seq (); 3194 process_dcs_seq ();
2430 break; 3195 break;
2431 3196
2432 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3197 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2433 case C1_SCI: /* ESC Z */ 3198 case C1_SCI: /* ESC Z */
2434 tt_write ((const unsigned char *)ESCZ_ANSWER, 3199 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2435 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2436 break; /* steal obsolete ESC [ c */ 3200 break; /* steal obsolete ESC [ c */
2437 3201
2438 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3202 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2439 case C1_CSI: /* ESC [ */ 3203 case C1_CSI: /* ESC [ */
2440 process_csi_seq (); 3204 process_csi_seq ();
… …
2445 process_osc_seq (); 3209 process_osc_seq ();
2446 break; 3210 break;
2447 3211
2448 /* 8.3.106: RESET TO INITIAL STATE */ 3212 /* 8.3.106: RESET TO INITIAL STATE */
2449 case 'c': 3213 case 'c':
3214 mbstate.reset ();
2450 scr_poweron (); 3215 scr_poweron ();
2451 scrollbar_show (1); 3216 scrollbar_show (1);
2452 break; 3217 break;
2453 3218
2454 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3219 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2466 3231
2467/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3232/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2468/* *INDENT-OFF* */ 3233/* *INDENT-OFF* */
2469enum { 3234enum {
2470 CSI_ICH = 0x40, 3235 CSI_ICH = 0x40,
2471 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,
2472 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 ,
2473 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,
2474 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,
2475 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,
2476 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,
… …
2491 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, */
2492 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, [, \, ], ^, _, */
2493 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, */
2494 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, */
2495 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, */
2496 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, {, |, }, ~, */
2497 }; 3262 };
2498/* *INDENT-ON* */ 3263/* *INDENT-ON* */
2499 3264
2500void 3265void
2501rxvt_term::process_csi_seq () 3266rxvt_term::process_csi_seq ()
2502{ 3267{
2503 unsigned char ch, priv, i; 3268 unicode_t ch, priv, i;
2504 unsigned int nargs, p; 3269 unsigned int nargs, p;
2505 int n, ndef; 3270 int n, ndef;
2506 int arg[ESC_ARGS]; 3271 int arg[ESC_ARGS];
2507 3272
2508 for (nargs = ESC_ARGS; nargs > 0;) 3273 for (nargs = ESC_ARGS; nargs > 0;)
2509 arg[--nargs] = 0; 3274 arg[--nargs] = 0;
2510 3275
2511 priv = 0; 3276 priv = 0;
… …
2513 if (ch >= '<' && ch <= '?') 3278 if (ch >= '<' && ch <= '?')
2514 { /* '<' '=' '>' '?' */ 3279 { /* '<' '=' '>' '?' */
2515 priv = ch; 3280 priv = ch;
2516 ch = cmd_getc (); 3281 ch = cmd_getc ();
2517 } 3282 }
3283
2518 /* read any numerical arguments */ 3284 /* read any numerical arguments */
2519 for (n = -1; ch < CSI_ICH; ) 3285 for (n = -1; ch < CSI_ICH; )
2520 { 3286 {
2521 if (isdigit (ch)) 3287 if (isdigit (ch))
2522 { 3288 {
… …
2529 { 3295 {
2530 if (nargs < ESC_ARGS) 3296 if (nargs < ESC_ARGS)
2531 arg[nargs++] = n; 3297 arg[nargs++] = n;
2532 n = -1; 3298 n = -1;
2533 } 3299 }
2534 else if (ch == '\b') 3300 else if (IS_CONTROL (ch))
2535 {
2536 scr_backspace ();
2537 }
2538 else if (ch == C0_ESC)
2539 {
2540 process_escape_seq ();
2541 return;
2542 }
2543 else if (ch < ' ')
2544 {
2545 process_nonprinting (ch); 3301 process_nonprinting (ch);
2546 } 3302
2547 ch = cmd_getc (); 3303 ch = cmd_getc ();
2548 } 3304 }
2549 3305
2550 if (ch > CSI_7F) 3306 if (ch > CSI_7F)
2551 return; 3307 return;
… …
2573 { 3329 {
2574 switch (priv) 3330 switch (priv)
2575 { 3331 {
2576 case '>': 3332 case '>':
2577 if (ch == CSI_DA) /* secondary device attributes */ 3333 if (ch == CSI_DA) /* secondary device attributes */
2578 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3334 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2579 break; 3335 break;
2580 case '?': 3336 case '?':
2581 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3337 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2582 process_terminal_mode (ch, priv, nargs, arg); 3338 process_terminal_mode (ch, priv, nargs, arg);
2583 break; 3339 break;
… …
2688 3444
2689 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3445 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2690 arg[0] = -arg[0]; 3446 arg[0] = -arg[0];
2691 /* FALLTHROUGH */ 3447 /* FALLTHROUGH */
2692 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3448 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2693 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3449 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2694 break; 3450 break;
2695 3451
2696 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3452 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2697 tt_write ((const unsigned char *)VT100_ANS, 3453 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2698 (unsigned int) (sizeof (VT100_ANS) - 1));
2699 break; 3454 break;
2700 3455
2701 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3456 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2702 process_sgr_mode (nargs, arg); 3457 process_sgr_mode (nargs, arg);
2703 break; 3458 break;
… …
2709 tt_printf ("\033[0n"); 3464 tt_printf ("\033[0n");
2710 break; 3465 break;
2711 case 6: /* CPR requested */ 3466 case 6: /* CPR requested */
2712 scr_report_position (); 3467 scr_report_position ();
2713 break; 3468 break;
2714#if defined (ENABLE_DISPLAY_ANSWER)
2715 case 7: /* unofficial extension */ 3469 case 7: /* unofficial extension */
3470 if (OPTION (Opt_insecure))
2716 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3471 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2717 break; 3472 break;
2718#endif
2719 case 8: /* unofficial extension */ 3473 case 8: /* unofficial extension */
2720 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3474 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2721 break; 3475 break;
2722 } 3476 }
2723 break; 3477 break;
2724 3478
2725 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3479 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2758 break; 3512 break;
2759 3513
2760 case CSI_RM: /* 8.3.107: RESET MODE */ 3514 case CSI_RM: /* 8.3.107: RESET MODE */
2761 if (arg[0] == 4) 3515 if (arg[0] == 4)
2762 scr_insert_mode (0); 3516 scr_insert_mode (0);
3517 else if (arg[0] == 20)
3518 priv_modes &= ~PrivMode_LFNL;
2763 break; 3519 break;
2764 3520
2765 case CSI_SM: /* 8.3.126: SET MODE */ 3521 case CSI_SM: /* 8.3.126: SET MODE */
2766 if (arg[0] == 4) 3522 if (arg[0] == 4)
2767 scr_insert_mode (1); 3523 scr_insert_mode (1);
3524 else if (arg[0] == 20)
3525 priv_modes |= PrivMode_LFNL;
2768 break; 3526 break;
2769 3527
2770 /* 3528 /*
2771 * PRIVATE USE beyond this point. All CSI_7? sequences here 3529 * PRIVATE USE beyond this point. All CSI_7? sequences here
2772 */ 3530 */
… …
2784 break; 3542 break;
2785 case CSI_75: 3543 case CSI_75:
2786 scr_cursor (RESTORE); 3544 scr_cursor (RESTORE);
2787 break; 3545 break;
2788 3546
2789#ifndef NO_FRILLS 3547#if ENABLE_FRILLS
2790 case CSI_74: 3548 case CSI_74:
2791 process_window_ops (arg, nargs); 3549 process_window_ops (arg, nargs);
2792 break; 3550 break;
2793#endif 3551#endif
2794 3552
2795 case CSI_78: /* DECREQTPARM */ 3553 case CSI_78: /* DECREQTPARM */
2796 if (arg[0] == 0 || arg[0] == 1) 3554 if (arg[0] == 0 || arg[0] == 1)
2797 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);
2798 /* FALLTHROUGH */ 3556 break;
2799 3557
2800 default: 3558 default:
2801 break; 3559 break;
2802 } 3560 }
2803} 3561}
2804/*}}} */ 3562/*}}} */
2805 3563
2806#ifndef NO_FRILLS 3564#if ENABLE_FRILLS
2807/* ARGSUSED */ 3565/* ARGSUSED */
2808void 3566void
2809rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3567rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2810{ 3568{
2811 int x, y; 3569 int x, y;
2812#if 0
2813 char *s;
2814#endif
2815 XWindowAttributes wattr; 3570 XWindowAttributes wattr;
2816 Window wdummy; 3571 Window wdummy;
3572 dDisp;
2817 3573
2818 if (nargs == 0) 3574 if (nargs == 0)
2819 return; 3575 return;
3576
2820 switch (args[0]) 3577 switch (args[0])
2821 { 3578 {
2822 /* 3579 /*
2823 * commands 3580 * commands
2824 */ 3581 */
2825 case 1: /* deiconify window */ 3582 case 1: /* deiconify window */
2826 XMapWindow (display->display, TermWin.parent[0]); 3583 XMapWindow (disp, parent[0]);
2827 break; 3584 break;
2828 case 2: /* iconify window */ 3585 case 2: /* iconify window */
2829 XIconifyWindow (display->display, TermWin.parent[0], 3586 XIconifyWindow (disp, parent[0], display->screen);
2830 DefaultScreen (display->display));
2831 break; 3587 break;
2832 case 3: /* set position (pixels) */ 3588 case 3: /* set position (pixels) */
2833 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3589 XMoveWindow (disp, parent[0], args[1], args[2]);
2834 break; 3590 break;
2835 case 4: /* set size (pixels) */ 3591 case 4: /* set size (pixels) */
2836 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3592 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2837 break; 3593 break;
2838 case 5: /* raise window */ 3594 case 5: /* raise window */
2839 XRaiseWindow (display->display, TermWin.parent[0]); 3595 XRaiseWindow (disp, parent[0]);
2840 break; 3596 break;
2841 case 6: /* lower window */ 3597 case 6: /* lower window */
2842 XLowerWindow (display->display, TermWin.parent[0]); 3598 XLowerWindow (disp, parent[0]);
2843 break; 3599 break;
2844 case 7: /* refresh window */ 3600 case 7: /* refresh window */
2845 scr_touch (true); 3601 scr_touch (true);
2846 break; 3602 break;
2847 case 8: /* set size (chars) */ 3603 case 8: /* set size (chars) */
2848 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3604 set_widthheight ((unsigned int) (args[2] * fwidth),
2849 (unsigned int) (args[1] * TermWin.fheight)); 3605 (unsigned int) (args[1] * fheight));
2850 break; 3606 break;
3607
3608 //case 9: NYI, TODO, restore maximized window or maximize window
2851 default: 3609 default:
2852 if (args[0] >= 24) /* set height (chars) */ 3610 if (args[0] >= 24) /* set height (chars) */
2853 set_widthheight ((unsigned int)TermWin.width, 3611 set_widthheight ((unsigned int)width,
2854 (unsigned int) (args[1] * TermWin.fheight)); 3612 (unsigned int) (args[1] * fheight));
2855 break; 3613 break;
3614
3615
2856 /* 3616 /*
2857 * reports - some output format copied from XTerm 3617 * reports - some output format copied from XTerm
2858 */ 3618 */
2859 case 11: /* report window state */ 3619 case 11: /* report window state */
2860 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3620 XGetWindowAttributes (disp, parent[0], &wattr);
2861 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3621 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2862 break; 3622 break;
2863 case 13: /* report window position */ 3623 case 13: /* report window position */
2864 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3624 XGetWindowAttributes (disp, parent[0], &wattr);
2865 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3625 XTranslateCoordinates (disp, parent[0], wattr.root,
2866 -wattr.border_width, -wattr.border_width, 3626 -wattr.border_width, -wattr.border_width,
2867 &x, &y, &wdummy); 3627 &x, &y, &wdummy);
2868 tt_printf ("\033[3;%d;%dt", x, y); 3628 tt_printf ("\033[3;%d;%dt", x, y);
2869 break; 3629 break;
2870 case 14: /* report window size (pixels) */ 3630 case 14: /* report window size (pixels) */
2871 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3631 XGetWindowAttributes (disp, parent[0], &wattr);
2872 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3632 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2873 break; 3633 break;
3634 case 18: /* report text area size (chars) */
3635 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3636 break;
2874 case 18: /* report window size (chars) */ 3637 case 19: /* report window size (chars) */
2875 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3638 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2876 break; 3639 break;
2877#if 0 /* XXX: currently disabled due to security concerns */
2878 case 20: /* report icon label */ 3640 case 20: /* report icon label */
3641 {
3642 char *s;
2879 XGetIconName (display->display, TermWin.parent[0], &s); 3643 XGetIconName (disp, parent[0], &s);
2880 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 }
2881 break; 3647 break;
2882 case 21: /* report window title */ 3648 case 21: /* report window title */
3649 {
3650 char *s;
2883 XFetchName (display->display, TermWin.parent[0], &s); 3651 XFetchName (disp, parent[0], &s);
2884 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 }
2885 break; 3655 break;
2886#endif
2887
2888 } 3656 }
2889} 3657}
2890#endif 3658#endif
2891 3659
2892/*----------------------------------------------------------------------*/ 3660/*----------------------------------------------------------------------*/
2893/* 3661/*
2894 * get input up until STRING TERMINATOR (or BEL) 3662 * get input up until STRING TERMINATOR (or BEL)
2895 * ends_how is terminator used. returned input must be free ()d 3663 * ends_how is terminator used. returned input must be free()'d
2896 */ 3664 */
2897unsigned char * 3665char *
2898rxvt_term::get_to_st (unsigned char *ends_how) 3666rxvt_term::get_to_st (unicode_t &ends_how)
2899{ 3667{
2900 int seen_esc = 0; /* seen escape? */ 3668 unicode_t ch;
3669 bool seen_esc = false;
2901 unsigned int n = 0; 3670 unsigned int n = 0;
2902 unsigned char *s; 3671 wchar_t string[STRING_MAX];
2903 unsigned char ch, string[STRING_MAX];
2904 3672
2905 for (; (ch = cmd_getc ());) 3673 while ((ch = cmd_getc ()) != NOCHAR)
2906 { 3674 {
2907 if (ch == C0_BEL 3675 if (seen_esc)
2908 || ch == CHAR_ST 3676 {
2909 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3677 if (ch == 0x5c) /* 7bit ST */
2910 break; 3678 break;
3679 else
3680 return NULL;
3681 }
2911 if (ch == C0_ESC) 3682 else if (ch == C0_ESC)
2912 { 3683 {
2913 seen_esc = 1; 3684 seen_esc = true;
2914 continue; 3685 continue;
2915 } 3686 }
2916 else if (ch == '\t') 3687 else if (ch == C0_BEL || ch == CHAR_ST)
2917 ch = ' '; /* translate '\t' to space */ 3688 break;
2918 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3689 else if (ch < 0x20)
2919 return NULL; /* other control character - exit */ 3690 return NULL; /* other control character - exit */
2920 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
2921 string[n++] = ch; 3701 string[n++] = ch;
2922 seen_esc = 0;
2923 } 3702 }
3703
2924 string[n++] = '\0'; 3704 string[n++] = '\0';
2925 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3705
2926 return NULL;
2927 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3706 ends_how = (ch == 0x5c ? C0_ESC : ch);
2928 STRNCPY (s, string, n); 3707
2929 return s; 3708 return rxvt_wcstombs (string);
2930} 3709}
2931 3710
2932/*----------------------------------------------------------------------*/ 3711/*----------------------------------------------------------------------*/
2933/* 3712/*
2934 * 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)'
2935 */ 3714 */
2936void 3715void
2937rxvt_term::process_dcs_seq () 3716rxvt_term::process_dcs_seq ()
2938{ 3717{
2939 unsigned char eh, *s; 3718 char *s;
3719 unicode_t eh;
3720
2940 /* 3721 /*
2941 * Not handled yet 3722 * Not handled yet
2942 */ 3723 */
2943 s = get_to_st (&eh); 3724 s = get_to_st (eh);
2944 if (s) 3725 if (s)
2945 free (s); 3726 free (s);
3727
2946 return; 3728 return;
2947} 3729}
2948 3730
2949/*----------------------------------------------------------------------*/ 3731/*----------------------------------------------------------------------*/
2950/* 3732/*
2951 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3733 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2952 */ 3734 */
2953void 3735void
2954rxvt_term::process_osc_seq () 3736rxvt_term::process_osc_seq ()
2955{ 3737{
2956 unsigned char ch, eh, *s; 3738 unicode_t ch, eh;
2957 int arg; 3739 int arg;
2958 3740
2959 ch = cmd_getc (); 3741 ch = cmd_getc ();
2960 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3742 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2961 arg = arg * 10 + (ch - '0'); 3743 arg = arg * 10 + (ch - '0');
2962 3744
2963 if (ch == ';') 3745 if (ch == ';')
2964 { 3746 {
2965 s = get_to_st (&eh); 3747 char *s = get_to_st (eh);
3748
2966 if (s) 3749 if (s)
2967 { 3750 {
2968 /*
2969 * rxvt_menubar_dispatch () violates the constness of the string,
2970 * so do it here
2971 */
2972 if (arg == XTerm_Menu)
2973#if 0 /* XXX: currently disabled due to security concerns */
2974 menubar_dispatch ((char *)s);
2975#else
2976 (void)0;
2977#endif
2978 else
2979 xterm_seq (arg, (char *)s, eh); 3751 process_xterm_seq (arg, s, eh);
2980 free (s); 3752 free (s);
2981 } 3753 }
2982 } 3754 }
2983} 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
2984/* 3770/*
2985 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3771 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2986 * 0 = change iconName/title
2987 * 1 = change iconName
2988 * 2 = change title
2989 * 4 = change color
2990 * 12 = change text color
2991 * 13 = change mouse foreground color
2992 * 17 = change highlight character colour
2993 * 18 = change bold character color
2994 * 19 = change underlined character color
2995 * 46 = change logfile (not implemented)
2996 * 50 = change font
2997 *
2998 * rxvt extensions:
2999 * 9 = change locale (NYI)
3000 * 10 = menu (may change in future)
3001 * 20 = bg pixmap
3002 * 39 = change default fg color
3003 * 49 = change default bg color
3004 * 55 = dump scrollback buffer and all of screen
3005 */ 3772 */
3006void 3773void
3007rxvt_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)
3008{ 3775{
3009 int changed = 0; 3776 int color;
3010 int color;
3011 char *buf, *name; 3777 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1];
3779 int saveop = op;
3780 dDisp;
3012 3781
3013 assert (str != NULL); 3782 assert (str != NULL);
3014 switch (op) 3783 switch (op)
3015 { 3784 {
3016 case XTerm_name: 3785 case XTerm_name:
3017 set_title (str); 3786 set_title (str);
3018 /* FALLTHROUGH */ 3787 /* FALLTHROUGH */
3019 case XTerm_iconName: 3788 case XTerm_iconName:
3020 set_iconName (str); 3789 set_icon_name (str);
3021 break; 3790 break;
3022 case XTerm_title: 3791 case XTerm_title:
3023 set_title (str); 3792 set_title (str);
3024 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
3025 case XTerm_Color: 3833 case XTerm_Color:
3026 for (buf = (char *)str; buf && *buf;) 3834 for (buf = (char *)str; buf && *buf;)
3027 { 3835 {
3028 if ((name = STRCHR (buf, ';')) == NULL) 3836 if ((name = strchr (buf, ';')) == NULL)
3029 break; 3837 break;
3838
3030 *name++ = '\0'; 3839 *name++ = '\0';
3031 color = atoi (buf); 3840 color = atoi (buf) + minCOLOR;
3032 if (color < 0 || color >= TOTAL_COLORS) 3841
3842 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3033 break; 3843 break;
3844
3034 if ((buf = STRCHR (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3035 *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
3036 set_window_color (color + minCOLOR, name); 3855 set_window_color (color, name);
3037 } 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);
3038 break; 3863 break;
3039#ifndef NO_CURSORCOLOR 3864#ifndef NO_CURSORCOLOR
3040 case XTerm_Color_cursor: 3865 case XTerm_Color_cursor:
3041 set_window_color (Color_cursor, str); 3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3042 break; 3867 break;
3043#endif 3868#endif
3044 case XTerm_Color_pointer: 3869 case XTerm_Color_pointer_fg:
3045 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);
3046 break; 3874 break;
3047#ifndef NO_BOLD_UNDERLINE_REVERSE 3875#ifndef NO_BOLD_UNDERLINE_REVERSE
3048 case XTerm_Color_BD:
3049 set_window_color (Color_BD, str);
3050 break;
3051 case XTerm_Color_UL:
3052 set_window_color (Color_UL, str);
3053 break;
3054 case XTerm_Color_RV: 3876 case XTerm_Color_RV:
3055 set_window_color (Color_RV, str); 3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3056 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;
3057#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
3058 3899
3059 case XTerm_Menu: 3900 case Rxvt_Pixmap:
3060 /* 3901 {
3061 * rxvt_menubar_dispatch () violates the constness of the string,
3062 * so DON'T do it here
3063 */
3064 break;
3065 case XTerm_Pixmap:
3066 if (*str != ';') 3902 if (*str != ';')
3067 { 3903 {
3068#if XPM_BACKGROUND 3904#if XPM_BACKGROUND
3069 scale_pixmap (""); /* reset to default scaling */ 3905 scale_pixmap (""); /* reset to default scaling */
3070 set_bgPixmap (str); /* change pixmap */ 3906 set_bgPixmap (str); /* change pixmap */
3071#endif
3072 scr_touch (true); 3907 scr_touch (true);
3908#endif
3073 } 3909 }
3910
3911 int changed = 0;
3912
3074 while ((str = STRCHR (str, ';')) != NULL) 3913 while ((str = strchr (str, ';')) != NULL)
3075 { 3914 {
3076 str++; 3915 str++;
3077#if XPM_BACKGROUND 3916#if XPM_BACKGROUND
3078 changed += scale_pixmap (str); 3917 changed += scale_pixmap (str);
3079#endif 3918#endif
3080
3081 } 3919 }
3920
3082 if (changed) 3921 if (changed)
3083 { 3922 {
3084#ifdef XPM_BACKGROUND 3923#ifdef XPM_BACKGROUND
3085 resize_pixmap (); 3924 resize_pixmap ();
3086#endif
3087 scr_touch (true); 3925 scr_touch (true);
3926#endif
3088 } 3927 }
3928 }
3089 break; 3929 break;
3090 3930
3091 case XTerm_restoreFG: 3931 case Rxvt_restoreFG:
3092 set_window_color (Color_fg, str); 3932 set_window_color (Color_fg, str);
3093 break; 3933 break;
3094 case XTerm_restoreBG: 3934 case Rxvt_restoreBG:
3095 set_window_color (Color_bg, str); 3935 set_window_color (Color_bg, str);
3096 break; 3936 break;
3937
3097 case XTerm_logfile: 3938 case XTerm_logfile:
3939 // TODO, when secure mode?
3098 break; 3940 break;
3099 case XTerm_font: 3941
3100 change_font (str);
3101 break;
3102 case XTerm_locale:
3103 if (str[0] == '?' && !str[1])
3104 tt_printf ("%-.250s\n", locale);
3105 else
3106 {
3107 set_locale (str);
3108 im_cb ();
3109 }
3110 break;
3111#if 0 3942#if 0
3112 case XTerm_dumpscreen: /* no error notices */ 3943 case Rxvt_dumpscreen: /* no error notices */
3113 { 3944 {
3114 int fd; 3945 int fd;
3115 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)
3116 { 3947 {
3117 scr_dump (fd); 3948 scr_dump (fd);
3118 close (fd); 3949 close (fd);
3119 } 3950 }
3120 } 3951 }
3121 break; 3952 break;
3122#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)];
3123 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
3124 } 4009 }
3125} 4010}
3126/*----------------------------------------------------------------------*/ 4011/*----------------------------------------------------------------------*/
3127 4012
3128/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4013/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3136 * so no need for fancy checking 4021 * so no need for fancy checking
3137 */ 4022 */
3138int 4023int
3139rxvt_term::privcases (int mode, unsigned long bit) 4024rxvt_term::privcases (int mode, unsigned long bit)
3140{ 4025{
3141 int state; 4026 int state;
3142 4027
3143 if (mode == 's') 4028 if (mode == 's')
3144 { 4029 {
3145 SavedModes |= (PrivateModes & bit); 4030 SavedModes |= (priv_modes & bit);
3146 return -1; 4031 return -1;
3147 } 4032 }
3148 else 4033 else
3149 { 4034 {
3150 if (mode == 'r') 4035 if (mode == 'r')
3151 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4036 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3152 else 4037 else
3153 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4038 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3154 PrivMode (state, bit); 4039 PrivMode (state, bit);
3155 } 4040 }
4041
3156 return state; 4042 return state;
3157} 4043}
3158 4044
3159/* we're not using priv _yet_ */ 4045/* we're not using priv _yet_ */
3160void 4046void
3161rxvt_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)
3162{ 4048{
3163 unsigned int i, j; 4049 unsigned int i, j;
3164 int state; 4050 int state;
4051
3165 static const struct 4052 static const struct
3166 { 4053 {
3167 const int argval; 4054 const int argval;
3168 const unsigned long bit; 4055 const unsigned long bit;
3169 } 4056 }
4057
3170 argtopriv[] = { 4058 argtopriv[] = {
3171 { 1, PrivMode_aplCUR }, 4059 { 1, PrivMode_aplCUR },
3172 { 2, PrivMode_vt52 }, 4060 { 2, PrivMode_vt52 },
3173 { 3, PrivMode_132 }, 4061 { 3, PrivMode_132 },
3174 { 4, PrivMode_smoothScroll }, 4062 { 4, PrivMode_smoothScroll },
3175 { 5, PrivMode_rVideo }, 4063 { 5, PrivMode_rVideo },
3176 { 6, PrivMode_relOrigin }, 4064 { 6, PrivMode_relOrigin },
3177 { 7, PrivMode_Autowrap }, 4065 { 7, PrivMode_Autowrap },
4066 // 8, bi-directional support mode
3178 { 9, PrivMode_MouseX10 }, 4067 { 9, PrivMode_MouseX10 },
3179#ifdef menuBar_esc 4068 // 18, 19 printing-related
3180 { menuBar_esc, PrivMode_menuBar }, 4069 { 25, PrivMode_VisibleCursor },
3181#endif
3182#ifdef scrollBar_esc 4070#ifdef scrollBar_esc
3183 { scrollBar_esc, PrivMode_scrollBar }, 4071 { scrollBar_esc, PrivMode_scrollBar },
3184#endif 4072#endif
3185 { 25, PrivMode_VisibleCursor },
3186 { 35, PrivMode_ShiftKeys }, 4073 { 35, PrivMode_ShiftKeys }, // rxvt extension
3187 { 40, PrivMode_132OK }, 4074 { 40, PrivMode_132OK },
4075 // 41 xterm more fixes NYI
4076 // 45 margin bell NYI
4077 // 46 start logging
3188 { 47, PrivMode_Screen }, 4078 { 47, PrivMode_Screen },
3189 { 66, PrivMode_aplKP }, 4079 { 66, PrivMode_aplKP },
3190#ifndef NO_BACKSPACE_KEY 4080#ifndef NO_BACKSPACE_KEY
3191 { 67, PrivMode_BackSpace }, 4081 { 67, PrivMode_BackSpace },
3192#endif 4082#endif
3193 { 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
3194 { 1010, PrivMode_TtyOutputInh }, 4087 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3195 { 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
3196 { 1047, PrivMode_Screen }, 4092 { 1047, PrivMode_Screen },
4093 // 1048 save and restore cursor
3197 { 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
3198 }; 4096 };
3199 4097
3200 if (nargs == 0) 4098 if (nargs == 0)
3201 return; 4099 return;
3202 4100
… …
3217 state = privcases (mode, argtopriv[j].bit); 4115 state = privcases (mode, argtopriv[j].bit);
3218 break; 4116 break;
3219 } 4117 }
3220 4118
3221 /* extra handling for values with state unkept */ 4119 /* extra handling for values with state unkept */
3222 if (state == -1)
3223 switch (arg[i]) 4120 switch (arg[i])
3224 { 4121 {
4122#if ENABLE_STYLES
4123 case 1021:
4124 set_option (Opt_intensityStyles, mode);
4125
4126 scr_touch (true);
4127 break;
4128#endif
3225 case 1048: /* alternative cursor save */ 4129 case 1048: /* alternative cursor save */
4130 case 1049:
4131 if (OPTION (Opt_secondaryScreen))
3226 if (mode == 0) 4132 if (mode == 0)
3227 scr_cursor (RESTORE); 4133 scr_cursor (RESTORE);
3228 else if (mode == 1) 4134 else if (mode == 1)
3229 scr_cursor (SAVE); 4135 scr_cursor (SAVE);
3230 /* FALLTHROUGH */
3231 default:
3232 continue; /* for (;i;) */
3233 }
3234
3235 /* extra handling for values with valid 0 or 1 state */
3236 switch (arg[i])
3237 {
3238 /* case 1: - application cursor keys */
3239 case 2: /* VT52 mode */
3240 /* oddball mode. should be set regardless of set/reset
3241 * parameter. Return from VT52 mode with an ESC < from
3242 * within VT52 mode
3243 */
3244 PrivMode (1, PrivMode_vt52);
3245 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;
3246 case 3: /* 80/132 */ 4151 case 3: /* 80/132 */
3247 if (PrivateModes & PrivMode_132OK) 4152 if (priv_modes & PrivMode_132OK)
3248 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4153 set_widthheight (((state ? 132 : 80) * fwidth), height);
3249 (unsigned int)TermWin.height);
3250 break; 4154 break;
3251 case 4: /* smooth scrolling */ 4155 case 4: /* smooth scrolling */
3252 if (state)
3253 Options &= ~Opt_jumpScroll;
3254 else
3255 Options |= Opt_jumpScroll; 4156 set_option (Opt_jumpScroll, !state);
3256 break; 4157 break;
3257 case 5: /* reverse video */ 4158 case 5: /* reverse video */
3258 scr_rvideo_mode (state); 4159 scr_rvideo_mode (state);
3259 break; 4160 break;
3260 case 6: /* relative/absolute origins */ 4161 case 6: /* relative/absolute origins */
3261 scr_relative_origin (state); 4162 scr_relative_origin (state);
3262 break; 4163 break;
3263 case 7: /* autowrap */ 4164 case 7: /* autowrap */
3264 scr_autowrap (state); 4165 scr_autowrap (state);
3265 break; 4166 break;
3266 /* 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 */
3267 case 9: /* X10 mouse reporting */ 4168 case 9: /* X10 mouse reporting */
3268 if (state) /* orthogonal */ 4169 if (state) /* orthogonal */
3269 PrivateModes &= ~ (PrivMode_MouseX11); 4170 priv_modes &= ~PrivMode_MouseX11;
3270 break; 4171 break;
3271#ifdef menuBar_esc
3272 case menuBar_esc:
3273#ifdef MENUBAR
3274 map_menuBar (state);
3275#endif
3276 break;
3277#endif
3278#ifdef scrollBar_esc 4172#ifdef scrollBar_esc
3279 case scrollBar_esc: 4173 case scrollBar_esc:
3280 if (scrollbar_mapping (state)) 4174 if (scrollbar_mapping (state))
3281 { 4175 {
3282 resize_all_windows (0, 0, 0); 4176 resize_all_windows (0, 0, 0);
3283 scr_touch (true); 4177 scr_touch (true);
3284 } 4178 }
3285 break; 4179 break;
3286#endif 4180#endif
3287 case 25: /* visible/invisible cursor */ 4181 case 25: /* visible/invisible cursor */
3288 scr_cursor_visible (state); 4182 scr_cursor_visible (state);
3289 break; 4183 break;
3290 /* case 35: - shift keys */ 4184 /* case 35: - shift keys */
3291 /* case 40: - 80 <--> 132 mode */ 4185 /* case 40: - 80 <--> 132 mode */
3292 case 47: /* secondary screen */ 4186 case 47: /* secondary screen */
3293 scr_change_screen (state); 4187 scr_change_screen (state);
3294 break; 4188 break;
3295 /* case 66: - application key pad */ 4189 /* case 66: - application key pad */
3296 /* case 67: - backspace key */ 4190 /* case 67: - backspace key */
3297 case 1000: /* X11 mouse reporting */ 4191 case 1000: /* X11 mouse reporting */
3298 if (state) /* orthogonal */ 4192 if (state) /* orthogonal */
3299 PrivateModes &= ~ (PrivMode_MouseX10); 4193 priv_modes &= ~PrivMode_MouseX10;
3300 break; 4194 break;
3301#if 0 4195#if 0
3302 case 1001: 4196 case 1001:
3303 break; /* X11 mouse highlighting */ 4197 break; /* X11 mouse highlighting */
3304#endif 4198#endif
3305 case 1010: /* scroll to bottom on TTY output inhibit */ 4199 case 1010: /* scroll to bottom on TTY output inhibit */
3306 if (state)
3307 Options &= ~Opt_scrollTtyOutput;
3308 else
3309 Options |= Opt_scrollTtyOutput; 4200 set_option (Opt_scrollTtyOutput, !state);
3310 break; 4201 break;
3311 case 1011: /* scroll to bottom on key press */ 4202 case 1011: /* scroll to bottom on key press */
3312 if (state)
3313 Options |= Opt_scrollTtyKeypress; 4203 set_option (Opt_scrollTtyKeypress, state);
3314 else
3315 Options &= ~Opt_scrollTtyKeypress;
3316 break; 4204 break;
3317 case 1047: /* secondary screen w/ clearing */ 4205 case 1047: /* secondary screen w/ clearing last */
3318 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4206 if (OPTION (Opt_secondaryScreen))
3319 if (current_screen != PRIMARY) 4207 if (current_screen != PRIMARY)
3320 scr_erase_screen (2); 4208 scr_erase_screen (2);
3321 scr_change_screen (state); 4209 scr_change_screen (state);
3322 /* FALLTHROUGH */
3323 default:
3324 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;
3325 } 4219 }
3326 } 4220 }
3327} 4221}
3328/*}}} */ 4222/*}}} */
3329 4223
3330/*{{{ process sgr sequences */ 4224/*{{{ process sgr sequences */
3331void 4225void
3332rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4226rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3333{ 4227{
3334 unsigned int i; 4228 unsigned int i;
3335 short rendset; 4229 short rendset;
3336 int rendstyle; 4230 int rendstyle;
3337 4231
3338 if (nargs == 0) 4232 if (nargs == 0)
3339 { 4233 {
3340 scr_rendition (0, ~RS_None); 4234 scr_rendition (0, ~RS_None);
3341 return; 4235 return;
3342 } 4236 }
4237
3343 for (i = 0; i < nargs; i++) 4238 for (i = 0; i < nargs; i++)
3344 { 4239 {
3345 rendset = -1; 4240 rendset = -1;
3346 switch (arg[i]) 4241 switch (arg[i])
3347 { 4242 {
… …
3349 rendset = 0, rendstyle = ~RS_None; 4244 rendset = 0, rendstyle = ~RS_None;
3350 break; 4245 break;
3351 case 1: 4246 case 1:
3352 rendset = 1, rendstyle = RS_Bold; 4247 rendset = 1, rendstyle = RS_Bold;
3353 break; 4248 break;
4249 //case 2: // low intensity
4250 case 3:
4251 rendset = 1, rendstyle = RS_Italic;
4252 break;
3354 case 4: 4253 case 4:
3355 rendset = 1, rendstyle = RS_Uline; 4254 rendset = 1, rendstyle = RS_Uline;
3356 break; 4255 break;
3357 case 5: 4256 case 5: // slowly blinking
4257 case 6: // rapidly blinking
3358 rendset = 1, rendstyle = RS_Blink; 4258 rendset = 1, rendstyle = RS_Blink;
3359 break; 4259 break;
4260 //case 6: // scoansi light background
3360 case 7: 4261 case 7:
3361 rendset = 1, rendstyle = RS_RVid; 4262 rendset = 1, rendstyle = RS_RVid;
3362 break; 4263 break;
3363 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)
3364 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;
3365 break; 4282 break;
3366 case 24: 4283 case 24:
3367 rendset = 0, rendstyle = RS_Uline; 4284 rendset = 0, rendstyle = RS_Uline;
3368 break; 4285 break;
3369 case 25: 4286 case 25:
3370 rendset = 0, rendstyle = RS_Blink; 4287 rendset = 0, rendstyle = RS_Blink;
3371 break; 4288 break;
4289 case 26: // variable spacing (iso 8613)
4290 rendset = 0, rendstyle = RS_Blink;
4291 break;
3372 case 27: 4292 case 27:
3373 rendset = 0, rendstyle = RS_RVid; 4293 rendset = 0, rendstyle = RS_RVid;
3374 break; 4294 break;
4295 //case 28: // visible. NYI
4296 //case 29: // not crossed-out
3375 } 4297 }
4298
3376 if (rendset != -1) 4299 if (rendset != -1)
3377 { 4300 {
3378 scr_rendition (rendset, rendstyle); 4301 scr_rendition (rendset, rendstyle);
3379 continue; /* for (;i;) */ 4302 continue; /* for (;i;) */
3380 } 4303 }
… …
3387 case 33: 4310 case 33:
3388 case 34: 4311 case 34:
3389 case 35: 4312 case 35:
3390 case 36: 4313 case 36:
3391 case 37: 4314 case 37:
3392 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4315 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3393 Color_fg);
3394 break; 4316 break;
3395#ifdef TTY_256COLOR 4317 case 38: // set fg color, ISO 8613-6
3396 case 38:
3397 if (nargs > i + 2 && arg[i + 1] == 5) 4318 if (nargs > i + 2 && arg[i + 1] == 5)
3398 { 4319 {
3399 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4320 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3400 Color_fg);
3401 i += 2; 4321 i += 2;
3402 } 4322 }
3403 break; 4323 break;
3404#endif
3405 case 39: /* default fg */ 4324 case 39: /* default fg */
3406 scr_color (Color_fg, Color_fg); 4325 scr_color (Color_fg, Color_fg);
3407 break; 4326 break;
3408 4327
3409 case 40: 4328 case 40:
… …
3412 case 43: 4331 case 43:
3413 case 44: 4332 case 44:
3414 case 45: 4333 case 45:
3415 case 46: 4334 case 46:
3416 case 47: 4335 case 47:
3417 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4336 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3418 Color_bg);
3419 break; 4337 break;
3420#ifdef TTY_256COLOR 4338 case 48: // set bg color, ISO 8613-6
3421 case 48:
3422 if (nargs > i + 2 && arg[i + 1] == 5) 4339 if (nargs > i + 2 && arg[i + 1] == 5)
3423 { 4340 {
3424 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4341 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3425 Color_bg);
3426 i += 2; 4342 i += 2;
3427 } 4343 }
3428 break; 4344 break;
3429#endif
3430 case 49: /* default bg */ 4345 case 49: /* default bg */
3431 scr_color (Color_bg, Color_bg); 4346 scr_color (Color_bg, Color_bg);
3432 break; 4347 break;
3433 4348
3434#ifndef NO_BRIGHTCOLOR 4349 //case 50: // not variable spacing
4350
4351#if ENABLE_FRILLS
3435 case 90: 4352 case 90:
3436 case 91: /* set bright fg color */ 4353 case 91: /* set bright fg color */
3437 case 92: 4354 case 92:
3438 case 93: 4355 case 93:
3439 case 94: 4356 case 94:
3440 case 95: 4357 case 95:
3441 case 96: 4358 case 96:
3442 case 97: 4359 case 97:
3443 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4360 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3444 Color_fg);
3445 break; 4361 break;
3446 case 100: 4362 case 100:
3447 case 101: /* set bright bg color */ 4363 case 101: /* set bright bg color */
3448 case 102: 4364 case 102:
3449 case 103: 4365 case 103:
3450 case 104: 4366 case 104:
3451 case 105: 4367 case 105:
3452 case 106: 4368 case 106:
3453 case 107: 4369 case 107:
3454 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4370 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3455 Color_bg);
3456 break; 4371 break;
3457#endif 4372#endif
3458
3459 } 4373 }
3460 } 4374 }
3461} 4375}
3462/*}}} */ 4376/*}}} */
3463 4377
3464/*{{{ process Rob Nation's own graphics mode sequences */ 4378/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3465void 4379void
3466rxvt_term::process_graphics () 4380rxvt_term::process_graphics ()
3467{ 4381{
3468 unsigned char ch, cmd = cmd_getc (); 4382 unicode_t ch, cmd = cmd_getc ();
3469 4383
3470 if (cmd == 'Q') 4384 if (cmd == 'Q')
3471 { /* query graphics */ 4385 { /* query graphics */
3472 tt_printf ("\033G0\n"); /* no graphics */ 4386 tt_printf ("\033G0\012"); /* no graphics */
3473 return; 4387 return;
3474 } 4388 }
3475 /* swallow other graphics sequences until terminating ':' */ 4389 /* swallow other graphics sequences until terminating ':' */
3476 do 4390 do
3477 ch = cmd_getc (); 4391 ch = cmd_getc ();
… …
3487 */ 4401 */
3488void 4402void
3489rxvt_term::tt_printf (const char *fmt,...) 4403rxvt_term::tt_printf (const char *fmt,...)
3490{ 4404{
3491 va_list arg_ptr; 4405 va_list arg_ptr;
3492 unsigned char buf[256]; 4406 char buf[256];
3493 4407
3494 va_start (arg_ptr, fmt); 4408 va_start (arg_ptr, fmt);
3495 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4409 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3496 va_end (arg_ptr); 4410 va_end (arg_ptr);
3497 tt_write (buf, STRLEN (buf)); 4411 tt_write (buf, strlen (buf));
3498} 4412}
3499 4413
3500/* ---------------------------------------------------------------------- */ 4414/* ---------------------------------------------------------------------- */
3501/* 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,
3502 * or generated by us in response to a query ESC sequence. 4416 * or generated by us in response to a query ESC sequence.
3503 */ 4417 */
4418const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4419
3504void 4420void
3505rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4421rxvt_term::tt_write (const char *data, unsigned int len)
3506{ 4422{
3507 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;
3508 4425
3509 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;
3510 { 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
3511 if (v_buflen == 0) 4456 if (v_buflen == 0)
3512 { 4457 {
3513 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3514
3515 if ((unsigned int)written == len)
3516 return;
3517
3518 data += written;
3519 len -= written;
3520 }
3521
3522
3523 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3524
3525 memcpy (v_buffer + v_buflen, data, len);
3526 v_buflen += len;
3527 }
3528
3529 for (;;)
3530 {
3531 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3532
3533 if (written > 0)
3534 {
3535 v_buflen -= written;
3536
3537 if (v_buflen == 0)
3538 {
3539 free (v_buffer); 4458 free (v_buffer);
3540 v_buffer = 0; 4459 v_buffer = 0;
3541 v_buflen = 0; 4460 v_buflen = 0;
3542 4461
3543 pty_ev.set (EVENT_READ); 4462 pty_ev.set (EVENT_READ);
3544 return;
3545 }
3546
3547 memmove (v_buffer, v_buffer + written, v_buflen);
3548 }
3549 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3550 // original code just ignores this...
3551 destroy ();
3552 else
3553 {
3554 pty_ev.set (EVENT_READ | EVENT_WRITE);
3555 return; 4463 return;
3556 } 4464 }
4465
4466 memmove (v_buffer, v_buffer + written, v_buflen);
3557 } 4467 }
4468 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4469 pty_ev.set (EVENT_READ);
3558} 4470}
3559 4471
3560/*----------------------- end-of-file (C source) -----------------------*/ 4472/*----------------------- end-of-file (C source) -----------------------*/
3561 4473

Diff Legend

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