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.50 by pcg, Sun Feb 22 08:09:37 2004 UTC vs.
Revision 1.320 by root, Mon Apr 30 15:07:09 2007 UTC

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

Diff Legend

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