ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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