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

Diff Legend

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