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.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.293 by root, Mon Jan 30 04:27:17 2006 UTC

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

Diff Legend

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