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

Diff Legend

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