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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.57 by pcg, Tue Feb 24 16:25:44 2004 UTC vs.
Revision 1.266 by root, Mon Jan 16 08:57:02 2006 UTC

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

Diff Legend

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