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

Diff Legend

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