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

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

Diff Legend

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