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

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

Diff Legend

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