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

Diff Legend

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