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.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.316 by root, Thu Dec 7 20:59:59 2006 UTC

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

Diff Legend

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