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

Diff Legend

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