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.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.225 by root, Sun Jan 1 13:35:14 2006 UTC

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

Diff Legend

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