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.216 by root, Tue Dec 27 01:25:42 2005 UTC

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

Diff Legend

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