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

Diff Legend

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