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

Diff Legend

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