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.225 by root, Sun Jan 1 13:35:14 2006 UTC

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

Diff Legend

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