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.212 by root, Wed Dec 21 14:19:19 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(-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)
807 destroy (); 1073 destroy ();
808 1074
809 return false; 1075 return false;
810} 1076}
811 1077
812void 1078void
813rxvt_term::pty_cb (io_watcher &w, short revents) 1079rxvt_term::pty_cb (io_watcher &w, short revents)
814{ 1080{
815 SET_R (this); 1081 SET_R (this);
816 SET_LOCALE (locale); 1082 SET_LOCALE (locale);
817 1083
1084 if (revents & EVENT_READ)
1085 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ())
1087 if (cmd_parse ())
1088 break;
1089
818 if (revents & EVENT_WRITE) 1090 if (revents & EVENT_WRITE)
819 tt_write (0, 0); 1091 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} 1092}
936 1093
937// read the next character, currently handles UTF-8 1094void
938// will probably handle all sorts of other stuff in the future 1095rxvt_term::pointer_unblank ()
939uint32_t
940rxvt_term::next_char ()
941{ 1096{
942 while (cmdbuf_ptr < cmdbuf_endp) 1097 XDefineCursor (display->display, vt, TermWin_cursor);
943 { 1098 recolour_cursor ();
944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
945 return *cmdbuf_ptr++;
946 1099
947 wchar_t wc; 1100#ifdef POINTER_BLANK
948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1101 hidden_pointer = 0;
949 1102
950 if (len == (size_t)-2) 1103 if (options & Opt_pointerBlank)
951 return NOCHAR; 1104 pointer_ev.start (NOW + pointerBlankDelay);
952 1105#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} 1106}
985 1107
986#ifdef POINTER_BLANK 1108#ifdef POINTER_BLANK
987void 1109void
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 () 1110rxvt_term::pointer_blank ()
1001{ 1111{
1002 if (! (Options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
1003 return; 1113 return;
1004 1114
1005 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1115 XDefineCursor (display->display, vt, display->blank_cursor);
1006 XFlush (display->display); 1116 XFlush (display->display);
1007 1117
1008 hidden_pointer = 1; 1118 hidden_pointer = 1;
1009} 1119}
1010 1120
… …
1017 pointer_blank (); 1127 pointer_blank ();
1018} 1128}
1019#endif 1129#endif
1020 1130
1021void 1131void
1022rxvt_term::mouse_report (const XButtonEvent &ev) 1132rxvt_term::mouse_report (XButtonEvent &ev)
1023{ 1133{
1024 int button_number, key_state = 0; 1134 int button_number, key_state = 0;
1025 int x, y; 1135 int x, y;
1026 1136
1027 x = ev.x; 1137 x = ev.x;
1028 y = ev.y; 1138 y = ev.y;
1029 pixel_position (&x, &y); 1139 pixel_position (&x, &y);
1030 1140
1031 if (MEvent.button == AnyButton) 1141 if (MEvent.button == AnyButton)
1032 {
1033 button_number = 3; 1142 button_number = 3;
1034 }
1035 else 1143 else
1036 { 1144 {
1037 button_number = MEvent.button - Button1; 1145 button_number = MEvent.button - Button1;
1038 /* add 0x3D for wheel events, like xterm does */ 1146 /* add 0x3D for wheel events, like xterm does */
1039 if (button_number >= 3) 1147 if (button_number >= 3)
1040 button_number += (64 - 3); 1148 button_number += (64 - 3);
1041 } 1149 }
1042 1150
1043 if (PrivateModes & PrivMode_MouseX10) 1151 if (priv_modes & PrivMode_MouseX10)
1044 { 1152 {
1045 /* 1153 /*
1046 * do not report ButtonRelease 1154 * do not report ButtonRelease
1047 * no state info allowed 1155 * no state info allowed
1048 */ 1156 */
… …
1063 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1171 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1064 + ((MEvent.state & ControlMask) ? 16 : 0); 1172 + ((MEvent.state & ControlMask) ? 16 : 0);
1065#ifdef MOUSE_REPORT_DOUBLECLICK 1173#ifdef MOUSE_REPORT_DOUBLECLICK
1066 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1174 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1067#endif 1175#endif
1068
1069 } 1176 }
1070 1177
1071#ifdef DEBUG_MOUSEREPORT 1178#if DEBUG_MOUSEREPORT
1072 fprintf (stderr, "Mouse ["); 1179 fprintf (stderr, "Mouse [");
1073 if (key_state & 16) 1180 if (key_state & 16)
1074 fputc ('C', stderr); 1181 fputc ('C', stderr);
1075 if (key_state & 4) 1182 if (key_state & 4)
1076 fputc ('S', stderr); 1183 fputc ('S', stderr);
… …
1080 fputc ('2', stderr); 1187 fputc ('2', stderr);
1081 fprintf (stderr, "]: <%d>, %d/%d\n", 1188 fprintf (stderr, "]: <%d>, %d/%d\n",
1082 button_number, 1189 button_number,
1083 x + 1, 1190 x + 1,
1084 y + 1); 1191 y + 1);
1085#else 1192#endif
1193
1086 tt_printf ("\033[M%c%c%c", 1194 tt_printf ("\033[M%c%c%c",
1087 (32 + button_number + key_state), 1195 (32 + button_number + key_state),
1088 (32 + x + 1), 1196 (32 + x + 1),
1089 (32 + y + 1)); 1197 (32 + y + 1));
1090#endif
1091} 1198}
1092 1199
1093#ifdef USING_W11LIB 1200#ifdef USING_W11LIB
1094void 1201void
1095rxvt_W11_process_x_event (XEvent *ev) 1202rxvt_W11_process_x_event (XEvent *ev)
… …
1102 1209
1103/*{{{ process an X event */ 1210/*{{{ process an X event */
1104void 1211void
1105rxvt_term::x_cb (XEvent &ev) 1212rxvt_term::x_cb (XEvent &ev)
1106{ 1213{
1214 dDisp;
1215
1107 SET_R (this); 1216 SET_R (this);
1108 SET_LOCALE (locale); 1217 SET_LOCALE (locale);
1109 1218
1110#if defined(CURSOR_BLINK) 1219#if defined(CURSOR_BLINK)
1111 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1112 { 1221 {
1113 if (hidden_cursor) 1222 if (hidden_cursor)
1114 { 1223 {
1115 hidden_cursor = 0; 1224 hidden_cursor = 0;
1116 want_refresh = 1; 1225 want_refresh = 1;
… …
1119 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1120 } 1229 }
1121#endif 1230#endif
1122 1231
1123#if defined(POINTER_BLANK) 1232#if defined(POINTER_BLANK)
1124 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1125 { 1234 {
1126 if (ev.type == MotionNotify 1235 if (ev.type == MotionNotify
1127 || ev.type == ButtonPress 1236 || ev.type == ButtonPress
1128 || ev.type == ButtonRelease) 1237 || ev.type == ButtonRelease)
1129 if (hidden_pointer) 1238 if (hidden_pointer)
… …
1132 if (ev.type == KeyPress && hidden_pointer == 0) 1241 if (ev.type == KeyPress && hidden_pointer == 0)
1133 pointer_blank (); 1242 pointer_blank ();
1134 } 1243 }
1135#endif 1244#endif
1136 1245
1137#ifdef USE_XIM
1138 if (XFilterEvent (&ev, None))
1139 return;
1140#endif
1141
1142 Window unused_root, unused_child; 1246 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1247 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1248 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 1249
1195 switch (ev.type) 1250 switch (ev.type)
1196 { 1251 {
1197 case KeyPress: 1252 case KeyPress:
1253#if ISO_14755
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1198 lookup_key (ev.xkey); 1256 lookup_key (ev.xkey);
1257
1258 break;
1259
1260 case KeyRelease:
1261 {
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1263 KeySym ks;
1264
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif
1267
1268#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support
1270 if (iso14755buf)
1271 if (iso14755buf & ISO_14755_52)
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276# if ISO_14755
1277 // iso14755 part 5.2 handling: release time
1278 // first: controls
1279 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f)))
1282 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1284 commit_iso14755 ();
1285 return; // case-break;
1286 }
1287
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks)
1290 {
1291 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 ();
1293 return; // case-break;
1294 }
1295
1296 scr_bell ();
1297# endif
1298 iso14755buf = 0;
1199 break; 1299 break;
1300 }
1301 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1302 {
1303# if ENABLE_OVERLAY
1304 scr_overlay_off ();
1305# endif
1306 if (iso14755buf & ISO_14755_51)
1307 commit_iso14755 ();
1308#if ISO_14755
1309 else if (iso14755buf & ISO_14755_STARTED)
1310 {
1311 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1312
1313 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1314 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1315 }
1316# endif
1317 else
1318 iso14755buf = 0;
1319 }
1320#endif
1200 1321
1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1202 case KeyRelease:
1203 {
1204 if (! (ev.xkey.state & ControlMask)) 1323 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R)
1205 mouse_slip_wheel_speed = 0; 1326 mouse_slip_wheel_speed = 0;
1206 else 1327#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; 1328 break;
1215 } 1329 }
1216#endif
1217 1330
1218 case ButtonPress: 1331 case ButtonPress:
1219 button_press (ev.xbutton); 1332 button_press (ev.xbutton);
1220 break; 1333 break;
1221 1334
… …
1223 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1224 break; 1337 break;
1225 1338
1226 case ClientMessage: 1339 case ClientMessage:
1227 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1229 destroy (); 1344 destroy ();
1345#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev);
1350#endif
1351 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1230#ifdef OFFIX_DND 1361#ifdef OFFIX_DND
1231 /* OffiX Dnd (drag 'n' drop) protocol */ 1362 /* OffiX Dnd (drag 'n' drop) protocol */
1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1233 && (ev.xclient.data.l[0] == DndFile 1364 && (ev.xclient.data.l[0] == DndFile
1234 || ev.xclient.data.l[0] == DndDir 1365 || ev.xclient.data.l[0] == DndDir
1235 || ev.xclient.data.l[0] == DndLink)) 1366 || ev.xclient.data.l[0] == DndLink))
1236 { 1367 {
1237 /* Get Dnd data */ 1368 /* Get Dnd data */
1238 Atom ActualType; 1369 Atom ActualType;
1239 int ActualFormat; 1370 int ActualFormat;
1240 unsigned char *data; 1371 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1372 unsigned long Size, RemainingBytes;
1242 1373
1243 XGetWindowProperty (display->display, display->root, 1374 XGetWindowProperty (disp, display->root,
1244 xa[XA_DNDSELECTION], 1375 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1376 0L, 1000000L,
1246 False, AnyPropertyType, 1377 False, AnyPropertyType,
1247 &ActualType, &ActualFormat, 1378 &ActualType, &ActualFormat,
1248 &Size, &RemainingBytes, 1379 &Size, &RemainingBytes,
1249 &data); 1380 &data);
1250 XChangeProperty (display->display, display->root, 1381 set_string_property (XA_CUT_BUFFER0, data);
1251 XA_CUT_BUFFER0, XA_STRING, 1382 XFree (data);
1252 8, PropModeReplace,
1253 data, STRLEN (data));
1254 selection_paste (display->root, XA_CUT_BUFFER0, True); 1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1256 } 1385 }
1257#endif /* OFFIX_DND */ 1386#endif /* OFFIX_DND */
1258 break; 1387 break;
1259 1388
1260 case MappingNotify: 1389 case MappingNotify:
1261 XRefreshKeyboardMapping (& (ev.xmapping)); 1390 XRefreshKeyboardMapping (&ev.xmapping);
1262 break; 1391 break;
1263 1392
1264 /* 1393 /*
1265 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1285 break; 1414 break;
1286 } 1415 }
1287 break; 1416 break;
1288 1417
1289 case FocusIn: 1418 case FocusIn:
1290 if (!TermWin.focus) 1419 focus_in ();
1420 break;
1421
1422 case FocusOut:
1423 focus_out ();
1424 break;
1425
1426 case ConfigureNotify:
1427 if (ev.xconfigure.window == parent[0])
1291 { 1428 {
1292 TermWin.focus = 1; 1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1293 want_refresh = 1; 1430 ;
1294#ifdef USE_XIM 1431
1295 if (Input_Context != NULL) 1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1296 XSetICFocus (Input_Context); 1433 {
1297#endif 1434 seen_resize = 1;
1298#ifdef CURSOR_BLINK 1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1436 }
1437
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1299 if (Options & Opt_cursorBlink) 1439 if (options & Opt_transparent)
1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1440 check_our_parents ();
1301#endif 1441#endif
1302
1303 } 1442 }
1304 break; 1443 break;
1305 1444
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: 1445 case PropertyNotify:
1325 if (ev.xconfigure.window == TermWin.parent[0]) 1446 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1326 { 1447 && ev.xproperty.state == PropertyNewValue)
1327 int height, width; 1448 selection_property (ev.xproperty.window, ev.xproperty.atom);
1328 1449
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; 1450 break;
1359 1451
1360 case SelectionClear: 1452 case SelectionClear:
1361 display->set_selection_owner (0); 1453 selection_clear ();
1362 break; 1454 break;
1363 1455
1364 case SelectionNotify: 1456 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1457 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1458 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1367 ev.xselection.property, True);
1368 break; 1459 break;
1369 1460
1370 case SelectionRequest: 1461 case SelectionRequest:
1371 selection_send (ev.xselectionrequest); 1462 selection_send (ev.xselectionrequest);
1372 break; 1463 break;
1373 1464
1374 case UnmapNotify: 1465 case UnmapNotify:
1375 TermWin.mapped = 0; 1466 mapped = 0;
1376#ifdef TEXT_BLINK 1467#ifdef TEXT_BLINK
1377 text_blink_ev.stop (); 1468 text_blink_ev.stop ();
1378#endif 1469#endif
1379 break; 1470 break;
1380 1471
1381 case MapNotify: 1472 case MapNotify:
1382 TermWin.mapped = 1; 1473 mapped = 1;
1383#ifdef TEXT_BLINK 1474#ifdef TEXT_BLINK
1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1385#endif 1476#endif
1386 break; 1477 break;
1387 1478
… …
1391 break; 1482 break;
1392#endif /* TRANSPARENT */ 1483#endif /* TRANSPARENT */
1393 1484
1394 case GraphicsExpose: 1485 case GraphicsExpose:
1395 case Expose: 1486 case Expose:
1396 if (ev.xany.window == TermWin.vt) 1487 if (ev.xany.window == vt)
1397 { 1488 {
1398#ifdef NO_SLOW_LINK_SUPPORT 1489 do
1399 scr_expose (ev.xexpose.x, ev.xexpose.y, 1490 scr_expose (ev.xexpose.x, ev.xexpose.y,
1400 ev.xexpose.width, ev.xexpose.height, False); 1491 ev.xexpose.width, ev.xexpose.height, False);
1401#else 1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1402 // don't understand this, so commented it out 1493
1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1495
1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1405 //scr_expose (ev.xexpose.x, 0, 1499
1406 // ev.xexpose.width, TermWin.height, False); 1500 scr_refresh (refresh_type);
1407#endif
1408 want_refresh = 1;
1409 } 1501 }
1410 else 1502 else
1411 { 1503 {
1412 XEvent unused_event; 1504 XEvent unused_event;
1413 1505
1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1415 Expose, 1507 ;
1416 &unused_event)) ; 1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1509 ;
1418 GraphicsExpose, 1510
1419 &unused_event)) ;
1420 if (isScrollbarWindow (ev.xany.window)) 1511 if (isScrollbarWindow (ev.xany.window))
1421 { 1512 {
1422 scrollBar.setIdle (); 1513 scrollBar.setIdle ();
1423 scrollbar_show (0); 1514 scrollbar_show (0);
1424 } 1515 }
1425#ifdef MENUBAR 1516#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose (); 1518 menubar_expose ();
1428#endif 1519#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432 1520
1521#ifdef TRANSPARENT
1522 if (am_transparent && ev.xany.window == parent[0])
1523 XClearWindow (disp, ev.xany.window);
1524#endif
1433 } 1525 }
1434 break; 1526 break;
1435 1527
1436 case MotionNotify: 1528 case MotionNotify:
1437#ifdef POINTER_BLANK 1529#ifdef POINTER_BLANK
… …
1439 pointer_unblank (); 1531 pointer_unblank ();
1440#endif 1532#endif
1441#if MENUBAR 1533#if MENUBAR
1442 if (isMenuBarWindow (ev.xany.window)) 1534 if (isMenuBarWindow (ev.xany.window))
1443 { 1535 {
1444 menubar_control (& (ev.xbutton)); 1536 menubar_control (ev.xbutton);
1445 break; 1537 break;
1446 } 1538 }
1447#endif 1539#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1449 break; 1541 break;
1450 1542
1451 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1452 { 1544 {
1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1545 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1454 { 1546 {
1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1456 ; 1548 ;
1457 1549
1458 XQueryPointer (display->display, TermWin.vt, 1550 XQueryPointer (disp, vt,
1459 &unused_root, &unused_child, 1551 &unused_root, &unused_child,
1460 &unused_root_x, &unused_root_y, 1552 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y), 1553 &ev.xbutton.x, &ev.xbutton.y,
1462 &unused_mask); 1554 &ev.xbutton.state);
1463#ifdef MOUSE_THRESHOLD 1555#ifdef MOUSE_THRESHOLD
1464 /* deal with a `jumpy' mouse */ 1556 /* deal with a `jumpy' mouse */
1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1557 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 { 1558 {
1467#endif 1559#endif
1560#if ISO_14755
1561 // 5.4
1562 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1563 {
1564 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1565 break;
1566 }
1567#endif
1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1568 selection_extend (ev.xbutton.x, ev.xbutton.y,
1469 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1569 ev.xbutton.state & Button3Mask ? 2 : 0);
1570
1470#ifdef SELECTION_SCROLLING 1571#ifdef SELECTION_SCROLLING
1471 if (ev.xbutton.y < TermWin.int_bwidth 1572 if (ev.xbutton.y < int_bwidth
1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1573 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1473 { 1574 {
1474 int dist; 1575 int dist;
1475
1476 pending_scroll_selection=1;
1477 1576
1478 /* don't clobber the current delay if we are 1577 /* don't clobber the current delay if we are
1479 * already in the middle of scrolling. 1578 * already in the middle of scrolling.
1480 */ 1579 */
1481 if (scroll_selection_delay<=0) 1580 if (!sel_scroll_ev.active)
1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1581 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1483 1582
1484 /* save the event params so we can highlight 1583 /* save the event params so we can highlight
1485 * the selection in the pending-scroll loop 1584 * the selection in the pending-scroll loop
1486 */ 1585 */
1487 selection_save_x=ev.xbutton.x; 1586 selection_save_x = ev.xbutton.x;
1488 selection_save_y=ev.xbutton.y; 1587 selection_save_y = ev.xbutton.y;
1489 selection_save_state=
1490 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1588 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1491 1589
1492 /* calc number of lines to scroll */ 1590 /* calc number of lines to scroll */
1493 if (ev.xbutton.y<TermWin.int_bwidth) 1591 if (ev.xbutton.y < int_bwidth)
1494 { 1592 {
1495 scroll_selection_dir = UP; 1593 scroll_selection_dir = UP;
1496 dist = TermWin.int_bwidth - ev.xbutton.y; 1594 dist = int_bwidth - ev.xbutton.y;
1497 } 1595 }
1498 else 1596 else
1499 { 1597 {
1500 scroll_selection_dir = DN; 1598 scroll_selection_dir = DN;
1501 dist = ev.xbutton.y - 1599 dist = ev.xbutton.y - (int_bwidth + height);
1502 (TermWin.int_bwidth + TermWin.height);
1503 } 1600 }
1601
1504 scroll_selection_lines= (Pixel2Height (dist)/ 1602 scroll_selection_lines = Pixel2Height (dist)
1505 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1603 / SELECTION_SCROLL_LINE_SPEEDUP
1604 + 1;
1506 MIN_IT (scroll_selection_lines, 1605 min_it (scroll_selection_lines,
1507 SELECTION_SCROLL_MAX_LINES); 1606 SELECTION_SCROLL_MAX_LINES);
1508 } 1607 }
1509 else 1608 else
1510 { 1609 {
1511 /* we are within the text window, so we 1610 /* we are within the text window, so we
1512 * shouldn't be scrolling 1611 * shouldn't be scrolling
1513 */ 1612 */
1514 pending_scroll_selection = 0; 1613 if (sel_scroll_ev.active)
1614 sel_scroll_ev.stop();
1515 } 1615 }
1516#endif 1616#endif
1517#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1518
1519 } 1618 }
1520#endif 1619#endif
1521
1522 } 1620 }
1523 } 1621 }
1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1525 { 1623 {
1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1624 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1527 MotionNotify, &ev)) ; 1625 MotionNotify, &ev))
1626 ;
1627
1528 XQueryPointer (display->display, scrollBar.win, 1628 XQueryPointer (disp, scrollBar.win,
1529 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1531 & (ev.xbutton.x), & (ev.xbutton.y), 1631 &ev.xbutton.x, &ev.xbutton.y,
1532 &unused_mask); 1632 &unused_mask);
1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1534 scrollbar_size ()); 1634 scrollbar_size ());
1535 scr_refresh (refresh_type); 1635 scr_refresh (refresh_type);
1536 refresh_limit = 0; 1636 refresh_limit = 0;
… …
1539 break; 1639 break;
1540 } 1640 }
1541} 1641}
1542 1642
1543void 1643void
1644rxvt_term::focus_in ()
1645{
1646 if (!focus)
1647 {
1648 focus = 1;
1649 want_refresh = 1;
1650#if USE_XIM
1651 if (Input_Context != NULL)
1652 {
1653 IMSetStatusPosition ();
1654 XSetICFocus (Input_Context);
1655 }
1656#endif
1657#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink)
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1660#endif
1661#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade])
1663 {
1664 pix_colors = pix_colors_focused;
1665 scr_recolour ();
1666 }
1667#endif
1668 }
1669}
1670
1671void
1672rxvt_term::focus_out ()
1673{
1674 if (focus)
1675 {
1676 focus = 0;
1677 want_refresh = 1;
1678
1679#if ENABLE_FRILLS || ISO_14755
1680 iso14755buf = 0;
1681#endif
1682#if ENABLE_OVERLAY
1683 scr_overlay_off ();
1684#endif
1685#if USE_XIM
1686 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context);
1688#endif
1689#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink)
1691 cursor_blink_ev.stop ();
1692 hidden_cursor = 0;
1693#endif
1694#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade])
1696 {
1697 pix_colors = pix_colors_unfocused;
1698 scr_recolour ();
1699 }
1700#endif
1701 }
1702}
1703
1704#if TRANSPARENT
1705void
1544rxvt_term::rootwin_cb (XEvent &ev) 1706rxvt_term::rootwin_cb (XEvent &ev)
1545{ 1707{
1546 SET_R (this); 1708 SET_R (this);
1547 SET_LOCALE (locale); 1709 SET_LOCALE (locale);
1548 1710
1549 switch (ev.type) 1711 switch (ev.type)
1550 { 1712 {
1551 case PropertyNotify: 1713 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 /* 1714 /*
1562 * if user used some Esetroot compatible prog to set the root bg, 1715 * 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. 1716 * use the property to determine the pixmap. We use it later on.
1564 */ 1717 */
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]) 1718 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1569 return; 1720 return;
1570 }
1571 1721
1572 /* FALLTHROUGH */ 1722 /* FALLTHROUGH */
1573 case ReparentNotify: 1723 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ()) 1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1575 if (am_transparent)
1576 want_full_refresh = 1; 1725 want_refresh = want_full_refresh = 1;
1577 break; 1726 break;
1578#endif
1579 } 1727 }
1580} 1728}
1729#endif
1581 1730
1582void 1731void
1583rxvt_term::button_press (const XButtonEvent &ev) 1732rxvt_term::button_press (XButtonEvent &ev)
1584{ 1733{
1585 int reportmode = 0, clickintime; 1734 int reportmode = 0, clickintime;
1586 1735
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1588 if (!bypass_keystate) 1737 if (!bypass_keystate)
1589 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1738 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739
1590 /* 1740 /*
1591 * VT window processing of button press 1741 * VT window processing of button press
1592 */ 1742 */
1593 if (ev.window == TermWin.vt) 1743 if (ev.window == vt)
1594 { 1744 {
1595#if RXVT_GRAPHICS 1745#if ISO_14755
1596 if (ev.subwindow != None) 1746 // 5.4
1597 rxvt_Gr_ButtonPress (ev.x, ev.y); 1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 else 1748 {
1599#endif 1749 iso14755_54 (ev.x, ev.y);
1600 1750 return;
1601 { 1751 }
1752#endif
1753
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1754 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1755
1603 if (reportmode) 1756 if (reportmode)
1757 {
1758 /* mouse report from vt window */
1759 /* save the xbutton state (for ButtonRelease) */
1760 MEvent.state = ev.state;
1761#ifdef MOUSE_REPORT_DOUBLECLICK
1762 if (ev.button == MEvent.button && clickintime)
1604 { 1763 {
1605 /* mouse report from vt window */ 1764 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1765 MEvent.clicks++;
1607 MEvent.state = ev.state; 1766 if (MEvent.clicks > 1)
1608#ifdef MOUSE_REPORT_DOUBLECLICK
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1767 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1768 /* only report double clicks */
1616 MEvent.clicks = 2; 1769 MEvent.clicks = 2;
1617 mouse_report (ev); 1770 mouse_report (ev);
1618 1771
1619 /* don't report the release */ 1772 /* don't report the release */
1620 MEvent.clicks = 0; 1773 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1774 MEvent.button = AnyButton;
1622 }
1623 } 1775 }
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 } 1776 }
1637 else 1777 else
1638 { 1778 {
1779 /* different button, or time expired */
1780 MEvent.clicks = 1;
1781 MEvent.button = ev.button;
1782 mouse_report (ev);
1783 }
1784#else
1785 MEvent.button = ev.button;
1786 mouse_report (ev);
1787#endif /* MOUSE_REPORT_DOUBLECLICK */
1788
1789 }
1790 else
1791 {
1639 if (ev.button != MEvent.button) 1792 if (ev.button != MEvent.button)
1640 MEvent.clicks = 0; 1793 MEvent.clicks = 0;
1794
1641 switch (ev.button) 1795 switch (ev.button)
1642 { 1796 {
1643 case Button1: 1797 case Button1:
1798 /* allow meta + click to select rectangular areas */
1799 /* should be done in screen.C */
1800#if ENABLE_FRILLS
1801 selection.rect = !!(ev.state & ModMetaMask);
1802#else
1803 selection.rect = false;
1804#endif
1805
1644 /* allow shift+left click to extend selection */ 1806 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1646 { 1808 {
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) 1809 if (MEvent.button == Button1 && clickintime)
1667 selection_rotate (ev.x, ev.y); 1810 selection_rotate (ev.x, ev.y);
1668 else 1811 else
1669 selection_extend (ev.x, ev.y, 1); 1812 selection_extend (ev.x, ev.y, 1);
1813 }
1814 else
1815 {
1816 if (MEvent.button == Button1 && clickintime)
1817 MEvent.clicks++;
1818 else
1819 MEvent.clicks = 1;
1820
1821 selection_click (MEvent.clicks, ev.x, ev.y);
1822 }
1823
1824 MEvent.button = Button1;
1825 break;
1826
1827 case Button3:
1828 if (MEvent.button == Button3 && clickintime)
1829 selection_rotate (ev.x, ev.y);
1830 else
1831 selection_extend (ev.x, ev.y, 1);
1832
1670 MEvent.button = Button3; 1833 MEvent.button = Button3;
1671 break; 1834 break;
1672 }
1673 } 1835 }
1836 }
1837
1674 MEvent.time = ev.time; 1838 MEvent.time = ev.time;
1675 return; 1839 return;
1676 }
1677 } 1840 }
1678 1841
1679 /* 1842 /*
1680 * Scrollbar window processing of button press 1843 * Scrollbar window processing of button press
1681 */ 1844 */
… …
1745 upordown = 1; /* down */ 1908 upordown = 1; /* down */
1746 } 1909 }
1747 if (upordown) 1910 if (upordown)
1748 { 1911 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1912#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1913 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1751#endif 1914#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1)) 1915 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 { 1916 {
1754 if (upordown < 0) 1917 if (upordown < 0)
1755 scrollBar.setUp (); 1918 scrollBar.setUp ();
… …
1771 break; 1934 break;
1772 case R_SB_ALIGN_BOTTOM: 1935 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top; 1936 csrO = scrollBar.bot - scrollBar.top;
1774 break; 1937 break;
1775 } 1938 }
1939
1776 if (scrollBar.style == R_SB_XTERM 1940 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y) 1941 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y)) 1942 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO, 1943 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1780 scrollbar_size ()); 1944
1781 scrollBar.setMotion (); 1945 scrollBar.setMotion ();
1782 break; 1946 break;
1783 1947
1784 case Button1: 1948 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1949 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1789 case Button3: 1953 case Button3:
1790 if (scrollBar.style != R_SB_XTERM) 1954 if (scrollBar.style != R_SB_XTERM)
1791 { 1955 {
1792 if (scrollbar_above_slider (ev.y)) 1956 if (scrollbar_above_slider (ev.y))
1793# ifdef RXVT_SCROLL_FULL 1957# ifdef RXVT_SCROLL_FULL
1794 scr_page (UP, TermWin.nrow - 1); 1958 scr_page (UP, nrow - 1);
1795# else 1959# else
1796 scr_page (UP, TermWin.nrow / 4); 1960 scr_page (UP, nrow / 4);
1797# endif 1961# endif
1798 else if (scrollbar_below_slider (ev.y)) 1962 else if (scrollbar_below_slider (ev.y))
1799# ifdef RXVT_SCROLL_FULL 1963# ifdef RXVT_SCROLL_FULL
1800 scr_page (DN, TermWin.nrow - 1); 1964 scr_page (DN, nrow - 1);
1801# else 1965# else
1802 scr_page (DN, TermWin.nrow / 4); 1966 scr_page (DN, nrow / 4);
1803# endif 1967# endif
1804 else 1968 else
1805 scrollBar.setMotion (); 1969 scrollBar.setMotion ();
1806 } 1970 }
1807 else 1971 else
1808 { 1972 {
1809 scr_page ((ev.button == Button1 ? DN : UP), 1973 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow 1974 (nrow
1811 * scrollbar_position (ev.y) 1975 * scrollbar_position (ev.y)
1812 / scrollbar_size ())); 1976 / scrollbar_size ()));
1813 } 1977 }
1978
1814 break; 1979 break;
1815 } 1980 }
1816 } 1981 }
1817 return; 1982 return;
1818 } 1983 }
… …
1824 menubar_control (ev); 1989 menubar_control (ev);
1825#endif 1990#endif
1826} 1991}
1827 1992
1828void 1993void
1829rxvt_term::button_release (const XButtonEvent &ev) 1994rxvt_term::button_release (XButtonEvent &ev)
1830{ 1995{
1831 int reportmode = 0; 1996 int reportmode = 0;
1832 1997
1833 csrO = 0; /* reset csr Offset */ 1998 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 1999 if (!bypass_keystate)
1835 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2000 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836 2001
1837 if (scrollbar_isUpDn ()) 2002 if (scrollbar_isUpDn ())
1838 { 2003 {
1839 scrollBar.setIdle (); 2004 scrollBar.setIdle ();
1840 scrollbar_show (0); 2005 scrollbar_show (0);
1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1842 refresh_type &= ~SMOOTH_REFRESH; 2007 refresh_type &= ~SMOOTH_REFRESH;
1843#endif 2008#endif
1844
1845 } 2009 }
2010
1846#ifdef SELECTION_SCROLLING 2011#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 2012 if (sel_scroll_ev.active)
2013 sel_scroll_ev.stop();
1848#endif 2014#endif
2015
1849 if (ev.window == TermWin.vt) 2016 if (ev.window == vt)
1850 { 2017 {
1851#ifdef RXVT_GRAPHICS 2018#if ISO_14755
1852 if (ev.subwindow != None) 2019 // 5.4
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y); 2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1854 else 2021 return;
1855#endif 2022#endif
1856
1857 {
1858 if (reportmode) 2023 if (reportmode)
2024 {
2025 /* mouse report from vt window */
2026 /* don't report release of wheel "buttons" */
2027 if (ev.button >= 4)
2028 return;
2029#ifdef MOUSE_REPORT_DOUBLECLICK
2030 /* only report the release of 'slow' single clicks */
2031 if (MEvent.button != AnyButton
2032 && (ev.button != MEvent.button
2033 || (ev.time - MEvent.time
2034 > MULTICLICK_TIME / 2)))
1859 { 2035 {
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; 2036 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 2037 MEvent.button = AnyButton;
1877 mouse_report (ev); 2038 mouse_report (ev);
2039 }
2040#else /* MOUSE_REPORT_DOUBLECLICK */
2041 MEvent.button = AnyButton;
2042 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2043#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2044 return;
1880 } 2045 }
2046
1881 /* 2047 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2048 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2049 * when overriding mouse reporting
1884 */ 2050 */
1885 if (PrivateModes & PrivMode_mouse_report 2051 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2052 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2053 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2054 selection_extend (ev.x, ev.y, 0);
1889 2055
1890 switch (ev.button) 2056 switch (ev.button)
2057 {
2058 case Button1:
2059 case Button3:
2060 selection_make (ev.time);
2061 break;
2062 case Button2:
2063 selection_request (ev.time, ev.x, ev.y);
2064 break;
2065#ifdef MOUSE_WHEEL
2066 case Button4:
2067 case Button5:
1891 { 2068 {
1892 case Button1: 2069 int i;
1893 case Button3: 2070 page_dirn v;
1894 selection_make (ev.time); 2071
2072 v = ev.button == Button4 ? UP : DN;
2073
2074 if (ev.state & ShiftMask)
1895 break; 2075 i = 1;
1896 case Button2: 2076 else if (options & Opt_mouseWheelScrollPage)
1897 selection_request (ev.time, ev.x, ev.y); 2077 i = nrow - 1;
2078 else
1898 break; 2079 i = 5;
2080
1899#ifdef MOUSE_WHEEL 2081# ifdef MOUSE_SLIP_WHEELING
1900 case Button4: 2082 if (ev.state & ControlMask)
1901 case Button5:
1902 { 2083 {
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); 2084 mouse_slip_wheel_speed += v ? -1 : 1;
2085 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2086 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2087
2088 if (slip_wheel_ev.at < NOW)
1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2089 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2090
2091 slip_wheel_ev.start ();
1918 } 2092 }
2093 else
2094 {
1919# endif 2095# endif
1920# ifdef JUMP_MOUSE_WHEEL 2096# ifdef JUMP_MOUSE_WHEEL
1921 scr_page (v, i); 2097 scr_page (v, i);
1922 scr_refresh (SMOOTH_REFRESH); 2098 scr_refresh (SMOOTH_REFRESH);
1923 scrollbar_show (1); 2099 scrollbar_show (1);
… …
1927 scr_page (v, 1); 2103 scr_page (v, 1);
1928 scr_refresh (SMOOTH_REFRESH); 2104 scr_refresh (SMOOTH_REFRESH);
1929 scrollbar_show (1); 2105 scrollbar_show (1);
1930 } 2106 }
1931# endif 2107# endif
1932 2108# ifdef MOUSE_SLIP_WHEELING
1933 } 2109 }
1934 break;
1935#endif 2110#endif
1936
1937 } 2111 }
2112 break;
2113#endif
1938 } 2114 }
1939 } 2115 }
1940#ifdef MENUBAR 2116#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window)) 2117 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev); 2118 menubar_control (ev);
1943#endif 2119#endif
1944} 2120}
1945 2121
1946
1947#ifdef TRANSPARENT 2122#ifdef TRANSPARENT
2123#if TINTING
2124/* taken from aterm-0.4.2 */
2125
2126typedef uint32_t RUINT32T;
2127
2128void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2129{
2130 int sh_r, sh_g, sh_b;
2131 RUINT32T mask_r, mask_g, mask_b;
2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2135 int i;
2136
2137 Visual *visual = display->visual;
2138
2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2140
2141 /* for convenience */
2142 mask_r = visual->red_mask;
2143 mask_g = visual->green_mask;
2144 mask_b = visual->blue_mask;
2145
2146 /* boring lookup table pre-initialization */
2147 switch (srcImage->bits_per_pixel) {
2148 case 15:
2149 if ((mask_r != 0x7c00) ||
2150 (mask_g != 0x03e0) ||
2151 (mask_b != 0x001f))
2152 return;
2153 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2154 lookup_r = lookup;
2155 lookup_g = lookup+32;
2156 lookup_b = lookup+32+32;
2157 sh_r = 10;
2158 sh_g = 5;
2159 sh_b = 0;
2160 break;
2161 case 16:
2162 if ((mask_r != 0xf800) ||
2163 (mask_g != 0x07e0) ||
2164 (mask_b != 0x001f))
2165 return;
2166 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2167 lookup_r = lookup;
2168 lookup_g = lookup+32;
2169 lookup_b = lookup+32+64;
2170 sh_r = 11;
2171 sh_g = 5;
2172 sh_b = 0;
2173 break;
2174 case 24:
2175 if ((mask_r != 0xff0000) ||
2176 (mask_g != 0x00ff00) ||
2177 (mask_b != 0x0000ff))
2178 return;
2179 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2180 lookup_r = lookup;
2181 lookup_g = lookup+256;
2182 lookup_b = lookup+256+256;
2183 sh_r = 16;
2184 sh_g = 8;
2185 sh_b = 0;
2186 break;
2187 case 32:
2188 if ((mask_r != 0xff0000) ||
2189 (mask_g != 0x00ff00) ||
2190 (mask_b != 0x0000ff))
2191 return;
2192 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2193 lookup_r = lookup;
2194 lookup_g = lookup+256;
2195 lookup_b = lookup+256+256;
2196 sh_r = 16;
2197 sh_g = 8;
2198 sh_b = 0;
2199 break;
2200 default:
2201 return; /* we do not support this color depth */
2202 }
2203
2204 /* prepare limits for color transformation (each channel is handled separately) */
2205 if (shade < 0) {
2206 shade = -shade;
2207 if (shade < 0) shade = 0;
2208 if (shade > 100) shade = 100;
2209
2210 lower_lim_r = 65535-rm;
2211 lower_lim_g = 65535-gm;
2212 lower_lim_b = 65535-bm;
2213
2214 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2215 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2216 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2217
2218 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2219 } else {
2220 if (shade < 0) shade = 0;
2221 if (shade > 100) shade = 100;
2222
2223 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2224
2225 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2226 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2227 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2228 }
2229
2230 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2231 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2232 {
2233 unsigned int tmp;
2234
2235 tmp = lower_lim_r;
2236 lower_lim_r = lower_lim_b;
2237 lower_lim_b = tmp;
2238
2239 tmp = upper_lim_r;
2240 upper_lim_r = upper_lim_b;
2241 upper_lim_b = tmp;
2242 }
2243
2244 /* fill our lookup tables */
2245 for (i = 0; i <= mask_r>>sh_r; i++)
2246 {
2247 RUINT32T tmp;
2248 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2249 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2250 lookup_r[i] = (tmp/65535)<<sh_r;
2251 }
2252 for (i = 0; i <= mask_g>>sh_g; i++)
2253 {
2254 RUINT32T tmp;
2255 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2256 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2257 lookup_g[i] = (tmp/65535)<<sh_g;
2258 }
2259 for (i = 0; i <= mask_b>>sh_b; i++)
2260 {
2261 RUINT32T tmp;
2262 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2263 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2264 lookup_b[i] = (tmp/65535)<<sh_b;
2265 }
2266
2267 /* apply table to input image (replacing colors by newly calculated ones) */
2268 switch (srcImage->bits_per_pixel)
2269 {
2270 case 15:
2271 {
2272 unsigned short *p1, *pf, *p, *pl;
2273 p1 = (unsigned short *) srcImage->data;
2274 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2275 while (p1 < pf)
2276 {
2277 p = p1;
2278 pl = p1 + srcImage->width;
2279 for (; p < pl; p++)
2280 {
2281 *p = lookup_r[(*p & 0x7c00)>>10] |
2282 lookup_g[(*p & 0x03e0)>> 5] |
2283 lookup_b[(*p & 0x001f)];
2284 }
2285 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2286 }
2287 break;
2288 }
2289 case 16:
2290 {
2291 unsigned short *p1, *pf, *p, *pl;
2292 p1 = (unsigned short *) srcImage->data;
2293 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2294 while (p1 < pf)
2295 {
2296 p = p1;
2297 pl = p1 + srcImage->width;
2298 for (; p < pl; p++)
2299 {
2300 *p = lookup_r[(*p & 0xf800)>>11] |
2301 lookup_g[(*p & 0x07e0)>> 5] |
2302 lookup_b[(*p & 0x001f)];
2303 }
2304 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2305 }
2306 break;
2307 }
2308 case 24:
2309 {
2310 unsigned char *p1, *pf, *p, *pl;
2311 p1 = (unsigned char *) srcImage->data;
2312 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2313 while (p1 < pf)
2314 {
2315 p = p1;
2316 pl = p1 + srcImage->width * 3;
2317 for (; p < pl; p += 3)
2318 {
2319 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2320 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2321 p[2] = lookup_r[(p[2] & 0x0000ff)];
2322 }
2323 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2324 }
2325 break;
2326 }
2327 case 32:
2328 {
2329 RUINT32T *p1, *pf, *p, *pl;
2330 p1 = (RUINT32T *) srcImage->data;
2331 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2332
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0xff0000)>>16] |
2340 lookup_g[(*p & 0x00ff00)>> 8] |
2341 lookup_b[(*p & 0x0000ff)] |
2342 (*p & ~0xffffff);
2343 }
2344 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2345 }
2346 break;
2347 }
2348 }
2349
2350 free (lookup);
2351}
2352#endif
2353
1948/* 2354/*
1949 * Check our parents are still who we think they are. 2355 * Check our parents are still who we think they are.
1950 * Do transparency updates if required 2356 * Do transparency updates if required
1951 */ 2357 */
1952int 2358int
1953rxvt_term::check_our_parents () 2359rxvt_term::check_our_parents ()
1954{ 2360{
1955 int i, pchanged, aformat, have_pixmap, rootdepth; 2361 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after; 2362 unsigned long nitems, bytes_after;
1957 Atom atype; 2363 Atom atype;
1958 unsigned char *prop = NULL; 2364 unsigned char *prop = NULL;
1959 Window root, oldp, *list; 2365 Window root, oldp, *list;
1960 Pixmap rootpixmap = None; 2366 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr; 2367 XWindowAttributes wattr, wrootattr;
2368 dDisp;
1962 2369
1963 pchanged = 0; 2370 pchanged = 0;
1964 2371
1965 if (! (Options & Opt_transparent)) 2372 if (!(options & Opt_transparent))
1966 return pchanged; /* Don't try any more */ 2373 return pchanged; /* Don't try any more */
1967 2374
1968 XGetWindowAttributes (display->display, display->root, &wrootattr); 2375 XGetWindowAttributes (disp, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth; 2376 rootdepth = wrootattr.depth;
1970 2377
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2378 XGetWindowAttributes (disp, parent[0], &wattr);
2379
1972 if (rootdepth != wattr.depth) 2380 if (rootdepth != wattr.depth)
1973 { 2381 {
1974 if (am_transparent) 2382 if (am_transparent)
1975 { 2383 {
1976 pchanged = 1; 2384 pchanged = 1;
1977 XSetWindowBackground (display->display, TermWin.vt, 2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0; 2386 am_transparent = am_pixmap_trans = 0;
1980 } 2387 }
2388
1981 return pchanged; /* Don't try any more */ 2389 return pchanged; /* Don't try any more */
1982 } 2390 }
1983 2391
1984 /* Get all X ops out of the queue so that our information is up-to-date. */ 2392 /* Get all X ops out of the queue so that our information is up-to-date. */
1985 XSync (display->display, False); 2393 XSync (disp, False);
1986 2394
1987 /* 2395 /*
1988 * Make the frame window set by the window manager have 2396 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame 2397 * the root background. Some window managers put multiple nested frame
1990 * windows for each client, so we have to take care about that. 2398 * windows for each client, so we have to take care about that.
1991 */ 2399 */
1992 i = (xa[XA_XROOTPMAPID] != 0 2400 i = (xa[XA_XROOTPMAP_ID]
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &nitems, &bytes_after, &prop) == Success)); 2403 &nitems, &bytes_after, &prop) == Success);
2404
1996 if (!i || prop == NULL) 2405 if (!i || prop == NULL)
2406 i = (xa[XA_ESETROOT_PMAP_ID]
2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2409 &nitems, &bytes_after, &prop) == Success);
2410
2411 if (!i || prop == NULL
2412#if TINTING
2413 || !rs[Rs_color + Color_tint]
2414#endif
2415 )
1997 have_pixmap = 0; 2416 have_pixmap = 0;
1998 else 2417 else
1999 { 2418 {
2000 have_pixmap = 1; 2419 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2420 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2421 XFree (prop);
2003 } 2422 }
2423
2004 if (have_pixmap) 2424 if (have_pixmap)
2005 { 2425 {
2006 /* 2426 /*
2007 * Copy display->root pixmap transparency 2427 * Copy display->root pixmap transparency
2008 */ 2428 */
2009 int sx, sy, nx, ny; 2429 int sx, sy, nx, ny;
2010 unsigned int nw, nh; 2430 unsigned int nw, nh;
2011 Window cr; 2431 Window cr;
2012 XImage *image; 2432 XImage *image;
2013 GC gc; 2433 GC gc;
2014 XGCValues gcvalue; 2434 XGCValues gcvalue;
2015 2435
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2436 XTranslateCoordinates (disp, parent[0], display->root,
2017 0, 0, &sx, &sy, &cr); 2437 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width; 2438 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height; 2439 nh = (unsigned int)szHint.height;
2020 nx = ny = 0; 2440 nx = ny = 0;
2441
2021 if (sx < 0) 2442 if (sx < 0)
2022 { 2443 {
2023 nw += sx; 2444 nw += sx;
2024 nx = -sx; 2445 nx = -sx;
2025 sx = 0; 2446 sx = 0;
2026 } 2447 }
2448
2027 if (sy < 0) 2449 if (sy < 0)
2028 { 2450 {
2029 nh += sy; 2451 nh += sy;
2030 ny = -sy; 2452 ny = -sy;
2031 sy = 0; 2453 sy = 0;
2032 } 2454 }
2455
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2456 min_it (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2457 min_it (nh, (unsigned int) (wrootattr.height - sy));
2458
2459 XSync (disp, False);
2035 allowedxerror = -1; 2460 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2037 ZPixmap); 2462
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */ 2464 /* XXX: may need a delay here? */
2040 allowedxerror = 0; 2465 allowedxerror = 0;
2466
2041 if (image == NULL) 2467 if (image == NULL)
2042 { 2468 {
2043 if (am_transparent && am_pixmap_trans) 2469 if (am_transparent && am_pixmap_trans)
2044 { 2470 {
2045 pchanged = 1; 2471 pchanged = 1;
2046 if (TermWin.pixmap != None) 2472 if (pixmap != None)
2047 { 2473 {
2048 XFreePixmap (display->display, TermWin.pixmap); 2474 XFreePixmap (disp, pixmap);
2049 TermWin.pixmap = None; 2475 pixmap = None;
2050 } 2476 }
2051 } 2477 }
2478
2052 am_pixmap_trans = 0; 2479 am_pixmap_trans = 0;
2053 } 2480 }
2054 else 2481 else
2055 { 2482 {
2056 if (TermWin.pixmap != None) 2483 if (pixmap != None)
2057 XFreePixmap (display->display, TermWin.pixmap); 2484 XFreePixmap (disp, pixmap);
2485
2486#if TINTING
2487 if (ISSET_PIXCOLOR (Color_tint))
2488 {
2489 unsigned short rm, gm, bm;
2490 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2491
2492 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2493
2494 ShadeXImage (display, image, shade, rm, gm, bm);
2495 }
2496#endif
2497
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2498 pixmap = XCreatePixmap (disp, vt,
2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height, 2499 szHint.width, szHint.height, image->depth);
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2501 XPutImage (disp, pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height); 2502 nx, ny, image->width, image->height);
2066 XFreeGC (display->display, gc); 2503 XFreeGC (disp, gc);
2067 XDestroyImage (image); 2504 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2069 TermWin.pixmap); 2506 XClearWindow (disp, parent[0]);
2507
2070 if (!am_transparent || !am_pixmap_trans) 2508 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1; 2509 pchanged = 1;
2510
2072 am_transparent = am_pixmap_trans = 1; 2511 am_transparent = am_pixmap_trans = 1;
2073 } 2512 }
2074 } 2513 }
2514
2075 if (!am_pixmap_trans) 2515 if (am_pixmap_trans)
2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2517 else
2076 { 2518 {
2077 unsigned int n; 2519 unsigned int n;
2078 /* 2520 /*
2079 * InheritPixmap transparency 2521 * InheritPixmap transparency
2080 */ 2522 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2083 i++)
2084 { 2524 {
2085 oldp = TermWin.parent[i]; 2525 oldp = parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2526 XQueryTree (disp, parent[i - 1], &root,
2087 &TermWin.parent[i], &list, &n); 2527 &parent[i], &list, &n);
2088 XFree (list); 2528 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2529
2090 if (TermWin.parent[i] == display->root) 2530 if (parent[i] == display->root)
2091 { 2531 {
2092 if (oldp != None) 2532 if (oldp != None)
2093 pchanged = 1; 2533 pchanged = 1;
2534
2094 break; 2535 break;
2095 } 2536 }
2537
2096 if (oldp != TermWin.parent[i]) 2538 if (oldp != parent[i])
2097 pchanged = 1; 2539 pchanged = 1;
2098 } 2540 }
2541
2099 n = 0; 2542 n = 0;
2543
2100 if (pchanged) 2544 if (pchanged)
2101 { 2545 {
2102 for (; n < (unsigned int)i; n++) 2546 for (; n < (unsigned int)i; n++)
2103 { 2547 {
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2548 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) 2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2107 { 2550 {
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2109 break; 2552 break;
2110 } 2553 }
2111 } 2554 }
2112 } 2555 }
2113 if (n > (int) (sizeof (TermWin.parent) 2556
2114 / sizeof (TermWin.parent[0]))) 2557 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2115 { 2558 {
2116 D_X ((stderr, "InheritPixmap Turning off")); 2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2117 XSetWindowBackground (display->display, TermWin.parent[0], 2560 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; 2561 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */ 2562 /* XXX: also turn off Opt_transparent? */
2123 } 2563 }
2124 else 2564 else
2125 { 2565 {
2566#if WAIT_FOR_WM
2126 /* wait (an arbitrary period) for the WM to do its thing 2567 /* wait (an arbitrary period) for the WM to do its thing
2127 * needed for fvwm2.2.2 (and before?) */ 2568 * 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); 2569 sleep (1);
2136# endif 2570#endif
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2138 for (n = 0; n < (unsigned int)i; n++) 2571 for (n = 0; n < (unsigned int)i; n++)
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2572 {
2140 ParentRelative); 2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2574 XClearWindow (disp, parent[n]);
2142 ParentRelative); 2575 }
2576
2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2143 am_transparent = 1; 2578 am_transparent = 1;
2144 } 2579 }
2580
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2146 TermWin.parent[i] = None; 2582 parent[i] = None;
2583 }
2584
2585 if (scrollBar.win)
2147 } 2586 {
2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2588 scrollBar.setIdle ();
2589 scrollbar_show (0);
2590 }
2591
2592 if (am_transparent)
2593 {
2594 want_refresh = want_full_refresh = 1;
2595 if (am_pixmap_trans)
2596 flush ();
2597 }
2598
2148 return pchanged; 2599 return pchanged;
2149} 2600}
2150#endif 2601#endif
2151 2602
2152/*}}} */ 2603/*}}} */
2604
2605bool
2606rxvt_term::cmd_parse ()
2607{
2608 bool flag = false;
2609 unicode_t ch = NOCHAR;
2610 unsigned char *seq_begin; // remember start of esc-sequence here
2611
2612 for (;;)
2613 {
2614 if (ch == NOCHAR)
2615 {
2616 seq_begin = cmdbuf_ptr;
2617 ch = next_char ();
2618 }
2619
2620 if (ch == NOCHAR) // TODO: improve
2621 break;
2622
2623 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2624 {
2625 if (!seen_input)
2626 {
2627 seen_input = 1;
2628 // many badly-written programs (e.g. jed) contain a race condition:
2629 // they first read the screensize and then install a SIGWINCH handler.
2630 // some window managers resize the window early, and these programs
2631 // then sometimes get the size wrong.
2632 // unfortunately other programs are even more buggy and dislike
2633 // being sent SIGWINCH, so only do it when we were in fact being
2634 // resized.
2635 if (seen_resize && cmd_pid)
2636 kill (-cmd_pid, SIGWINCH);
2637 }
2638
2639 /* Read a text string from the input buffer */
2640 unicode_t buf[UBUFSIZ];
2641 bool refreshnow = false;
2642 int nlines = 0;
2643 unicode_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ);
2645
2646 for (;;)
2647 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break;
2650
2651 *str++ = ch;
2652
2653 if (ch == C0_LF || str >= eol)
2654 {
2655 if (ch == C0_LF)
2656 nlines++;
2657
2658 refresh_count++;
2659
2660 if (!(options & Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 {
2663 refreshnow = true;
2664 ch = NOCHAR;
2665 break;
2666 }
2667
2668 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= nrow - 1)
2670 {
2671 scr_add_lines (buf, nlines, str - buf);
2672 nlines = 0;
2673 str = buf;
2674 eol = str + min (ncol, UBUFSIZ);
2675 }
2676
2677 if (str >= eol)
2678 {
2679 if (eol >= buf + UBUFSIZ)
2680 {
2681 ch = NOCHAR;
2682 break;
2683 }
2684 else
2685 eol = min (eol + ncol, buf + UBUFSIZ);
2686 }
2687
2688 }
2689
2690 seq_begin = cmdbuf_ptr;
2691 ch = next_char ();
2692 }
2693
2694 scr_add_lines (buf, nlines, str - buf);
2695
2696 /*
2697 * If there have been a lot of new lines, then update the screen
2698 * What the heck I'll cheat and only refresh less than every page-full.
2699 * the number of pages between refreshes is refresh_limit, which
2700 * is incremented here because we must be doing flat-out scrolling.
2701 */
2702 if (refreshnow)
2703 {
2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2705 refresh_limit++;
2706 else
2707 {
2708 flag = true;
2709 scr_refresh (refresh_type);
2710 }
2711 }
2712
2713 }
2714 else
2715 {
2716 try
2717 {
2718 process_nonprinting (ch);
2719 }
2720 catch (const class out_of_input &o)
2721 {
2722 // we ran out of input, retry later
2723 cmdbuf_ptr = seq_begin;
2724 break;
2725 }
2726
2727 ch = NOCHAR;
2728 }
2729 }
2730
2731 return flag;
2732}
2733
2734// read the next octet
2735unicode_t
2736rxvt_term::next_octet ()
2737{
2738 return cmdbuf_ptr < cmdbuf_endp
2739 ? *cmdbuf_ptr++
2740 : NOCHAR;
2741}
2742
2743// read the next character
2744unicode_t
2745rxvt_term::next_char ()
2746{
2747 while (cmdbuf_ptr < cmdbuf_endp)
2748 {
2749 // assume 7-bit to be ascii ALWAYS
2750 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2751 return *cmdbuf_ptr++;
2752
2753 wchar_t wc;
2754 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2755
2756 if (len == (size_t)-2)
2757 {
2758 // the mbstate stores incomplete sequences. didn't know this :/
2759 cmdbuf_ptr = cmdbuf_endp;
2760 break;
2761 }
2762
2763 if (len == (size_t)-1)
2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2765
2766 // assume wchar == unicode
2767 cmdbuf_ptr += len;
2768 return wc & UNICODE_MASK;
2769 }
2770
2771 return NOCHAR;
2772}
2773
2774/* rxvt_cmd_getc () - Return next input character */
2775/*
2776 * Return the next input character after first passing any keyboard input
2777 * to the command.
2778 */
2779unicode_t
2780rxvt_term::cmd_getc ()
2781{
2782 unicode_t c = next_char ();
2783
2784 if (c == NOCHAR)
2785 throw out_of_input;
2786
2787 return c;
2788}
2789
2790unicode_t
2791rxvt_term::cmd_get8 ()
2792{
2793 unicode_t c = next_octet ();
2794
2795 if (c == NOCHAR)
2796 throw out_of_input;
2797
2798 return c;
2799}
2153 2800
2154/*{{{ print pipe */ 2801/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2802/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2803#ifdef PRINTPIPE
2157FILE * 2804FILE *
2158rxvt_term::popen_printer () 2805rxvt_term::popen_printer ()
2159{ 2806{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2807 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2808
2162 if (stream == NULL) 2809 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2810 rxvt_warn ("can't open printer pipe, not printing.\n");
2811
2164 return stream; 2812 return stream;
2165} 2813}
2166 2814
2167int 2815int
2168rxvt_term::pclose_printer (FILE *stream) 2816rxvt_term::pclose_printer (FILE *stream)
2169{ 2817{
2170 fflush (stream); 2818 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); 2819 return pclose (stream);
2177# endif
2178} 2820}
2179 2821
2180/* 2822/*
2181 * simulate attached vt100 printer 2823 * simulate attached vt100 printer
2182 */ 2824 */
2183void 2825void
2184rxvt_term::process_print_pipe () 2826rxvt_term::process_print_pipe ()
2185{ 2827{
2186 int done; 2828 int done;
2187 FILE *fd; 2829 FILE *fd;
2188 2830
2189 if ((fd = popen_printer ()) == NULL) 2831 if ((fd = popen_printer ()) == NULL)
2190 return; 2832 return;
2191 2833
2192 /* 2834 /*
2193 * Send all input to the printer until either ESC[4i or ESC[?4i 2835 * Send all input to the printer until either ESC[4i or ESC[?4i
2194 * is received. 2836 * is received.
2195 */ 2837 */
2196 for (done = 0; !done;) 2838 for (done = 0; !done;)
2197 { 2839 {
2198 unsigned char buf[8]; 2840 unsigned char buf[8];
2199 unsigned char ch; 2841 unicode_t ch;
2200 unsigned int i, len; 2842 unsigned int i, len;
2201 2843
2202 if ((ch = cmd_getc ()) != C0_ESC) 2844 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2845 {
2204 if (putc (ch, fd) == EOF) 2846 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2847 break; /* done = 1 */
… …
2220 { 2862 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2863 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2864 break; /* done = 1 */
2223 } 2865 }
2224 } 2866 }
2867
2225 for (i = 0; i < len; i++) 2868 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2869 if (putc (buf[i], fd) == EOF)
2227 { 2870 {
2228 done = 1; 2871 done = 1;
2229 break; 2872 break;
2230 } 2873 }
2231 } 2874 }
2232 } 2875 }
2876
2233 pclose_printer (fd); 2877 pclose_printer (fd);
2234} 2878}
2235#endif /* PRINTPIPE */ 2879#endif /* PRINTPIPE */
2236/*}}} */ 2880/*}}} */
2237 2881
2238/* *INDENT-OFF* */ 2882/* *INDENT-OFF* */
2239enum { 2883enum {
2240 C1_40 = 0x40, 2884 C1_40 = 0x40,
2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2885 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, 2886 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, 2887 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 2888 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2245}; 2889};
2246/* *INDENT-ON* */ 2890/* *INDENT-ON* */
2247 2891
2248/*{{{ process non-printing single characters */ 2892/*{{{ process non-printing single characters */
2249void 2893void
2250rxvt_term::process_nonprinting (unsigned char ch) 2894rxvt_term::process_nonprinting (unicode_t ch)
2251{ 2895{
2252 switch (ch) 2896 switch (ch)
2253 { 2897 {
2898 case C0_ESC:
2899 process_escape_seq ();
2900 break;
2254 case C0_ENQ: /* terminal Status */ 2901 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 2902 if (rs[Rs_answerbackstring])
2256 tt_write (
2257 (const unsigned char *)rs[Rs_answerbackstring], 2903 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2258 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2904 (unsigned int)strlen (rs[Rs_answerbackstring]));
2259 else 2905 else
2260 tt_write ((unsigned char *)VT100_ANS, 2906 tt_write ((unsigned char *)VT100_ANS,
2261 (unsigned int)STRLEN (VT100_ANS)); 2907 (unsigned int)strlen (VT100_ANS));
2262 break; 2908 break;
2263 case C0_BEL: /* bell */ 2909 case C0_BEL: /* bell */
2264 scr_bell (); 2910 scr_bell ();
2265 break; 2911 break;
2266 case C0_BS: /* backspace */ 2912 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 2927 scr_charset_choose (1);
2282 break; 2928 break;
2283 case C0_SI: /* shift in - acs */ 2929 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 2930 scr_charset_choose (0);
2285 break; 2931 break;
2932
2933#ifdef EIGHT_BIT_CONTROLS
2934 // 8-bit controls
2935 case 0x90: /* DCS */
2936 process_dcs_seq ();
2937 break;
2938 case 0x9b: /* CSI */
2939 process_csi_seq ();
2940 break;
2941 case 0x9d: /* CSI */
2942 process_osc_seq ();
2943 break;
2944#endif
2286 } 2945 }
2287} 2946}
2288/*}}} */ 2947/*}}} */
2289 2948
2290 2949
2291/*{{{ process VT52 escape sequences */ 2950/*{{{ process VT52 escape sequences */
2292void 2951void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 2952rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 2953{
2295 int row, col; 2954 int row, col;
2296 2955
2297 switch (ch) 2956 switch (ch)
2298 { 2957 {
… …
2350 3009
2351/*{{{ process escape sequences */ 3010/*{{{ process escape sequences */
2352void 3011void
2353rxvt_term::process_escape_seq () 3012rxvt_term::process_escape_seq ()
2354{ 3013{
2355 unsigned char ch = cmd_getc (); 3014 unicode_t ch = cmd_getc ();
2356 3015
2357 if (PrivateModes & PrivMode_vt52) 3016 if (priv_modes & PrivMode_vt52)
2358 { 3017 {
2359 process_escape_vt52 (ch); 3018 process_escape_vt52 (ch);
2360 return; 3019 return;
2361 } 3020 }
2362 3021
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 3036 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 3037 break;
2379 case '+': 3038 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 3039 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 3040 break;
2382#ifdef MULTICHAR_SET 3041#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': 3042 case '6':
2389 scr_backindex (); 3043 scr_backindex ();
2390 break; 3044 break;
2391#endif 3045#endif
2392 case '7': 3046 case '7':
2393 scr_cursor (SAVE); 3047 scr_cursor (SAVE);
2394 break; 3048 break;
2395 case '8': 3049 case '8':
2396 scr_cursor (RESTORE); 3050 scr_cursor (RESTORE);
2397 break; 3051 break;
2398#ifndef NO_FRILLS 3052#if ENABLE_FRILLS
2399 case '9': 3053 case '9':
2400 scr_forwardindex (); 3054 scr_forwardindex ();
2401 break; 3055 break;
2402#endif 3056#endif
2403 case '=': 3057 case '=':
… …
2413 break; 3067 break;
2414 3068
2415 /* 8.3.87: NEXT LINE */ 3069 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 3070 case C1_NEL: /* ESC E */
2417 { 3071 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 3072 unicode_t nlcr[] = { C0_LF, C0_CR };
2419 scr_add_lines (nlcr, 1, 2); 3073 scr_add_lines (nlcr, 1, 2);
2420 } 3074 }
2421 break; 3075 break;
2422 3076
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 3077 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2434 case C1_RI: /* ESC M */ 3088 case C1_RI: /* ESC M */
2435 scr_index (DN); 3089 scr_index (DN);
2436 break; 3090 break;
2437 3091
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 3092 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 3093 /*case C1_SS2: scr_single_shift (2); break; */
2440 3094
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 3095 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 3096 /*case C1_SS3: scr_single_shift (3); break; */
2443 3097
2444 /* 8.3.27: DEVICE CONTROL STRING */ 3098 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 3099 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 3100 process_dcs_seq ();
2447 break; 3101 break;
… …
2462 process_osc_seq (); 3116 process_osc_seq ();
2463 break; 3117 break;
2464 3118
2465 /* 8.3.106: RESET TO INITIAL STATE */ 3119 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 3120 case 'c':
3121 mbstate.reset ();
2467 scr_poweron (); 3122 scr_poweron ();
2468 scrollbar_show (1); 3123 scrollbar_show (1);
2469 break; 3124 break;
2470 3125
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3126 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2483 3138
2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3139/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2485/* *INDENT-OFF* */ 3140/* *INDENT-OFF* */
2486enum { 3141enum {
2487 CSI_ICH = 0x40, 3142 CSI_ICH = 0x40,
2488 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3143 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 , 3144 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, 3145 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, 3146 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, 3147 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, 3148 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, */ 3163 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, [, \, ], ^, _, */ 3164 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, */ 3165 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, */ 3166 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, */ 3167 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, {, |, }, ~, */ 3168 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2514 }; 3169 };
2515/* *INDENT-ON* */ 3170/* *INDENT-ON* */
2516 3171
2517void 3172void
2518rxvt_term::process_csi_seq () 3173rxvt_term::process_csi_seq ()
2519{ 3174{
2520 unsigned char ch, priv, i; 3175 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 3176 unsigned int nargs, p;
2522 int n, ndef; 3177 int n, ndef;
2523 int arg[ESC_ARGS]; 3178 int arg[ESC_ARGS];
2524 3179
2525 for (nargs = ESC_ARGS; nargs > 0;) 3180 for (nargs = ESC_ARGS; nargs > 0;)
2526 arg[--nargs] = 0; 3181 arg[--nargs] = 0;
2527 3182
2528 priv = 0; 3183 priv = 0;
… …
2530 if (ch >= '<' && ch <= '?') 3185 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 3186 { /* '<' '=' '>' '?' */
2532 priv = ch; 3187 priv = ch;
2533 ch = cmd_getc (); 3188 ch = cmd_getc ();
2534 } 3189 }
3190
2535 /* read any numerical arguments */ 3191 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 3192 for (n = -1; ch < CSI_ICH; )
2537 { 3193 {
2538 if (isdigit (ch)) 3194 if (isdigit (ch))
2539 { 3195 {
… …
2546 { 3202 {
2547 if (nargs < ESC_ARGS) 3203 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 3204 arg[nargs++] = n;
2549 n = -1; 3205 n = -1;
2550 } 3206 }
2551 else if (ch == '\b') 3207 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); 3208 process_nonprinting (ch);
2563 } 3209
2564 ch = cmd_getc (); 3210 ch = cmd_getc ();
2565 } 3211 }
2566 3212
2567 if (ch > CSI_7F) 3213 if (ch > CSI_7F)
2568 return; 3214 return;
… …
2590 { 3236 {
2591 switch (priv) 3237 switch (priv)
2592 { 3238 {
2593 case '>': 3239 case '>':
2594 if (ch == CSI_DA) /* secondary device attributes */ 3240 if (ch == CSI_DA) /* secondary device attributes */
2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2596 break; 3242 break;
2597 case '?': 3243 case '?':
2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2599 process_terminal_mode (ch, priv, nargs, arg); 3245 process_terminal_mode (ch, priv, nargs, arg);
2600 break; 3246 break;
… …
2705 3351
2706 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3352 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2707 arg[0] = -arg[0]; 3353 arg[0] = -arg[0];
2708 /* FALLTHROUGH */ 3354 /* FALLTHROUGH */
2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2711 break; 3357 break;
2712 3358
2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2714 tt_write ((const unsigned char *)VT100_ANS, 3360 tt_write ((const unsigned char *)VT100_ANS,
2715 (unsigned int) (sizeof (VT100_ANS) - 1)); 3361 (unsigned int) (sizeof (VT100_ANS) - 1));
2716 break; 3362 break;
2717 3363
2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3364 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2719 process_sgr_mode (nargs, arg); 3365 process_sgr_mode (nargs, arg);
2720 break; 3366 break;
… …
2726 tt_printf ("\033[0n"); 3372 tt_printf ("\033[0n");
2727 break; 3373 break;
2728 case 6: /* CPR requested */ 3374 case 6: /* CPR requested */
2729 scr_report_position (); 3375 scr_report_position ();
2730 break; 3376 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 3377 case 7: /* unofficial extension */
3378 if (options & Opt_insecure)
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3379 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2734 break; 3380 break;
2735#endif
2736 case 8: /* unofficial extension */ 3381 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 3383 break;
2739 } 3384 }
2740 break; 3385 break;
2741 3386
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3387 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2775 break; 3420 break;
2776 3421
2777 case CSI_RM: /* 8.3.107: RESET MODE */ 3422 case CSI_RM: /* 8.3.107: RESET MODE */
2778 if (arg[0] == 4) 3423 if (arg[0] == 4)
2779 scr_insert_mode (0); 3424 scr_insert_mode (0);
3425 else if (arg[0] == 20)
3426 priv_modes &= ~PrivMode_LFNL;
2780 break; 3427 break;
2781 3428
2782 case CSI_SM: /* 8.3.126: SET MODE */ 3429 case CSI_SM: /* 8.3.126: SET MODE */
2783 if (arg[0] == 4) 3430 if (arg[0] == 4)
2784 scr_insert_mode (1); 3431 scr_insert_mode (1);
3432 else if (arg[0] == 20)
3433 priv_modes |= PrivMode_LFNL;
2785 break; 3434 break;
2786 3435
2787 /* 3436 /*
2788 * PRIVATE USE beyond this point. All CSI_7? sequences here 3437 * PRIVATE USE beyond this point. All CSI_7? sequences here
2789 */ 3438 */
… …
2801 break; 3450 break;
2802 case CSI_75: 3451 case CSI_75:
2803 scr_cursor (RESTORE); 3452 scr_cursor (RESTORE);
2804 break; 3453 break;
2805 3454
2806#ifndef NO_FRILLS 3455#if ENABLE_FRILLS
2807 case CSI_74: 3456 case CSI_74:
2808 process_window_ops (arg, nargs); 3457 process_window_ops (arg, nargs);
2809 break; 3458 break;
2810#endif 3459#endif
2811 3460
2812 case CSI_78: /* DECREQTPARM */ 3461 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 3462 if (arg[0] == 0 || arg[0] == 1)
2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3463 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2815 /* FALLTHROUGH */ 3464 break;
2816 3465
2817 default: 3466 default:
2818 break; 3467 break;
2819 } 3468 }
2820} 3469}
2821/*}}} */ 3470/*}}} */
2822 3471
2823#ifndef NO_FRILLS 3472#if ENABLE_FRILLS
2824/* ARGSUSED */ 3473/* ARGSUSED */
2825void 3474void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3475rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 3476{
2828 int x, y; 3477 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 3478 XWindowAttributes wattr;
2833 Window wdummy; 3479 Window wdummy;
3480 dDisp;
2834 3481
2835 if (nargs == 0) 3482 if (nargs == 0)
2836 return; 3483 return;
3484
2837 switch (args[0]) 3485 switch (args[0])
2838 { 3486 {
2839 /* 3487 /*
2840 * commands 3488 * commands
2841 */ 3489 */
2842 case 1: /* deiconify window */ 3490 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3491 XMapWindow (disp, parent[0]);
2844 break; 3492 break;
2845 case 2: /* iconify window */ 3493 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3494 XIconifyWindow (disp, parent[0], display->screen);
2847 DefaultScreen (display->display));
2848 break; 3495 break;
2849 case 3: /* set position (pixels) */ 3496 case 3: /* set position (pixels) */
2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3497 XMoveWindow (disp, parent[0], args[1], args[2]);
2851 break; 3498 break;
2852 case 4: /* set size (pixels) */ 3499 case 4: /* set size (pixels) */
2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2854 break; 3501 break;
2855 case 5: /* raise window */ 3502 case 5: /* raise window */
2856 XRaiseWindow (display->display, TermWin.parent[0]); 3503 XRaiseWindow (disp, parent[0]);
2857 break; 3504 break;
2858 case 6: /* lower window */ 3505 case 6: /* lower window */
2859 XLowerWindow (display->display, TermWin.parent[0]); 3506 XLowerWindow (disp, parent[0]);
2860 break; 3507 break;
2861 case 7: /* refresh window */ 3508 case 7: /* refresh window */
2862 scr_touch (true); 3509 scr_touch (true);
2863 break; 3510 break;
2864 case 8: /* set size (chars) */ 3511 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3512 set_widthheight ((unsigned int) (args[2] * fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3513 (unsigned int) (args[1] * fheight));
2867 break; 3514 break;
3515
3516 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3517 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3518 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3519 set_widthheight ((unsigned int)width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3520 (unsigned int) (args[1] * fheight));
2872 break; 3521 break;
3522
3523
2873 /* 3524 /*
2874 * reports - some output format copied from XTerm 3525 * reports - some output format copied from XTerm
2875 */ 3526 */
2876 case 11: /* report window state */ 3527 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3528 XGetWindowAttributes (disp, parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3530 break;
2880 case 13: /* report window position */ 3531 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3532 XGetWindowAttributes (disp, parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3533 XTranslateCoordinates (disp, parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3534 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3535 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3536 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3537 break;
2887 case 14: /* report window size (pixels) */ 3538 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3539 XGetWindowAttributes (disp, parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3541 break;
3542 case 18: /* report text area size (chars) */
3543 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3544 break;
2891 case 18: /* report window size (chars) */ 3545 case 19: /* report window size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3546 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2893 break; 3547 break;
2894#if 0 /* XXX: currently disabled due to security concerns */
2895 case 20: /* report icon label */ 3548 case 20: /* report icon label */
3549 {
3550 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3551 XGetIconName (disp, parent[0], &s);
2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3553 XFree (s);
3554 }
2898 break; 3555 break;
2899 case 21: /* report window title */ 3556 case 21: /* report window title */
3557 {
3558 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3559 XFetchName (disp, parent[0], &s);
2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s);
3562 }
2902 break; 3563 break;
2903#endif
2904
2905 } 3564 }
2906} 3565}
2907#endif 3566#endif
2908 3567
2909/*----------------------------------------------------------------------*/ 3568/*----------------------------------------------------------------------*/
2910/* 3569/*
2911 * get input up until STRING TERMINATOR (or BEL) 3570 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3571 * ends_how is terminator used. returned input must be free()'d
2913 */ 3572 */
2914unsigned char * 3573unsigned char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3574rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3575{
2917 int seen_esc = 0; /* seen escape? */ 3576 unicode_t ch;
3577 bool seen_esc = false;
2918 unsigned int n = 0; 3578 unsigned int n = 0;
2919 unsigned char *s; 3579 wchar_t string[STRING_MAX];
2920 unsigned char ch, string[STRING_MAX];
2921 3580
2922 for (; (ch = cmd_getc ());) 3581 while ((ch = cmd_getc ()) != NOCHAR)
2923 { 3582 {
2924 if (ch == C0_BEL 3583 if (seen_esc)
2925 || ch == CHAR_ST 3584 {
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3585 if (ch == 0x5c) /* 7bit ST */
2927 break; 3586 break;
3587 else
3588 return NULL;
3589 }
2928 if (ch == C0_ESC) 3590 else if (ch == C0_ESC)
2929 { 3591 {
2930 seen_esc = 1; 3592 seen_esc = true;
2931 continue; 3593 continue;
2932 } 3594 }
2933 else if (ch == '\t') 3595 else if (ch == C0_BEL || ch == CHAR_ST)
2934 ch = ' '; /* translate '\t' to space */ 3596 break;
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3597 else if (ch < 0x20)
2936 return NULL; /* other control character - exit */ 3598 return NULL; /* other control character - exit */
2937 if (n < sizeof (string) - 1) 3599
3600 seen_esc = false;
3601
3602 if (n >= STRING_MAX - 1)
3603 // stop at some sane length
3604 return NULL;
3605
3606 if (ch == C0_SYN)
3607 string[n++] = cmd_get8 ();
3608 else
2938 string[n++] = ch; 3609 string[n++] = ch;
2939 seen_esc = 0;
2940 } 3610 }
3611
2941 string[n++] = '\0'; 3612 string[n++] = '\0';
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3613
2943 return NULL;
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3614 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3615
2946 return s; 3616 return (unsigned char *)rxvt_wcstombs (string);
2947} 3617}
2948 3618
2949/*----------------------------------------------------------------------*/ 3619/*----------------------------------------------------------------------*/
2950/* 3620/*
2951 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2952 */ 3622 */
2953void 3623void
2954rxvt_term::process_dcs_seq () 3624rxvt_term::process_dcs_seq ()
2955{ 3625{
2956 unsigned char eh, *s; 3626 unsigned char *s;
3627 unicode_t eh;
3628
2957 /* 3629 /*
2958 * Not handled yet 3630 * Not handled yet
2959 */ 3631 */
2960 s = get_to_st (&eh); 3632 s = get_to_st (eh);
2961 if (s) 3633 if (s)
2962 free (s); 3634 free (s);
3635
2963 return; 3636 return;
2964} 3637}
2965 3638
2966/*----------------------------------------------------------------------*/ 3639/*----------------------------------------------------------------------*/
2967/* 3640/*
2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3641 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2969 */ 3642 */
2970void 3643void
2971rxvt_term::process_osc_seq () 3644rxvt_term::process_osc_seq ()
2972{ 3645{
2973 unsigned char ch, eh, *s; 3646 unicode_t ch, eh;
2974 int arg; 3647 int arg;
2975 3648
2976 ch = cmd_getc (); 3649 ch = cmd_getc ();
2977 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3650 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2978 arg = arg * 10 + (ch - '0'); 3651 arg = arg * 10 + (ch - '0');
2979 3652
2980 if (ch == ';') 3653 if (ch == ';')
2981 { 3654 {
2982 s = get_to_st (&eh); 3655 unsigned char *s = get_to_st (eh);
3656
2983 if (s) 3657 if (s)
2984 { 3658 {
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); 3659 process_xterm_seq (arg, (char *)s, eh);
2997 free (s); 3660 free (s);
2998 } 3661 }
2999 } 3662 }
3000} 3663}
3664
3665void
3666rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3667{
3668 if (str[0] == '?' && !str[1])
3669 {
3670 unsigned short r, g, b;
3671 pix_colors_focused[color].get (display, r, g, b);
3672 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3673 }
3674 else
3675 set_window_color (color, str);
3676}
3677
3001/* 3678/*
3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3679 * 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 */ 3680 */
3022void 3681void
3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3024{ 3683{
3025 int changed = 0; 3684 int changed = 0;
3026 int color; 3685 int color;
3027 char *buf, *name; 3686 char *buf, *name;
3687 bool query = str[0] == '?' && !str[1];
3688 int saveop = op;
3689 dDisp;
3028 3690
3029 assert (str != NULL); 3691 assert (str != NULL);
3030 switch (op) 3692 switch (op)
3031 { 3693 {
3032 case XTerm_name: 3694 case XTerm_name:
3033 set_title (str); 3695 set_title (str);
3034 /* FALLTHROUGH */ 3696 /* FALLTHROUGH */
3035 case XTerm_iconName: 3697 case XTerm_iconName:
3036 set_iconName (str); 3698 set_icon_name (str);
3037 break; 3699 break;
3038 case XTerm_title: 3700 case XTerm_title:
3039 set_title (str); 3701 set_title (str);
3040 break; 3702 break;
3703 case XTerm_property:
3704 if (str[0] == '?')
3705 {
3706 Atom prop = display->atom (str + 1);
3707 Atom actual_type;
3708 int actual_format;
3709 unsigned long nitems;
3710 unsigned long bytes_after;
3711 unsigned char *value = 0;
3712 const char *str = "";
3713
3714 if (prop
3715 && XGetWindowProperty (disp, parent[0],
3716 prop, 0, 1<<16, 0, AnyPropertyType,
3717 &actual_type, &actual_format,
3718 &nitems, &bytes_after, &value) == Success
3719 && actual_type != None
3720 && actual_format == 8)
3721 str = (const char *)(value);
3722
3723 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3724
3725 XFree (value);
3726 }
3727 else
3728 {
3729 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3730
3731 if (eq)
3732 {
3733 *eq = 0;
3734 set_utf8_property (display->atom (str), eq + 1);
3735 }
3736 else
3737 XDeleteProperty (disp, parent[0],
3738 display->atom (str));
3739 }
3740 break;
3741
3041 case XTerm_Color: 3742 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3743 for (buf = (char *)str; buf && *buf;)
3043 { 3744 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3745 if ((name = strchr (buf, ';')) == NULL)
3045 break; 3746 break;
3747
3046 *name++ = '\0'; 3748 *name++ = '\0';
3047 color = atoi (buf); 3749 color = atoi (buf);
3750
3048 if (color < 0 || color >= TOTAL_COLORS) 3751 if (color < 0 || color >= TOTAL_COLORS)
3049 break; 3752 break;
3753
3050 if ((buf = STRCHR (name, ';')) != NULL) 3754 if ((buf = strchr (name, ';')) != NULL)
3051 *buf++ = '\0'; 3755 *buf++ = '\0';
3756
3757 if (name[0] == '?' && !name[1])
3758 {
3759 unsigned short r, g, b;
3760 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3761 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3762 }
3763 else
3052 set_window_color (color + minCOLOR, name); 3764 set_window_color (color + minCOLOR, name);
3053 } 3765 }
3766 break;
3767 case XTerm_Color00:
3768 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3769 break;
3770 case XTerm_Color01:
3771 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3054 break; 3772 break;
3055#ifndef NO_CURSORCOLOR 3773#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3774 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3775 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3058 break; 3776 break;
3059#endif 3777#endif
3060 case XTerm_Color_pointer: 3778 case XTerm_Color_pointer_fg:
3061 set_window_color (Color_pointer, str); 3779 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3780 break;
3781 case XTerm_Color_pointer_bg:
3782 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3062 break; 3783 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3784#ifndef NO_BOLD_UNDERLINE_REVERSE
3064 case XTerm_Color_BD: 3785 case XTerm_Color_BD:
3065 set_window_color (Color_BD, str); 3786 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3066 break; 3787 break;
3067 case XTerm_Color_UL: 3788 case XTerm_Color_UL:
3068 set_window_color (Color_UL, str); 3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3069 break; 3790 break;
3070 case XTerm_Color_RV: 3791 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3072 break; 3793 break;
3073#endif 3794 case URxvt_Color_IT:
3074 3795 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; 3796 break;
3797#endif
3798#if TRANSPARENT && TINTING
3799 case URxvt_Color_tint:
3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3801 check_our_parents ();
3802 if (am_transparent)
3803 want_full_refresh = want_refresh = 1;
3804 break;
3805#endif
3806
3081 case XTerm_Pixmap: 3807 case XTerm_Pixmap:
3082 if (*str != ';') 3808 if (*str != ';')
3083 { 3809 {
3084#if XPM_BACKGROUND 3810#if XPM_BACKGROUND
3085 scale_pixmap (""); /* reset to default scaling */ 3811 scale_pixmap (""); /* reset to default scaling */
3086 set_bgPixmap (str); /* change pixmap */ 3812 set_bgPixmap (str); /* change pixmap */
3087#endif 3813#endif
3088 scr_touch (true); 3814 scr_touch (true);
3089 } 3815 }
3090 while ((str = STRCHR (str, ';')) != NULL) 3816 while ((str = strchr (str, ';')) != NULL)
3091 { 3817 {
3092 str++; 3818 str++;
3093#if XPM_BACKGROUND 3819#if XPM_BACKGROUND
3094 changed += scale_pixmap (str); 3820 changed += scale_pixmap (str);
3095#endif 3821#endif
3096
3097 } 3822 }
3823
3098 if (changed) 3824 if (changed)
3099 { 3825 {
3100#ifdef XPM_BACKGROUND 3826#ifdef XPM_BACKGROUND
3101 resize_pixmap (); 3827 resize_pixmap ();
3102#endif 3828#endif
… …
3108 set_window_color (Color_fg, str); 3834 set_window_color (Color_fg, str);
3109 break; 3835 break;
3110 case XTerm_restoreBG: 3836 case XTerm_restoreBG:
3111 set_window_color (Color_bg, str); 3837 set_window_color (Color_bg, str);
3112 break; 3838 break;
3839
3113 case XTerm_logfile: 3840 case XTerm_logfile:
3841 // TODO, when secure mode?
3842 break;
3843
3844#ifdef MENUBAR
3845 case URxvt_Menu:
3846 if (options & Opt_insecure)
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3114 break; 3848 break;
3115 case XTerm_font: 3849#endif
3116 change_font (0, str);
3117 break;
3118#if 0 3850#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3851 case XTerm_dumpscreen: /* no error notices */
3120 { 3852 {
3121 int fd; 3853 int fd;
3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3123 { 3855 {
3124 scr_dump (fd); 3856 scr_dump (fd);
3125 close (fd); 3857 close (fd);
3126 } 3858 }
3127 } 3859 }
3128 break; 3860 break;
3129#endif 3861#endif
3862 case XTerm_font:
3863 op = URxvt_font;
3864 case URxvt_font:
3865#if ENABLE_STYLES
3866 case URxvt_boldFont:
3867 case URxvt_italicFont:
3868 case URxvt_boldItalicFont:
3869#endif
3870 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp);
3875 else
3876 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)];
3130 3878
3879 res = strdup (str);
3880 allocated.push_back ((void *)res);
3881 set_fonts ();
3882 }
3883 break;
3884
3885#if ENABLE_FRILLS
3886 case URxvt_locale:
3887 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3889 else
3890 {
3891 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8);
3893 init_xlocale ();
3894 }
3895 break;
3896
3897 case URxvt_view_up:
3898 case URxvt_view_down:
3899 int lines = atoi (str);
3900
3901 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else
3904 {
3905 scr_erase_savelines ();
3906 }
3907
3908 break;
3909#endif
3131 } 3910 }
3132} 3911}
3133/*----------------------------------------------------------------------*/ 3912/*----------------------------------------------------------------------*/
3134 3913
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3914/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 3922 * so no need for fancy checking
3144 */ 3923 */
3145int 3924int
3146rxvt_term::privcases (int mode, unsigned long bit) 3925rxvt_term::privcases (int mode, unsigned long bit)
3147{ 3926{
3148 int state; 3927 int state;
3149 3928
3150 if (mode == 's') 3929 if (mode == 's')
3151 { 3930 {
3152 SavedModes |= (PrivateModes & bit); 3931 SavedModes |= (priv_modes & bit);
3153 return -1; 3932 return -1;
3154 } 3933 }
3155 else 3934 else
3156 { 3935 {
3157 if (mode == 'r') 3936 if (mode == 'r')
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3937 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 3938 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3939 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3161 PrivMode (state, bit); 3940 PrivMode (state, bit);
3162 } 3941 }
3942
3163 return state; 3943 return state;
3164} 3944}
3165 3945
3166/* we're not using priv _yet_ */ 3946/* we're not using priv _yet_ */
3167void 3947void
3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3948rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3169{ 3949{
3170 unsigned int i, j; 3950 unsigned int i, j;
3171 int state; 3951 int state;
3952
3172 static const struct 3953 static const struct
3173 { 3954 {
3174 const int argval; 3955 const int argval;
3175 const unsigned long bit; 3956 const unsigned long bit;
3176 } 3957 }
3958
3177 argtopriv[] = { 3959 argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 3960 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 3961 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 3962 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 3963 { 4, PrivMode_smoothScroll },
3182 { 5, PrivMode_rVideo }, 3964 { 5, PrivMode_rVideo },
3183 { 6, PrivMode_relOrigin }, 3965 { 6, PrivMode_relOrigin },
3184 { 7, PrivMode_Autowrap }, 3966 { 7, PrivMode_Autowrap },
3967 // 8, bi-directional support mode
3185 { 9, PrivMode_MouseX10 }, 3968 { 9, PrivMode_MouseX10 },
3186#ifdef menuBar_esc 3969#ifdef menuBar_esc
3187 { menuBar_esc, PrivMode_menuBar }, 3970 { menuBar_esc, PrivMode_menuBar },
3188#endif 3971#endif
3972 // 18, 19 printing-related
3973 { 25, PrivMode_VisibleCursor },
3189#ifdef scrollBar_esc 3974#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 3975 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 3976#endif
3192 { 25, PrivMode_VisibleCursor },
3193 { 35, PrivMode_ShiftKeys }, 3977 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 3978 { 40, PrivMode_132OK },
3979 // 41 xterm more fixes NYI
3980 // 45 margin bell NYI
3981 // 46 start logging
3195 { 47, PrivMode_Screen }, 3982 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 3983 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 3984#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 3985 { 67, PrivMode_BackSpace },
3199#endif 3986#endif
3200 { 1000, PrivMode_MouseX11 }, 3987 { 1000, PrivMode_MouseX11 },
3988 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3989 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3990 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3201 { 1010, PrivMode_TtyOutputInh }, 3991 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 1011, PrivMode_Keypress }, 3992 { 1011, PrivMode_Keypress }, // rxvt extension
3993 // 1035 enable modifiers for alt, numlock NYI
3994 // 1036 send ESC for meta keys NYI
3995 // 1037 send DEL for keypad delete NYI
3203 { 1047, PrivMode_Screen }, 3996 { 1047, PrivMode_Screen },
3997 // 1048 save and restore cursor
3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3998 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3999 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3205 }; 4000 };
3206 4001
3207 if (nargs == 0) 4002 if (nargs == 0)
3208 return; 4003 return;
3209 4004
… …
3224 state = privcases (mode, argtopriv[j].bit); 4019 state = privcases (mode, argtopriv[j].bit);
3225 break; 4020 break;
3226 } 4021 }
3227 4022
3228 /* extra handling for values with state unkept */ 4023 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 4024 switch (arg[i])
3231 { 4025 {
3232 case 1048: /* alternative cursor save */ 4026 case 1048: /* alternative cursor save */
4027 case 1049:
4028 if (options & Opt_secondaryScreen)
3233 if (mode == 0) 4029 if (mode == 0)
3234 scr_cursor (RESTORE); 4030 scr_cursor (RESTORE);
3235 else if (mode == 1) 4031 else if (mode == 1)
3236 scr_cursor (SAVE); 4032 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; 4033 break;
4034 }
4035
4036 if (state >= 0)
4037 /* extra handling for values with valid 0 or 1 state */
4038 switch (arg[i])
4039 {
4040 /* case 1: - application cursor keys */
4041 case 2: /* VT52 mode */
4042 /* oddball mode. should be set regardless of set/reset
4043 * parameter. Return from VT52 mode with an ESC < from
4044 * within VT52 mode
4045 */
4046 PrivMode (1, PrivMode_vt52);
4047 break;
3253 case 3: /* 80/132 */ 4048 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 4049 if (priv_modes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4050 set_widthheight (((state ? 132 : 80) * fwidth), height);
3256 (unsigned int)TermWin.height);
3257 break; 4051 break;
3258 case 4: /* smooth scrolling */ 4052 case 4: /* smooth scrolling */
3259 if (state) 4053 if (state)
3260 Options &= ~Opt_jumpScroll; 4054 options &= ~Opt_jumpScroll;
3261 else 4055 else
3262 Options |= Opt_jumpScroll; 4056 options |= Opt_jumpScroll;
3263 break; 4057 break;
3264 case 5: /* reverse video */ 4058 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 4059 scr_rvideo_mode (state);
3266 break; 4060 break;
3267 case 6: /* relative/absolute origins */ 4061 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 4062 scr_relative_origin (state);
3269 break; 4063 break;
3270 case 7: /* autowrap */ 4064 case 7: /* autowrap */
3271 scr_autowrap (state); 4065 scr_autowrap (state);
3272 break; 4066 break;
3273 /* case 8: - auto repeat, can't do on a per window basis */ 4067 /* case 8: - auto repeat, can't do on a per window basis */
3274 case 9: /* X10 mouse reporting */ 4068 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 4069 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 4070 priv_modes &= ~PrivMode_MouseX11;
3277 break; 4071 break;
3278#ifdef menuBar_esc 4072#ifdef menuBar_esc
3279 case menuBar_esc: 4073 case menuBar_esc:
3280#ifdef MENUBAR 4074#ifdef MENUBAR
3281 map_menuBar (state); 4075 map_menuBar (state);
3282#endif 4076#endif
3283 break; 4077 break;
3284#endif 4078#endif
3285#ifdef scrollBar_esc 4079#ifdef scrollBar_esc
3286 case scrollBar_esc: 4080 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 4081 if (scrollbar_mapping (state))
3288 { 4082 {
3289 resize_all_windows (0, 0, 0); 4083 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 4084 scr_touch (true);
3291 } 4085 }
3292 break; 4086 break;
3293#endif 4087#endif
3294 case 25: /* visible/invisible cursor */ 4088 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 4089 scr_cursor_visible (state);
3296 break; 4090 break;
3297 /* case 35: - shift keys */ 4091 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 4092 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 4093 case 47: /* secondary screen */
3300 scr_change_screen (state); 4094 scr_change_screen (state);
3301 break; 4095 break;
3302 /* case 66: - application key pad */ 4096 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 4097 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 4098 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 4099 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 4100 priv_modes &= ~PrivMode_MouseX10;
3307 break; 4101 break;
3308#if 0 4102#if 0
3309 case 1001: 4103 case 1001:
3310 break; /* X11 mouse highlighting */ 4104 break; /* X11 mouse highlighting */
3311#endif 4105#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 4106 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state) 4107 if (state)
3314 Options &= ~Opt_scrollTtyOutput; 4108 options &= ~Opt_scrollTtyOutput;
3315 else 4109 else
3316 Options |= Opt_scrollTtyOutput; 4110 options |= Opt_scrollTtyOutput;
3317 break; 4111 break;
3318 case 1011: /* scroll to bottom on key press */ 4112 case 1011: /* scroll to bottom on key press */
3319 if (state) 4113 if (state)
3320 Options |= Opt_scrollTtyKeypress; 4114 options |= Opt_scrollTtyKeypress;
3321 else 4115 else
3322 Options &= ~Opt_scrollTtyKeypress; 4116 options &= ~Opt_scrollTtyKeypress;
3323 break; 4117 break;
3324 case 1047: /* secondary screen w/ clearing */ 4118 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4119 if (options & Opt_secondaryScreen)
3326 if (current_screen != PRIMARY) 4120 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 4121 scr_erase_screen (2);
3328 scr_change_screen (state); 4122 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 break; 4123 break;
4124 case 1049: /* secondary screen w/ clearing first */
4125 scr_change_screen (state);
4126 if (options & Opt_secondaryScreen)
4127 if (current_screen != PRIMARY)
4128 scr_erase_screen (2);
4129 break;
4130 default:
4131 break;
3332 } 4132 }
3333 } 4133 }
3334} 4134}
3335/*}}} */ 4135/*}}} */
3336 4136
3337/*{{{ process sgr sequences */ 4137/*{{{ process sgr sequences */
3338void 4138void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4139rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 4140{
3341 unsigned int i; 4141 unsigned int i;
3342 short rendset; 4142 short rendset;
3343 int rendstyle; 4143 int rendstyle;
3344 4144
3345 if (nargs == 0) 4145 if (nargs == 0)
3346 { 4146 {
3347 scr_rendition (0, ~RS_None); 4147 scr_rendition (0, ~RS_None);
3348 return; 4148 return;
3349 } 4149 }
4150
3350 for (i = 0; i < nargs; i++) 4151 for (i = 0; i < nargs; i++)
3351 { 4152 {
3352 rendset = -1; 4153 rendset = -1;
3353 switch (arg[i]) 4154 switch (arg[i])
3354 { 4155 {
… …
3356 rendset = 0, rendstyle = ~RS_None; 4157 rendset = 0, rendstyle = ~RS_None;
3357 break; 4158 break;
3358 case 1: 4159 case 1:
3359 rendset = 1, rendstyle = RS_Bold; 4160 rendset = 1, rendstyle = RS_Bold;
3360 break; 4161 break;
4162 //case 2: // low intensity
4163 case 3:
4164 rendset = 1, rendstyle = RS_Italic;
4165 break;
3361 case 4: 4166 case 4:
3362 rendset = 1, rendstyle = RS_Uline; 4167 rendset = 1, rendstyle = RS_Uline;
3363 break; 4168 break;
3364 case 5: 4169 case 5: // slowly blinking
4170 case 6: // rapidly blinking
3365 rendset = 1, rendstyle = RS_Blink; 4171 rendset = 1, rendstyle = RS_Blink;
3366 break; 4172 break;
4173 //case 6: // scoansi light background
3367 case 7: 4174 case 7:
3368 rendset = 1, rendstyle = RS_RVid; 4175 rendset = 1, rendstyle = RS_RVid;
3369 break; 4176 break;
3370 case 22: 4177 case 8:
4178 // invisible. NYI
4179 break;
4180 //case 9: // crossed out
4181 //case 10: // scoansi acs off, primary font
4182 //case 11: // scoansi acs on, first alt font
4183 //case 12: // scoansi acs on, |0x80, second alt font
4184 //...
4185 //case 19: // ninth alt font
4186 //case 20: // gothic
4187 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3371 rendset = 0, rendstyle = RS_Bold; 4188 rendset = 0, rendstyle = RS_Bold;
4189 break;
4190 case 22: // normal intensity
4191 rendset = 0, rendstyle = RS_Bold;
4192 break;
4193 case 23: // disable italic
4194 rendset = 0, rendstyle = RS_Italic;
3372 break; 4195 break;
3373 case 24: 4196 case 24:
3374 rendset = 0, rendstyle = RS_Uline; 4197 rendset = 0, rendstyle = RS_Uline;
3375 break; 4198 break;
3376 case 25: 4199 case 25:
3377 rendset = 0, rendstyle = RS_Blink; 4200 rendset = 0, rendstyle = RS_Blink;
3378 break; 4201 break;
4202 case 26: // variable spacing (iso 8613)
4203 rendset = 0, rendstyle = RS_Blink;
4204 break;
3379 case 27: 4205 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 4206 rendset = 0, rendstyle = RS_RVid;
3381 break; 4207 break;
4208 //case 28: // visible. NYI
4209 //case 29: // not crossed-out
3382 } 4210 }
4211
3383 if (rendset != -1) 4212 if (rendset != -1)
3384 { 4213 {
3385 scr_rendition (rendset, rendstyle); 4214 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 4215 continue; /* for (;i;) */
3387 } 4216 }
… …
3394 case 33: 4223 case 33:
3395 case 34: 4224 case 34:
3396 case 35: 4225 case 35:
3397 case 36: 4226 case 36:
3398 case 37: 4227 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4228 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 4229 break;
3402#ifdef TTY_256COLOR 4230 case 38: // set fg color, ISO 8613-6
3403 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 4231 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 4232 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4233 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 4234 i += 2;
3409 } 4235 }
3410 break; 4236 break;
3411#endif
3412 case 39: /* default fg */ 4237 case 39: /* default fg */
3413 scr_color (Color_fg, Color_fg); 4238 scr_color (Color_fg, Color_fg);
3414 break; 4239 break;
3415 4240
3416 case 40: 4241 case 40:
… …
3419 case 43: 4244 case 43:
3420 case 44: 4245 case 44:
3421 case 45: 4246 case 45:
3422 case 46: 4247 case 46:
3423 case 47: 4248 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4249 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 4250 break;
3427#ifdef TTY_256COLOR 4251 case 48: // set bg color, ISO 8613-6
3428 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 4252 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 4253 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4254 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 4255 i += 2;
3434 } 4256 }
3435 break; 4257 break;
3436#endif
3437 case 49: /* default bg */ 4258 case 49: /* default bg */
3438 scr_color (Color_bg, Color_bg); 4259 scr_color (Color_bg, Color_bg);
3439 break; 4260 break;
4261
4262 //case 50: // not variable spacing
3440 4263
3441#ifndef NO_BRIGHTCOLOR 4264#ifndef NO_BRIGHTCOLOR
3442 case 90: 4265 case 90:
3443 case 91: /* set bright fg color */ 4266 case 91: /* set bright fg color */
3444 case 92: 4267 case 92:
3445 case 93: 4268 case 93:
3446 case 94: 4269 case 94:
3447 case 95: 4270 case 95:
3448 case 96: 4271 case 96:
3449 case 97: 4272 case 97:
3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4273 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3451 Color_fg);
3452 break; 4274 break;
3453 case 100: 4275 case 100:
3454 case 101: /* set bright bg color */ 4276 case 101: /* set bright bg color */
3455 case 102: 4277 case 102:
3456 case 103: 4278 case 103:
3457 case 104: 4279 case 104:
3458 case 105: 4280 case 105:
3459 case 106: 4281 case 106:
3460 case 107: 4282 case 107:
3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3462 Color_bg);
3463 break; 4284 break;
3464#endif 4285#endif
3465 4286
3466 } 4287 }
3467 } 4288 }
3468} 4289}
3469/*}}} */ 4290/*}}} */
3470 4291
3471/*{{{ process Rob Nation's own graphics mode sequences */ 4292/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3472void 4293void
3473rxvt_term::process_graphics () 4294rxvt_term::process_graphics ()
3474{ 4295{
3475 unsigned char ch, cmd = cmd_getc (); 4296 unicode_t ch, cmd = cmd_getc ();
3476 4297
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 4298 if (cmd == 'Q')
3479 { /* query graphics */ 4299 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 4300 tt_printf ("\033G0\012"); /* no graphics */
3481 return; 4301 return;
3482 } 4302 }
3483 /* swallow other graphics sequences until terminating ':' */ 4303 /* swallow other graphics sequences until terminating ':' */
3484 do 4304 do
3485 ch = cmd_getc (); 4305 ch = cmd_getc ();
3486 while (ch != ':'); 4306 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} 4307}
3533/*}}} */ 4308/*}}} */
3534 4309
3535/* ------------------------------------------------------------------------- */ 4310/* ------------------------------------------------------------------------- */
3536 4311
… …
3545 unsigned char buf[256]; 4320 unsigned char buf[256];
3546 4321
3547 va_start (arg_ptr, fmt); 4322 va_start (arg_ptr, fmt);
3548 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3549 va_end (arg_ptr); 4324 va_end (arg_ptr);
3550 tt_write (buf, STRLEN (buf)); 4325 tt_write (buf, strlen (buf));
3551} 4326}
3552 4327
3553/* ---------------------------------------------------------------------- */ 4328/* ---------------------------------------------------------------------- */
3554/* Write data to the pty as typed by the user, pasted with the mouse, 4329/* 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. 4330 * or generated by us in response to a query ESC sequence.
3556 */ 4331 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333
3557void 4334void
3558rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4335rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3559{ 4336{
3560 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4337 if (v_buflen == 0)
4338 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3561 4340
3562 if (len) 4341 if ((unsigned int)written == len)
4342 return;
4343
4344 data += written;
4345 len -= written;
3563 { 4346 }
4347
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4349
4350 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len;
4352
4353 pty_ev.set (EVENT_READ | EVENT_WRITE);
4354}
4355
4356void rxvt_term::pty_write ()
4357{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359
4360 if (written > 0)
4361 {
4362 v_buflen -= written;
4363
3564 if (v_buflen == 0) 4364 if (v_buflen == 0)
3565 { 4365 {
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); 4366 free (v_buffer);
3593 v_buffer = 0; 4367 v_buffer = 0;
3594 v_buflen = 0; 4368 v_buflen = 0;
3595 4369
3596 pty_ev.set (EVENT_READ); 4370 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; 4371 return;
3609 } 4372 }
4373
4374 memmove (v_buffer, v_buffer + written, v_buflen);
3610 } 4375 }
4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4377 // original code just ignores this...
4378 destroy ();
3611} 4379}
3612 4380
3613/*----------------------- end-of-file (C source) -----------------------*/ 4381/*----------------------- end-of-file (C source) -----------------------*/
3614 4382

Diff Legend

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