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

Diff Legend

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