ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.190 by root, Mon Jan 17 00:59:23 2005 UTC

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

Diff Legend

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