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

Diff Legend

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