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

Diff Legend

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