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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.220 by root, Sat Dec 31 18:19:06 2005 UTC

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

Diff Legend

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