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

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

Diff Legend

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