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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.218 by root, Sat Dec 31 16:40:28 2005 UTC

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

Diff Legend

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