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

Diff Legend

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