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

Diff Legend

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