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.55 by pcg, Sun Feb 22 20:08:18 2004 UTC vs.
Revision 1.197 by root, Thu Feb 17 15:07:48 2005 UTC

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

Diff Legend

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