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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.145 by root, Mon Aug 16 12:04:57 2004 UTC

… …
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 58
59// exception thrown when the command parser runs out of input data 59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 60class out_of_input { } out_of_input;
61 61
62#if ENABLE_FRILLS || ISO_14755
63
64#define ISO_14755_STARTED 0x80000000UL
65#define ISO_14755_51 0x40000000UL // basic (section 5.1)
66#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
67#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
68#define ISO_14755_MASK 0x0fffffffUL
69
70#if ISO_14755
71static unsigned short iso14755_symtab[] = {
72 // keysym, unicode
73 XK_Left, 0x2190,
74 XK_KP_Left, 0x2190,
75 XK_Up, 0x2191,
76 XK_KP_Up, 0x2191,
77 XK_Right, 0x2192,
78 XK_KP_Right, 0x2192,
79 XK_Down, 0x2193,
80 XK_KP_Down, 0x2193,
81 XK_Linefeed, 0x21b4,
82 XK_Return, 0x21b5,
83 XK_KP_Enter, 0x21b5,
84
85 XK_Prior, 0x21de,
86 XK_Next, 0x21df,
87 XK_Tab, 0x21e5,
88 XK_ISO_Left_Tab, 0x21e6,
89 XK_Shift_L, 0x21e7,
90 XK_Shift_R, 0x21e7,
91
92 XK_Shift_Lock, 0x21eb,
93 XK_ISO_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_Caps_Lock, 0x21ec,
96 XK_Num_Lock, 0x21ed,
97 XK_ISO_Level3_Shift, 0x21ee,
98 XK_ISO_Level3_Lock, 0x21ef,
99 XK_ISO_Group_Lock, 0x21f0,
100 XK_Home, 0x21f1,
101 XK_End, 0x21f2,
102
103 XK_Execute, 0x2318,
104 XK_Begin, 0x2320,
105 XK_Delete, 0x2326,
106 XK_Clear, 0x2327,
107 XK_BackSpace, 0x232b,
108 XK_Insert, 0x2380,
109 XK_Control_L, 0x2388,
110 XK_Control_R, 0x2388,
111 XK_Pause, 0x2389,
112 XK_Break, 0x238a,
113 XK_Escape, 0x238b,
114 XK_Undo, 0x238c,
115 XK_Print, 0x2399,
116
117 XK_space, 0x2423,
118 XK_KP_Space, 0x2422,
119 0,
120};
121
122void
123rxvt_term::iso14755_54 (int x, int y)
124{
125 x = Pixel2Col (x);
126 y = Pixel2Row (y);
127
128 if (x < 0 || x >= TermWin.ncol
129 || y < 0 || y >= TermWin.nrow)
130 return;
131
132 for (;;)
133 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
135
136 if (t != NOCHAR || !x)
137 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]);
139 iso14755buf = ISO_14755_54;
140 break;
141 }
142
143 x--;
144 }
145
146}
147#endif
148
149#if ENABLE_OVERLAY
150void
151rxvt_term::iso14755_51 (wchar_t ch)
152{
153 wchar_t *chr, *alloc;
154 int len;
155
156#if ENABLE_COMBINING
157 if (IS_COMPOSE (ch))
158 {
159 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr);
162 }
163 else
164#endif
165 {
166 alloc = 0;
167 chr = &ch;
168 len = 1;
169 }
170
171 scr_overlay_new (0, -1, 8 + 5, len);
172
173 for (int y = 0; y < len; y++)
174 {
175 char buf[9];
176
177 ch = *chr++;
178
179 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '=');
182#if !UNICODE3
183 if (ch >= 0x10000)
184 ch = 0xfffd;
185#endif
186 scr_overlay_set (11, y, ch);
187 scr_overlay_set (12, y, NOCHAR);
188 }
189
190#if ENABLE_COMBINING
191 if (alloc)
192 delete [] alloc;
193#endif
194}
195#endif
196
197void
198rxvt_term::commit_iso14755 ()
199{
200 wchar_t ch[2];
201
202 ch[0] = iso14755buf & ISO_14755_MASK;
203 ch[1] = 0;
204
205 if (iso14755buf & ISO_14755_51)
206 {
207 char mb[16];
208 int len;
209
210 // allow verbatim 0-bytes and control-bytes to be entered
211 if (ch[0] >= 0x20)
212 len = wcstombs (mb, ch, 16);
213 else
214 {
215 mb[0] = ch[0];
216 len = 1;
217 }
218
219 if (len > 0)
220 tt_write ((unsigned char *)mb, len);
221 else
222 scr_bell ();
223 }
224
225 iso14755buf = 0;
226}
227
228int
229rxvt_term::hex_keyval (XKeyEvent &ev)
230{
231 // check wether this event corresponds to a hex digit
232 // if the modifiers had not been pressed.
233 for (int index = 0; index < 8; index++)
234 {
235 KeySym k = XLookupKeysym (&ev, index);
236
237 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
238 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
239 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
240 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
241 }
242
243 return -1;
244}
245#endif
246
62/*{{{ Convert the keypress event into a string */ 247/*{{{ Convert the keypress event into a string */
63void 248void
64rxvt_term::lookup_key (XKeyEvent &ev) 249rxvt_term::lookup_key (XKeyEvent &ev)
65{ 250{
66 int ctrl, meta, shft, len; 251 int ctrl, meta, shft, len;
… …
151 { 336 {
152 if (TermWin.saveLines) 337 if (TermWin.saveLines)
153 { 338 {
154#ifdef UNSHIFTED_SCROLLKEYS 339#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 340 if (!ctrl && !meta)
156 {
157#else 341#else
158 if (IS_SCROLL_MOD) 342 if (IS_SCROLL_MOD)
343#endif
159 { 344 {
160#endif
161 int lnsppg; 345 int lnsppg;
162 346
163#ifdef PAGING_CONTEXT_LINES 347#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 349#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 398 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 399 {
216 keysym += (XK_F11 - XK_F1); 400 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 401 shft = 0; /* turn off Shift */
218 } 402 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 403 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 404 {
221 switch (keysym) 405 switch (keysym)
222 { 406 {
223 /* normal XTerm key bindings */ 407 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 408 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 409 selection_request (ev.time, 0, 0);
226 return; 410 return;
411#if TODO // TODO
227 /* rxvt extras */ 412 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 413 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 414 change_font (FONT_UP);
230 return; 415 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 417 change_font (FONT_DN);
233 return; 418 return;
419#endif
234 } 420 }
235 } 421 }
236 } 422 }
423
424#if ENABLE_FRILLS || ISO_14755
425 // ISO 14755 support
426 if (shft && ctrl)
427 {
428 int hv;
429
430 if (iso14755buf & ISO_14755_51
431 && (keysym == XK_space || keysym == XK_KP_Space
432 || keysym == XK_Return || keysym == XK_KP_Enter))
433 {
434 commit_iso14755 ();
435 iso14755buf = ISO_14755_51;
436# if ISO_14755
437 iso14755_51 (0);
438# endif
439 return;
440 }
441 else if ((hv = hex_keyval (ev)) >= 0)
442 {
443 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
444 | hv | ISO_14755_51;
445# if ISO_14755
446 iso14755_51 (iso14755buf & ISO_14755_MASK);
447# endif
448 return;
449 }
450 else
451 {
452# if ENABLE_OVERLAY
453 scr_overlay_off ();
454# endif
455 iso14755buf = 0;
456 }
457 }
458 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
459 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
460 if (!(iso14755buf & ISO_14755_STARTED))
461 {
462 iso14755buf |= ISO_14755_STARTED;
463# if ENABLE_OVERLAY
464 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
465 scr_overlay_set (0, 0, "ISO 14755 mode");
466# endif
467 }
468#endif
469
237#ifdef PRINTPIPE 470#ifdef PRINTPIPE
238 if (keysym == XK_Print) 471 if (keysym == XK_Print)
239 { 472 {
240 scr_printscreen (ctrl | shft); 473 scr_printscreen (ctrl | shft);
241 return; 474 return;
… …
273 newlen = 1; 506 newlen = 1;
274 switch (keysym) 507 switch (keysym)
275 { 508 {
276#ifndef NO_BACKSPACE_KEY 509#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 510 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 511 if (priv_modes & PrivMode_HaveBackSpace)
279 { 512 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 513 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 514 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 515 kbuf[1] = '\0';
283 } 516 }
284 else 517 else
285 STRCPY (kbuf, key_backspace); 518 strcpy (kbuf, key_backspace);
286 break; 519 break;
287#endif 520#endif
288#ifndef NO_DELETE_KEY 521#ifndef NO_DELETE_KEY
289 case XK_Delete: 522 case XK_Delete:
290 STRCPY (kbuf, key_delete); 523 strcpy (kbuf, key_delete);
291 break; 524 break;
292#endif 525#endif
293 case XK_Tab: 526 case XK_Tab:
294 if (shft) 527 if (shft)
295 STRCPY (kbuf, "\033[Z"); 528 strcpy (kbuf, "\033[Z");
296 else 529 else
297 { 530 {
298#ifdef CTRL_TAB_MAKES_META 531#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 532 if (ctrl)
300 meta = 1; 533 meta = 1;
… …
306 newlen = 0; 539 newlen = 0;
307 } 540 }
308 break; 541 break;
309 542
310#ifdef XK_KP_Left 543#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 544 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 545 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 546 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 547 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 548 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 549 {
317 STRCPY (kbuf, "\033OZ"); 550 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 551 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 552 break;
320 } 553 }
321 else 554 else
322 /* translate to std. cursor key */ 555 /* translate to std. cursor key */
… …
325#endif 558#endif
326 case XK_Up: /* "\033[A" */ 559 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 560 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 561 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 562 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 563 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 564 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 565 /* do Shift first */
333 if (shft) 566 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 567 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 568 else if (ctrl)
336 { 569 {
337 kbuf[1] = 'O'; 570 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 571 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 572 }
340 else if (PrivateModes & PrivMode_aplCUR) 573 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 574 kbuf[1] = 'O';
342 break; 575 break;
343 576
344#ifndef UNSHIFTED_SCROLLKEYS 577#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 578# ifdef XK_KP_Prior
346 case XK_KP_Prior: 579 case XK_KP_Prior:
347 /* allow shift to override */ 580 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 581 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 582 {
350 STRCPY (kbuf, "\033Oy"); 583 strcpy (kbuf, "\033Oy");
351 break; 584 break;
352 } 585 }
353 /* FALLTHROUGH */ 586 /* FALLTHROUGH */
354# endif 587# endif
355 case XK_Prior: 588 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 589 strcpy (kbuf, "\033[5~");
357 break; 590 break;
358# ifdef XK_KP_Next 591# ifdef XK_KP_Next
359 case XK_KP_Next: 592 case XK_KP_Next:
360 /* allow shift to override */ 593 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 595 {
363 STRCPY (kbuf, "\033Os"); 596 strcpy (kbuf, "\033Os");
364 break; 597 break;
365 } 598 }
366 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
367# endif 600# endif
368 case XK_Next: 601 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 602 strcpy (kbuf, "\033[6~");
370 break; 603 break;
371#endif 604#endif
372 case XK_KP_Enter: 605 case XK_KP_Enter:
373 /* allow shift to override */ 606 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 608 {
376 STRCPY (kbuf, "\033OM"); 609 strcpy (kbuf, "\033OM");
610 break;
611 }
612
613 /* FALLTHROUGH */
614
615 case XK_Return:
616 if (priv_modes & PrivMode_LFNL)
617 {
618 kbuf[0] = '\015';
619 kbuf[1] = '\012';
620 kbuf[2] = '\0';
377 } 621 }
378 else 622 else
379 { 623 {
380 kbuf[0] = '\r'; 624 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 625 kbuf[1] = '\0';
382 } 626 }
383 break; 627 break;
384 628
385#ifdef XK_KP_Begin 629#ifdef XK_KP_Begin
386 case XK_KP_Begin: 630 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 631 strcpy (kbuf, "\033Ou");
388 break; 632 break;
389 633
390 case XK_KP_Insert: 634 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 635 strcpy (kbuf, "\033Op");
392 break; 636 break;
393 637
394 case XK_KP_Delete: 638 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 639 strcpy (kbuf, "\033On");
396 break; 640 break;
397#endif 641#endif
398 case XK_KP_F1: /* "\033OP" */ 642 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 643 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 644 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 645 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 646 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 647 kbuf[2] += (keysym - XK_KP_F1);
404 break; 648 break;
405 649
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 650 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 651 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 662 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 663 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 664 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 665 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 666 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 667 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 668 {
425 STRCPY (kbuf, "\033Oj"); 669 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 670 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 671 }
428 else 672 else
429 { 673 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 674 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 675 kbuf[1] = '\0';
432 } 676 }
433 break; 677 break;
434 678
435 case XK_Find: 679 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 680 strcpy (kbuf, "\033[1~");
437 break; 681 break;
438 case XK_Insert: 682 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 683 strcpy (kbuf, "\033[2~");
440 break; 684 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 685#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 686 case DXK_Remove:
443 /* FALLTHROUGH */ 687 /* FALLTHROUGH */
444#endif 688#endif
445 case XK_Execute: 689 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 690 strcpy (kbuf, "\033[3~");
447 break; 691 break;
448 case XK_Select: 692 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 693 strcpy (kbuf, "\033[4~");
450 break; 694 break;
451#ifdef XK_KP_End 695#ifdef XK_KP_End
452 case XK_KP_End: 696 case XK_KP_End:
453 /* allow shift to override */ 697 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 699 {
456 STRCPY (kbuf, "\033Oq"); 700 strcpy (kbuf, "\033Oq");
457 break; 701 break;
458 } 702 }
459 /* FALLTHROUGH */ 703 /* FALLTHROUGH */
460#endif 704#endif
461 case XK_End: 705 case XK_End:
462 STRCPY (kbuf, KS_END); 706 strcpy (kbuf, KS_END);
463 break; 707 break;
464#ifdef XK_KP_Home 708#ifdef XK_KP_Home
465 case XK_KP_Home: 709 case XK_KP_Home:
466 /* allow shift to override */ 710 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 711 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 712 {
469 STRCPY (kbuf, "\033Ow"); 713 strcpy (kbuf, "\033Ow");
470 break; 714 break;
471 } 715 }
472 /* FALLTHROUGH */ 716 /* FALLTHROUGH */
473#endif 717#endif
474 case XK_Home: 718 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 719 strcpy (kbuf, KS_HOME);
476 break; 720 break;
477 721
478#define FKEY(n, fkey) \ 722#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 723 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 724
… …
533 default: 777 default:
534 newlen = 0; 778 newlen = 0;
535 break; 779 break;
536 } 780 }
537 if (newlen) 781 if (newlen)
538 len = STRLEN (kbuf); 782 len = strlen (kbuf);
539 } 783 }
540 784
541 /* 785 /*
542 * Pass meta for all function keys, if 'meta' option set 786 * Pass meta for all function keys, if 'meta' option set
543 */ 787 */
… …
571 } 815 }
572 816
573 if (len <= 0) 817 if (len <= 0)
574 return; /* not mapped */ 818 return; /* not mapped */
575 819
576 if (Options & Opt_scrollTtyKeypress) 820 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 821 if (TermWin.view_start)
578 { 822 {
579 TermWin.view_start = 0; 823 TermWin.view_start = 0;
580 want_refresh = 1; 824 want_refresh = 1;
581 } 825 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 874 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 875 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 876
633 if (n > 0 && s < count) 877 if (n > 0 && s < count)
634 { 878 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 879 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 880 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 881 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 882 cmdbuf_endp -= n;
639 s += n; 883 s += n;
640 } 884 }
… …
661 if (want_full_refresh) 905 if (want_full_refresh)
662 { 906 {
663 want_full_refresh = 0; 907 want_full_refresh = 0;
664 scr_clear (); 908 scr_clear ();
665 scr_touch (false); 909 scr_touch (false);
666 want_refresh = 1;
667 } 910 }
668#endif 911#endif
669 912
670 if (want_refresh) 913 if (want_refresh)
671 { 914 {
… …
675 IMSendSpot (); 918 IMSendSpot ();
676#endif 919#endif
677 } 920 }
678 921
679 display->flush (); 922 display->flush ();
923
924 flush_ev.stop ();
680} 925}
681 926
682void 927void
683rxvt_term::check_cb (check_watcher &w) 928rxvt_term::check_cb (check_watcher &w)
684{ 929{
685 SET_R (this); 930 SET_R (this);
686 SET_LOCALE (locale); 931 SET_LOCALE (locale);
687 932
933 display->flush ();
934
935 if (want_refresh && !flush_ev.active)
936 flush_ev.start (NOW + 0.01);
937}
938
939void
940rxvt_term::flush_cb (time_watcher &w)
941{
942 SET_R (this);
943 SET_LOCALE (locale);
944
945 refresh_limit = 1;
946 refresh_count = 0;
688 flush (); 947 flush ();
689} 948}
690 949
691#ifdef CURSOR_BLINK 950#ifdef CURSOR_BLINK
692void 951void
… …
710 w.start (w.at + TEXT_BLINK_INTERVAL); 969 w.start (w.at + TEXT_BLINK_INTERVAL);
711 } 970 }
712} 971}
713#endif 972#endif
714 973
974#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
975void
976rxvt_term::cont_scroll_cb (time_watcher &w)
977{
978 if ((scrollbar_isUp() || scrollbar_isDn()) &&
979 scr_page (scrollbar_isUp() ? UP : DN, 1))
980 {
981 refresh_type |= SMOOTH_REFRESH;
982 want_refresh = 1;
983 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
984 }
985}
986#endif
987
988#ifdef SELECTION_SCROLLING
989void
990rxvt_term::sel_scroll_cb (time_watcher &w)
991{
992 if (scr_page (scroll_selection_dir, scroll_selection_lines))
993 {
994 selection_extend (selection_save_x, selection_save_y, selection_save_state);
995 refresh_type |= SMOOTH_REFRESH;
996 want_refresh = 1;
997 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
998 }
999}
1000#endif
1001
1002#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1003void
1004rxvt_term::slip_wheel_cb (time_watcher &w)
1005{
1006 if (mouse_slip_wheel_speed == 0
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed))
1009 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 }
1014}
1015#endif
1016
715bool 1017bool
716rxvt_term::pty_fill () 1018rxvt_term::pty_fill ()
717{ 1019{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1020 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1021
… …
725 1027
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1028 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1029 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1030 cmdbuf_endp = cmdbuf_ptr + n;
729 1031
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
731 1033
732 if (n > 0) 1034 if (n > 0)
733 { 1035 {
734 cmdbuf_endp += n; 1036 cmdbuf_endp += n;
735 return true; 1037 return true;
… …
753 while (pty_fill ()) 1055 while (pty_fill ())
754 if (cmd_parse ()) 1056 if (cmd_parse ())
755 break; 1057 break;
756} 1058}
757 1059
1060void
1061rxvt_term::pointer_unblank ()
1062{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1064 recolour_cursor ();
1065
1066#ifdef POINTER_BLANK
1067 hidden_pointer = 0;
1068
1069 if (options & Opt_pointerBlank)
1070 pointer_ev.start (NOW + pointerBlankDelay);
1071#endif
1072}
1073
758#ifdef POINTER_BLANK 1074#ifdef POINTER_BLANK
759void 1075void
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 () 1076rxvt_term::pointer_blank ()
773{ 1077{
774 if (! (Options & Opt_pointerBlank)) 1078 if (! (options & Opt_pointerBlank))
775 return; 1079 return;
776 1080
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1081 XDefineCursor (display->display, TermWin.vt, blank_cursor);
778 XFlush (display->display); 1082 XFlush (display->display);
779 1083
… …
799 x = ev.x; 1103 x = ev.x;
800 y = ev.y; 1104 y = ev.y;
801 pixel_position (&x, &y); 1105 pixel_position (&x, &y);
802 1106
803 if (MEvent.button == AnyButton) 1107 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1108 button_number = 3;
806 }
807 else 1109 else
808 { 1110 {
809 button_number = MEvent.button - Button1; 1111 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1112 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1113 if (button_number >= 3)
812 button_number += (64 - 3); 1114 button_number += (64 - 3);
813 } 1115 }
814 1116
815 if (PrivateModes & PrivMode_MouseX10) 1117 if (priv_modes & PrivMode_MouseX10)
816 { 1118 {
817 /* 1119 /*
818 * do not report ButtonRelease 1120 * do not report ButtonRelease
819 * no state info allowed 1121 * no state info allowed
820 */ 1122 */
… …
878{ 1180{
879 SET_R (this); 1181 SET_R (this);
880 SET_LOCALE (locale); 1182 SET_LOCALE (locale);
881 1183
882#if defined(CURSOR_BLINK) 1184#if defined(CURSOR_BLINK)
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
884 { 1186 {
885 if (hidden_cursor) 1187 if (hidden_cursor)
886 { 1188 {
887 hidden_cursor = 0; 1189 hidden_cursor = 0;
888 want_refresh = 1; 1190 want_refresh = 1;
… …
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
892 } 1194 }
893#endif 1195#endif
894 1196
895#if defined(POINTER_BLANK) 1197#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
897 { 1199 {
898 if (ev.type == MotionNotify 1200 if (ev.type == MotionNotify
899 || ev.type == ButtonPress 1201 || ev.type == ButtonPress
900 || ev.type == ButtonRelease) 1202 || ev.type == ButtonRelease)
901 if (hidden_pointer) 1203 if (hidden_pointer)
… …
913 1215
914 Window unused_root, unused_child; 1216 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1217 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1218 unsigned int unused_mask;
917 1219
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
967 switch (ev.type) 1220 switch (ev.type)
968 { 1221 {
969 case KeyPress: 1222 case KeyPress:
1223#if ISO_14755
1224 if (!(iso14755buf & ISO_14755_52))
1225#endif
970 lookup_key (ev.xkey); 1226 lookup_key (ev.xkey);
1227
1228 break;
1229
1230 case KeyRelease:
1231 {
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS)
1233 KeySym ks;
1234
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif
1237
1238#if ENABLE_FRILLS || ISO_14755
1239 // ISO 14755 support
1240 if (iso14755buf)
1241 if (iso14755buf & ISO_14755_52)
1242 {
1243# if ENABLE_OVERLAY
1244 scr_overlay_off ();
1245# endif
1246# if ISO_14755
1247 // iso14755 part 5.2 handling: release time
1248 // first: controls
1249 if ((ev.xkey.state & ControlMask)
1250 && ((ks >= 0x40 && ks <= 0x5f)
1251 || (ks >= 0x61 && ks <= 0x7f)))
1252 {
1253 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1254 commit_iso14755 ();
1255 return; // case-break;
1256 }
1257
1258 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1259 if (i[0] == ks)
1260 {
1261 iso14755buf = ISO_14755_51 | i[1];
1262 commit_iso14755 ();
1263 return; // case-break;
1264 }
1265
1266 scr_bell ();
1267# endif
1268 iso14755buf = 0;
971 break; 1269 break;
1270 }
1271 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276 if (iso14755buf & ISO_14755_51)
1277 commit_iso14755 ();
1278#if ISO_14755
1279 else if (iso14755buf & ISO_14755_STARTED)
1280 {
1281 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1282
1283 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1284 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1285 }
1286# endif
1287 else
1288 iso14755buf = 0;
1289 }
1290#endif
972 1291
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1292#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease:
975 {
976 if (! (ev.xkey.state & ControlMask)) 1293 if (!(ev.xkey.state & ControlMask))
1294 slip_wheel_ev.stop ();
1295 else if (ks == XK_Control_L || ks == XK_Control_R)
977 mouse_slip_wheel_speed = 0; 1296 mouse_slip_wheel_speed = 0;
978 else 1297#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; 1298 break;
987 } 1299 }
988#endif
989 1300
990 case ButtonPress: 1301 case ButtonPress:
991 button_press (ev.xbutton); 1302 button_press (ev.xbutton);
992 break; 1303 break;
993 1304
… …
1020 &Size, &RemainingBytes, 1331 &Size, &RemainingBytes,
1021 &data); 1332 &data);
1022 XChangeProperty (display->display, display->root, 1333 XChangeProperty (display->display, display->root,
1023 XA_CUT_BUFFER0, XA_STRING, 1334 XA_CUT_BUFFER0, XA_STRING,
1024 8, PropModeReplace, 1335 8, PropModeReplace,
1025 data, STRLEN (data)); 1336 data, strlen (data));
1026 XFree (data); 1337 XFree (data);
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1338 selection_paste (display->root, XA_CUT_BUFFER0, True);
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1029 } 1340 }
1030#endif /* OFFIX_DND */ 1341#endif /* OFFIX_DND */
1031 break; 1342 break;
1032 1343
1033 case MappingNotify: 1344 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1345 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1346 break;
1036 1347
1037 /* 1348 /*
1038 * XXX: this is not the _current_ arrangement 1349 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1350 * Here's my conclusion:
… …
1064 { 1375 {
1065 TermWin.focus = 1; 1376 TermWin.focus = 1;
1066 want_refresh = 1; 1377 want_refresh = 1;
1067#ifdef USE_XIM 1378#ifdef USE_XIM
1068 if (Input_Context != NULL) 1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1069 XSetICFocus (Input_Context); 1382 XSetICFocus (Input_Context);
1383 }
1070#endif 1384#endif
1071#ifdef CURSOR_BLINK 1385#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink) 1386 if (options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 set_colorfgbg ();
1394 scr_clear ();
1395 scr_touch (true);
1396 }
1074#endif 1397#endif
1075 1398
1076 } 1399 }
1077 break; 1400 break;
1078 1401
… …
1084#ifdef USE_XIM 1407#ifdef USE_XIM
1085 if (Input_Context != NULL) 1408 if (Input_Context != NULL)
1086 XUnsetICFocus (Input_Context); 1409 XUnsetICFocus (Input_Context);
1087#endif 1410#endif
1088#ifdef CURSOR_BLINK 1411#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink) 1412 if (options & Opt_cursorBlink)
1090 cursor_blink_ev.stop (); 1413 cursor_blink_ev.stop ();
1091 hidden_cursor = 0; 1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1092#endif 1424#endif
1093 1425
1094 } 1426 }
1095 break; 1427 break;
1096 1428
… …
1106 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1107 } 1439 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1109 1441
1110 if (szHint.width != width || szHint.height != height) 1442 if (szHint.width != width || szHint.height != height)
1111 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1113 resize_all_windows (width, height, 1); 1443 resize_all_windows (width, height, 1);
1114 } 1444
1115#ifdef DEBUG_SIZE
1116 else
1117 {
1118 D_SIZE ((stderr, "Size: Not resizing"));
1119 }
1120#endif
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122 if (Options & Opt_transparent) 1446 if (options & Opt_transparent)
1123 { 1447 {
1124 check_our_parents (); 1448 check_our_parents ();
1125 if (am_transparent) 1449 if (am_transparent)
1126 want_full_refresh = 1; 1450 want_refresh = want_full_refresh = 1;
1127 } 1451 }
1128#endif 1452#endif
1129 } 1453 }
1454 break;
1455
1456 case PropertyNotify:
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1130 break; 1461 break;
1131 1462
1132 case SelectionClear: 1463 case SelectionClear:
1133 selection_clear (); 1464 selection_clear ();
1134 break; 1465 break;
… …
1165 1496
1166 case GraphicsExpose: 1497 case GraphicsExpose:
1167 case Expose: 1498 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1499 if (ev.xany.window == TermWin.vt)
1169 { 1500 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1501 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1174 // don't understand this, so commented it out 1505
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1511
1178 // ev.xexpose.width, TermWin.height, False); 1512 scr_refresh (refresh_type);
1179#endif
1180 want_refresh = 1;
1181 } 1513 }
1182 else 1514 else
1183 { 1515 {
1184 XEvent unused_event; 1516 XEvent unused_event;
1185 1517
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1187 Expose, 1519 ;
1188 &unused_event)) ;
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1190 GraphicsExpose, 1521 ;
1191 &unused_event)) ; 1522
1192 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1193 { 1524 {
1194 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1195 scrollbar_show (0); 1526 scrollbar_show (0);
1196 } 1527 }
1197#ifdef MENUBAR 1528#ifdef MENUBAR
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1199 menubar_expose (); 1530 menubar_expose ();
1200#endif 1531#endif
1532
1533#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1535 XClearWindow (display->display, ev.xany.window);
1536#endif
1201 } 1537 }
1202 break; 1538 break;
1203 1539
1204 case MotionNotify: 1540 case MotionNotify:
1205#ifdef POINTER_BLANK 1541#ifdef POINTER_BLANK
… …
1211 { 1547 {
1212 menubar_control (ev.xbutton); 1548 menubar_control (ev.xbutton);
1213 break; 1549 break;
1214 } 1550 }
1215#endif 1551#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1217 break; 1553 break;
1218 1554
1219 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1220 { 1556 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1558 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1224 ; 1560 ;
1225 1561
1226 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (display->display, TermWin.vt,
1227 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1565 & (ev.xbutton.x), & (ev.xbutton.y),
1230 &unused_mask); 1566 &unused_mask);
1231#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1568 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1570 {
1235#endif 1571#endif
1572#if ISO_14755
1573 // 5.4
1574 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1575 {
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break;
1578 }
1579#endif
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1580 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1581 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1238#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1241 { 1585 {
1242 int dist; 1586 int dist;
1243 1587
1244 pending_scroll_selection=1;
1245
1246 /* don't clobber the current delay if we are 1588 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1589 * already in the middle of scrolling.
1248 */ 1590 */
1249 if (scroll_selection_delay<=0) 1591 if (!sel_scroll_ev.active)
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1251 1593
1252 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1254 */ 1596 */
1255 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1600
1260 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y<TermWin.int_bwidth)
1262 { 1603 {
1263 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1265 } 1606 }
1266 else 1607 else
1267 { 1608 {
1268 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y -
1270 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1271 } 1611 }
1612
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1274 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1276 } 1618 }
1277 else 1619 else
1278 { 1620 {
1279 /* we are within the text window, so we 1621 /* we are within the text window, so we
1280 * shouldn't be scrolling 1622 * shouldn't be scrolling
1281 */ 1623 */
1282 pending_scroll_selection = 0; 1624 if (sel_scroll_ev.active)
1625 sel_scroll_ev.stop();
1283 } 1626 }
1284#endif 1627#endif
1285#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1286
1287 } 1629 }
1288#endif 1630#endif
1289
1290 } 1631 }
1291 } 1632 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1293 { 1634 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1295 MotionNotify, &ev)) ; 1636 MotionNotify, &ev)) ;
1296 XQueryPointer (display->display, scrollBar.win, 1637 XQueryPointer (display->display, scrollBar.win,
1297 &unused_root, &unused_child, 1638 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1639 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1640 & (ev.xbutton.x), & (ev.xbutton.y),
1300 &unused_mask); 1641 &unused_mask);
… …
1306 } 1647 }
1307 break; 1648 break;
1308 } 1649 }
1309} 1650}
1310 1651
1652#if TRANSPARENT
1311void 1653void
1312rxvt_term::rootwin_cb (XEvent &ev) 1654rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1655{
1314 SET_R (this); 1656 SET_R (this);
1315 SET_LOCALE (locale); 1657 SET_LOCALE (locale);
1316 1658
1317 switch (ev.type) 1659 switch (ev.type)
1318 { 1660 {
1319 case PropertyNotify: 1661 case PropertyNotify:
1320 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1321 {
1322 if (ev.xproperty.state == PropertyNewValue)
1323 selection_property (ev.xproperty.window, ev.xproperty.atom);
1324 break;
1325 }
1326#ifdef TRANSPARENT
1327 else
1328 {
1329 /* 1662 /*
1330 * if user used some Esetroot compatible prog to set the root bg, 1663 * if user used some Esetroot compatible prog to set the root bg,
1331 * use the property to determine the pixmap. We use it later on. 1664 * use the property to determine the pixmap. We use it later on.
1332 */ 1665 */
1333 if (xa[XA_XROOTPMAPID] == 0) 1666 if (xa[XA_XROOTPMAPID] == 0)
1334 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335 1668
1336 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1337 return; 1670 return;
1338 }
1339 1671
1340 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1341 case ReparentNotify: 1673 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1344 break; 1676 break;
1345#endif
1346 } 1677 }
1347} 1678}
1679#endif
1348 1680
1349void 1681void
1350rxvt_term::button_press (XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1351{ 1683{
1352 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1353 1685
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1355 if (!bypass_keystate) 1687 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1357 /* 1690 /*
1358 * VT window processing of button press 1691 * VT window processing of button press
1359 */ 1692 */
1360 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1361 { 1694 {
1695#if ISO_14755
1696 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 {
1699 iso14755_54 (ev.x, ev.y);
1700 return;
1701 }
1702#endif
1703
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1363 if (reportmode) 1705 if (reportmode)
1364 { 1706 {
1365 /* mouse report from vt window */ 1707 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1708 /* save the xbutton state (for ButtonRelease) */
… …
1400 MEvent.clicks = 0; 1742 MEvent.clicks = 0;
1401 switch (ev.button) 1743 switch (ev.button)
1402 { 1744 {
1403 case Button1: 1745 case Button1:
1404 /* allow shift+left click to extend selection */ 1746 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1406 { 1748 {
1407 if (MEvent.button == Button1 && clickintime) 1749 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1750 selection_rotate (ev.x, ev.y);
1409 else 1751 else
1410 selection_extend (ev.x, ev.y, 1); 1752 selection_extend (ev.x, ev.y, 1);
… …
1425 case Button3: 1767 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1768 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1769 selection_rotate (ev.x, ev.y);
1428 else 1770 else
1429 selection_extend (ev.x, ev.y, 1); 1771 selection_extend (ev.x, ev.y, 1);
1772
1430 MEvent.button = Button3; 1773 MEvent.button = Button3;
1431 break; 1774 break;
1432 } 1775 }
1433 } 1776 }
1777
1434 MEvent.time = ev.time; 1778 MEvent.time = ev.time;
1435 return; 1779 return;
1436 } 1780 }
1437 1781
1438 /* 1782 /*
… …
1504 upordown = 1; /* down */ 1848 upordown = 1; /* down */
1505 } 1849 }
1506 if (upordown) 1850 if (upordown)
1507 { 1851 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1852#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1853 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1510#endif 1854#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 1855 if (scr_page (upordown < 0 ? UP : DN, 1))
1512 { 1856 {
1513 if (upordown < 0) 1857 if (upordown < 0)
1514 scrollBar.setUp (); 1858 scrollBar.setUp ();
… …
1530 break; 1874 break;
1531 case R_SB_ALIGN_BOTTOM: 1875 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 1876 csrO = scrollBar.bot - scrollBar.top;
1533 break; 1877 break;
1534 } 1878 }
1879
1535 if (scrollBar.style == R_SB_XTERM 1880 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 1881 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 1882 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 1883 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539 scrollbar_size ()); 1884
1540 scrollBar.setMotion (); 1885 scrollBar.setMotion ();
1541 break; 1886 break;
1542 1887
1543 case Button1: 1888 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1889 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1568 scr_page ((ev.button == Button1 ? DN : UP), 1913 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 1914 (TermWin.nrow
1570 * scrollbar_position (ev.y) 1915 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 1916 / scrollbar_size ()));
1572 } 1917 }
1918
1573 break; 1919 break;
1574 } 1920 }
1575 } 1921 }
1576 return; 1922 return;
1577 } 1923 }
… …
1589{ 1935{
1590 int reportmode = 0; 1936 int reportmode = 0;
1591 1937
1592 csrO = 0; /* reset csr Offset */ 1938 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 1939 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1940 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 1941
1596 if (scrollbar_isUpDn ()) 1942 if (scrollbar_isUpDn ())
1597 { 1943 {
1598 scrollBar.setIdle (); 1944 scrollBar.setIdle ();
1599 scrollbar_show (0); 1945 scrollbar_show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1946#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH; 1947 refresh_type &= ~SMOOTH_REFRESH;
1602#endif 1948#endif
1603
1604 } 1949 }
1950
1605#ifdef SELECTION_SCROLLING 1951#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 1952 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop();
1607#endif 1954#endif
1955
1608 if (ev.window == TermWin.vt) 1956 if (ev.window == TermWin.vt)
1609 { 1957 {
1958#if ISO_14755
1959 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return;
1962#endif
1610 if (reportmode) 1963 if (reportmode)
1611 { 1964 {
1612 /* mouse report from vt window */ 1965 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 1966 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 1967 if (ev.button >= 4)
… …
1628 MEvent.button = AnyButton; 1981 MEvent.button = AnyButton;
1629 mouse_report (ev); 1982 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 1983#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 1984 return;
1632 } 1985 }
1986
1633 /* 1987 /*
1634 * dumb hack to compensate for the failure of click-and-drag 1988 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 1989 * when overriding mouse reporting
1636 */ 1990 */
1637 if (PrivateModes & PrivMode_mouse_report 1991 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 1992 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 1993 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 1994 selection_extend (ev.x, ev.y, 0);
1641 1995
1642 switch (ev.button) 1996 switch (ev.button)
… …
1653 case Button5: 2007 case Button5:
1654 { 2008 {
1655 int i; 2009 int i;
1656 page_dirn v; 2010 page_dirn v;
1657 2011
1658 v = (ev.button == Button4) ? UP : DN; 2012 v = ev.button == Button4 ? UP : DN;
2013
1659 if (ev.state & ShiftMask) 2014 if (ev.state & ShiftMask)
1660 i = 1; 2015 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2016 else if (options & Opt_mouseWheelScrollPage)
1662 i = TermWin.nrow - 1; 2017 i = TermWin.nrow - 1;
1663 else 2018 else
1664 i = 5; 2019 i = 5;
2020
1665# ifdef MOUSE_SLIP_WHEELING 2021# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2022 if (ev.state & ControlMask)
1667 { 2023 {
1668 mouse_slip_wheel_speed += (v ? -1 : 1); 2024 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2027
2028 if (slip_wheel_ev.at < NOW)
1669 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030
2031 slip_wheel_ev.start ();
1670 } 2032 }
2033 else
2034 {
1671# endif 2035# endif
1672# ifdef JUMP_MOUSE_WHEEL 2036# ifdef JUMP_MOUSE_WHEEL
1673 scr_page (v, i);
1674 scr_refresh (SMOOTH_REFRESH);
1675 scrollbar_show (1);
1676# else
1677 while (i--)
1678 {
1679 scr_page (v, 1); 2037 scr_page (v, i);
1680 scr_refresh (SMOOTH_REFRESH); 2038 scr_refresh (SMOOTH_REFRESH);
1681 scrollbar_show (1); 2039 scrollbar_show (1);
2040# else
2041 while (i--)
2042 {
2043 scr_page (v, 1);
2044 scr_refresh (SMOOTH_REFRESH);
2045 scrollbar_show (1);
2046 }
2047# endif
2048# ifdef MOUSE_SLIP_WHEELING
1682 } 2049 }
1683# endif 2050#endif
1684
1685 } 2051 }
1686 break; 2052 break;
1687#endif 2053#endif
1688
1689 } 2054 }
1690 } 2055 }
1691#ifdef MENUBAR 2056#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window)) 2057 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev); 2058 menubar_control (ev);
1694#endif 2059#endif
1695} 2060}
1696 2061
1697#ifdef TRANSPARENT 2062#ifdef TRANSPARENT
1698#if TINTING 2063#if TINTING
1699/* shading taken from eterm-0.9.2 */ 2064/* taken from aterm-0.4.2 */
1700/* RGB 15 */
1701 2065
1702static void 2066typedef uint32_t RUINT32T;
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707 2067
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2068void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2069{
1710 /* No saturation */ 2070 int sh_r, sh_g, sh_b;
1711 for (y = h; --y >= 0;) { 2071 RUINT32T mask_r, mask_g, mask_b;
1712 for (x = -w; x < 0; x++) { 2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1713 int r, g, b; 2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i;
1714 2076
1715 b = ((uint16_t *) ptr)[x]; 2077 Visual* visual = display->visual;
1716 r = (b & 0x7c00) * rm; 2078
1717 g = (b & 0x3e0) * gm; 2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1718 b = (b & 0x1f) * bm; 2080
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2081 /* for convenience */
1720 | ((g >> 8) & 0x3e0) 2082 mask_r = visual->red_mask;
1721 | ((b >> 8) & 0x1f); 2083 mask_g = visual->green_mask;
1722 } 2084 mask_b = visual->blue_mask;
1723 ptr += bpl; 2085
1724 } 2086 /* boring lookup table pre-initialization */
2087 switch (srcImage->bits_per_pixel) {
2088 case 15:
2089 if ((mask_r != 0x7c00) ||
2090 (mask_g != 0x03e0) ||
2091 (mask_b != 0x001f))
2092 return;
2093 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2094 lookup_r = lookup;
2095 lookup_g = lookup+32;
2096 lookup_b = lookup+32+32;
2097 sh_r = 10;
2098 sh_g = 5;
2099 sh_b = 0;
2100 break;
2101 case 16:
2102 if ((mask_r != 0xf800) ||
2103 (mask_g != 0x07e0) ||
2104 (mask_b != 0x001f))
2105 return;
2106 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2107 lookup_r = lookup;
2108 lookup_g = lookup+32;
2109 lookup_b = lookup+32+64;
2110 sh_r = 11;
2111 sh_g = 5;
2112 sh_b = 0;
2113 break;
2114 case 24:
2115 if ((mask_r != 0xff0000) ||
2116 (mask_g != 0x00ff00) ||
2117 (mask_b != 0x0000ff))
2118 return;
2119 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2120 lookup_r = lookup;
2121 lookup_g = lookup+256;
2122 lookup_b = lookup+256+256;
2123 sh_r = 16;
2124 sh_g = 8;
2125 sh_b = 0;
2126 break;
2127 case 32:
2128 if ((mask_r != 0xff0000) ||
2129 (mask_g != 0x00ff00) ||
2130 (mask_b != 0x0000ff))
2131 return;
2132 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2133 lookup_r = lookup;
2134 lookup_g = lookup+256;
2135 lookup_b = lookup+256+256;
2136 sh_r = 16;
2137 sh_g = 8;
2138 sh_b = 0;
2139 break;
2140 default:
2141 return; /* we do not support this color depth */
2142 }
2143
2144 /* prepare limits for color transformation (each channel is handled separately) */
2145 if (shade < 0) {
2146 shade = -shade;
2147 if (shade < 0) shade = 0;
2148 if (shade > 100) shade = 100;
2149
2150 lower_lim_r = 65535-rm;
2151 lower_lim_g = 65535-gm;
2152 lower_lim_b = 65535-bm;
2153
2154 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2155 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2156 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2157
2158 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1725 } else { 2159 } else {
1726 for (y = h; --y >= 0;) { 2160 if (shade < 0) shade = 0;
1727 for (x = -w; x < 0; x++) { 2161 if (shade > 100) shade = 100;
1728 int r, g, b;
1729 2162
1730 b = ((uint16_t *) ptr)[x]; 2163 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1731 r = (b & 0x7c00) * rm; 2164
1732 g = (b & 0x3e0) * gm; 2165 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1733 b = (b & 0x1f) * bm; 2166 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1734 r |= (!(r >> 15) - 1); 2167 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1735 g |= (!(g >> 10) - 1); 2168 }
1736 b |= (!(b >> 5) - 1); 2169
1737 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2170 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1738 | ((g >> 8) & 0x3e0) 2171 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1739 | ((b >> 8) & 0x1f); 2172 {
1740 } 2173 unsigned int tmp;
1741 ptr += bpl; 2174
2175 tmp = lower_lim_r;
2176 lower_lim_r = lower_lim_b;
2177 lower_lim_b = tmp;
2178
2179 tmp = upper_lim_r;
2180 upper_lim_r = upper_lim_b;
2181 upper_lim_b = tmp;
2182 }
2183
2184 /* fill our lookup tables */
2185 for (i = 0; i <= mask_r>>sh_r; i++)
2186 {
2187 RUINT32T tmp;
2188 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2189 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2190 lookup_r[i] = (tmp/65535)<<sh_r;
2191 }
2192 for (i = 0; i <= mask_g>>sh_g; i++)
2193 {
2194 RUINT32T tmp;
2195 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2196 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2197 lookup_g[i] = (tmp/65535)<<sh_g;
2198 }
2199 for (i = 0; i <= mask_b>>sh_b; i++)
2200 {
2201 RUINT32T tmp;
2202 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2203 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2204 lookup_b[i] = (tmp/65535)<<sh_b;
2205 }
2206
2207 /* apply table to input image (replacing colors by newly calculated ones) */
2208 switch (srcImage->bits_per_pixel)
2209 {
2210 case 15:
2211 {
2212 unsigned short *p1, *pf, *p, *pl;
2213 p1 = (unsigned short *) srcImage->data;
2214 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2215 while (p1 < pf)
2216 {
2217 p = p1;
2218 pl = p1 + srcImage->width;
2219 for (; p < pl; p++)
1742 } 2220 {
2221 *p = lookup_r[(*p & 0x7c00)>>10] |
2222 lookup_g[(*p & 0x03e0)>> 5] |
2223 lookup_b[(*p & 0x001f)];
2224 }
2225 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1743 } 2226 }
1744} 2227 break;
1745 2228 }
1746/* RGB 16 */ 2229 case 16:
1747static void 2230 {
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2231 unsigned short *p1, *pf, *p, *pl;
1749{ 2232 p1 = (unsigned short *) srcImage->data;
1750 unsigned char *ptr; 2233 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 int x, y; 2234 while (p1 < pf)
1752 2235 {
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2236 p = p1;
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2237 pl = p1 + srcImage->width;
1755 /* No saturation */ 2238 for (; p < pl; p++)
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 } 2239 {
1770 } else { 2240 *p = lookup_r[(*p & 0xf800)>>11] |
1771 for (y = h; --y >= 0;) { 2241 lookup_g[(*p & 0x07e0)>> 5] |
1772 for (x = -w; x < 0; x++) { 2242 lookup_b[(*p & 0x001f)];
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 } 2243 }
1786 ptr += bpl; 2244 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2245 }
2246 break;
2247 }
2248 case 24:
2249 {
2250 unsigned char *p1, *pf, *p, *pl;
2251 p1 = (unsigned char *) srcImage->data;
2252 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2253 while (p1 < pf)
2254 {
2255 p = p1;
2256 pl = p1 + srcImage->width * 3;
2257 for (; p < pl; p += 3)
1787 } 2258 {
2259 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2260 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2261 p[2] = lookup_r[(p[2] & 0x0000ff)];
2262 }
2263 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1788 } 2264 }
1789} 2265 break;
2266 }
2267 case 32:
2268 {
2269 RUINT32T *p1, *pf, *p, *pl;
2270 p1 = (RUINT32T *) srcImage->data;
2271 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1790 2272
1791/* RGB 24 */ 2273 while (p1 < pf)
1792static void 2274 {
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2275 p = p1;
1794{ 2276 pl = p1 + srcImage->width;
1795 unsigned char *ptr; 2277 for (; p < pl; p++)
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 } 2278 {
1823 } else { 2279 *p = lookup_r[(*p & 0xff0000)>>16] |
1824 for (y = h; --y >= 0;) { 2280 lookup_g[(*p & 0x00ff00)>> 8] |
1825 for (x = -(w * 3); x < 0; x += 3) { 2281 lookup_b[(*p & 0x0000ff)] |
1826 int r, g, b; 2282 (*p & ~0xffffff);
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 } 2283 }
1854 ptr += bpl; 2284 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1855 } 2285 }
2286 break;
2287 }
1856 } 2288 }
1857}
1858 2289
1859/* RGB 32 */ 2290 free (lookup);
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929} 2291}
1930
1931#endif 2292#endif
1932 2293
1933/* 2294/*
1934 * Check our parents are still who we think they are. 2295 * Check our parents are still who we think they are.
1935 * Do transparency updates if required 2296 * Do transparency updates if required
… …
1945 Pixmap rootpixmap = None; 2306 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr; 2307 XWindowAttributes wattr, wrootattr;
1947 2308
1948 pchanged = 0; 2309 pchanged = 0;
1949 2310
1950 if (!(Options & Opt_transparent)) 2311 if (!(options & Opt_transparent))
1951 return pchanged; /* Don't try any more */ 2312 return pchanged; /* Don't try any more */
1952 2313
1953 XGetWindowAttributes (display->display, display->root, &wrootattr); 2314 XGetWindowAttributes (display->display, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth; 2315 rootdepth = wrootattr.depth;
1955 2316
… …
1958 if (rootdepth != wattr.depth) 2319 if (rootdepth != wattr.depth)
1959 { 2320 {
1960 if (am_transparent) 2321 if (am_transparent)
1961 { 2322 {
1962 pchanged = 1; 2323 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0; 2325 am_transparent = am_pixmap_trans = 0;
1965 } 2326 }
1966 2327
1967 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
1968 } 2329 }
… …
1984 i = (xa[XA_XSETROOTID] 2345 i = (xa[XA_XSETROOTID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success); 2348 &nitems, &bytes_after, &prop) == Success);
1988 2349
1989 if (!i || prop == NULL) 2350 if (!i || prop == NULL
2351#if TINTING
2352 || !rs[Rs_color + Color_tint]
2353#endif
2354 )
1990 have_pixmap = 0; 2355 have_pixmap = 0;
1991 else 2356 else
1992 { 2357 {
1993 have_pixmap = 1; 2358 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop; 2359 rootpixmap = *(Pixmap *)prop;
… …
2056 XFreePixmap (display->display, TermWin.pixmap); 2421 XFreePixmap (display->display, TermWin.pixmap);
2057 2422
2058#if TINTING 2423#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint)) 2424 if (ISSET_PIXCOLOR (Color_tint))
2060 { 2425 {
2061 unsigned short shade, rm, gm, bm; 2426 unsigned short rm, gm, bm;
2427 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2062 2428
2063 PixColors[Color_tint].get (display, rm, gm, bm); 2429 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2064 2430
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2431 ShadeXImage (display, image, shade, rm, gm, bm);
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 } 2432 }
2076#endif 2433#endif
2077 2434
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2079 szHint.width, szHint.height, image->depth); 2436 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height); 2439 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc); 2440 XFreeGC (display->display, gc);
2084 XDestroyImage (image); 2441 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2086 TermWin.pixmap); 2443 XClearWindow (display->display, TermWin.parent[0]);
2087 2444
2088 if (!am_transparent || !am_pixmap_trans) 2445 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1; 2446 pchanged = 1;
2090 2447
2091 am_transparent = am_pixmap_trans = 1; 2448 am_transparent = am_pixmap_trans = 1;
… …
2096 { 2453 {
2097 unsigned int n; 2454 unsigned int n;
2098 /* 2455 /*
2099 * InheritPixmap transparency 2456 * InheritPixmap transparency
2100 */ 2457 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2103 { 2459 {
2104 oldp = TermWin.parent[i]; 2460 oldp = TermWin.parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2461 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2106 &TermWin.parent[i], &list, &n); 2462 &TermWin.parent[i], &list, &n);
2107 XFree (list); 2463 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109 2464
2110 if (TermWin.parent[i] == display->root) 2465 if (TermWin.parent[i] == display->root)
2111 { 2466 {
2112 if (oldp != None) 2467 if (oldp != None)
2113 pchanged = 1; 2468 pchanged = 1;
… …
2124 if (pchanged) 2479 if (pchanged)
2125 { 2480 {
2126 for (; n < (unsigned int)i; n++) 2481 for (; n < (unsigned int)i; n++)
2127 { 2482 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2129 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2130 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 { 2485 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2133 break; 2487 break;
2134 } 2488 }
2135 } 2489 }
2136 } 2490 }
2137 2491
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2139 { 2493 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2143 am_transparent = 0; 2496 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */ 2497 /* XXX: also turn off Opt_transparent? */
2145 } 2498 }
2146 else 2499 else
2147 { 2500 {
2148#if WAIT_FOR_WM 2501#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing 2502 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */ 2503 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1); 2504 sleep (1);
2152#endif 2505#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++) 2506 for (n = 0; n < (unsigned int)i; n++)
2507 {
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]);
2510 }
2156 2511
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2158 am_transparent = 1; 2513 am_transparent = 1;
2159 } 2514 }
2160 2515
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2162 TermWin.parent[i] = None; 2517 TermWin.parent[i] = None;
2518 }
2519
2520 // this is experimental
2521 if (scrollBar.win)
2522 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle ();
2526 scrollbar_show (0);
2163 } 2527 }
2164 2528
2165 return pchanged; 2529 return pchanged;
2166} 2530}
2167#endif 2531#endif
… …
2186 if (ch == NOCHAR) // TODO: improve 2550 if (ch == NOCHAR) // TODO: improve
2187 break; 2551 break;
2188 2552
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2553 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2190 { 2554 {
2555 if (!seen_input)
2556 {
2557 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong.
2562 kill (-cmd_pid, SIGWINCH);
2563 }
2564
2191 /* Read a text string from the input buffer */ 2565 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2566 unicode_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2567 bool refreshnow = false;
2194 int nlines = 0; 2568 int nlines = 0;
2195 unicode_t *str = buf; 2569 unicode_t *str = buf;
2196 2570
2197 *str++ = ch;
2198
2199 for (;;) 2571 for (;;)
2200 { 2572 {
2201 seq_begin = cmdbuf_ptr;
2202 ch = next_char ();
2203
2204 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break; 2574 break;
2206 2575
2207 *str++ = ch; 2576 *str++ = ch;
2208 2577
2209 if (ch == C0_LF) 2578 if (ch == C0_LF)
2210 { 2579 {
2211 nlines++; 2580 nlines++;
2212 refresh_count++; 2581 refresh_count++;
2213 2582
2214 if (! (Options & Opt_jumpScroll) 2583 if (!(options & Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2216 { 2585 {
2217 refreshnow = true; 2586 refreshnow = true;
2218 flag = true;
2219 ch = NOCHAR; 2587 ch = NOCHAR;
2220 break; 2588 break;
2221 } 2589 }
2222 2590
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2224 if (nlines >= TermWin.nrow - 1) 2592 if (nlines >= TermWin.nrow - 1)
2225 { 2593 {
2226 scr_add_lines (buf, nlines, str - buf); 2594 scr_add_lines (buf, nlines, str - buf);
2227 nlines = 0; 2595 nlines = 0;
2228 str = buf; 2596 str = buf;
… …
2232 if (str >= buf + UBUFSIZ) 2600 if (str >= buf + UBUFSIZ)
2233 { 2601 {
2234 ch = NOCHAR; 2602 ch = NOCHAR;
2235 break; 2603 break;
2236 } 2604 }
2605
2606 seq_begin = cmdbuf_ptr;
2607 ch = next_char ();
2237 } 2608 }
2238 2609
2239 scr_add_lines (buf, nlines, str - buf); 2610 scr_add_lines (buf, nlines, str - buf);
2240 2611
2241 /* 2612 /*
2242 * If there have been a lot of new lines, then update the screen 2613 * If there have been a lot of new lines, then update the screen
2243 * What the heck I'll cheat and only refresh less than every page-full. 2614 * What the heck I'll cheat and only refresh less than every page-full.
2244 * the number of pages between refreshes is refresh_limit, which 2615 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling. 2616 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */ 2617 */
2250 if (refreshnow) 2618 if (refreshnow)
2251 { 2619 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++; 2621 refresh_limit++;
2254 else 2622 else
2623 {
2624 flag = true;
2255 scr_refresh (refresh_type); 2625 scr_refresh (refresh_type);
2626 }
2256 } 2627 }
2257 2628
2258 } 2629 }
2259 else 2630 else
2260 { 2631 {
… …
2274 } 2645 }
2275 2646
2276 return flag; 2647 return flag;
2277} 2648}
2278 2649
2650// read the next octet
2651unicode_t
2652rxvt_term::next_octet ()
2653{
2654 return cmdbuf_ptr < cmdbuf_endp
2655 ? *cmdbuf_ptr++
2656 : NOCHAR;
2657}
2658
2279// read the next character 2659// read the next character
2280unicode_t 2660unicode_t
2281rxvt_term::next_char () 2661rxvt_term::next_char ()
2282{ 2662{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2663 while (cmdbuf_ptr < cmdbuf_endp)
… …
2314 */ 2694 */
2315unicode_t 2695unicode_t
2316rxvt_term::cmd_getc () 2696rxvt_term::cmd_getc ()
2317{ 2697{
2318 unicode_t c = next_char (); 2698 unicode_t c = next_char ();
2699
2700 if (c == NOCHAR)
2701 throw out_of_input;
2702
2703 return c;
2704}
2705
2706unicode_t
2707rxvt_term::cmd_get8 ()
2708{
2709 unicode_t c = next_octet ();
2319 2710
2320 if (c == NOCHAR) 2711 if (c == NOCHAR)
2321 throw out_of_input; 2712 throw out_of_input;
2322 2713
2323 return c; 2714 return c;
… …
2424 process_escape_seq (); 2815 process_escape_seq ();
2425 break; 2816 break;
2426 case C0_ENQ: /* terminal Status */ 2817 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 2818 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2819 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2820 (unsigned int)strlen (rs[Rs_answerbackstring]));
2430 else 2821 else
2431 tt_write ((unsigned char *)VT100_ANS, 2822 tt_write ((unsigned char *)VT100_ANS,
2432 (unsigned int)STRLEN (VT100_ANS)); 2823 (unsigned int)strlen (VT100_ANS));
2433 break; 2824 break;
2434 case C0_BEL: /* bell */ 2825 case C0_BEL: /* bell */
2435 scr_bell (); 2826 scr_bell ();
2436 break; 2827 break;
2437 case C0_BS: /* backspace */ 2828 case C0_BS: /* backspace */
… …
2453 break; 2844 break;
2454 case C0_SI: /* shift in - acs */ 2845 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 2846 scr_charset_choose (0);
2456 break; 2847 break;
2457 2848
2849#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 2850 // 8-bit controls
2459 case 0x90: /* DCS */ 2851 case 0x90: /* DCS */
2460 process_dcs_seq (); 2852 process_dcs_seq ();
2461 break; 2853 break;
2462 case 0x9b: /* CSI */ 2854 case 0x9b: /* CSI */
2463 process_csi_seq (); 2855 process_csi_seq ();
2464 break; 2856 break;
2465 case 0x9d: /* CSI */ 2857 case 0x9d: /* CSI */
2466 process_osc_seq (); 2858 process_osc_seq ();
2467 break; 2859 break;
2860#endif
2468 } 2861 }
2469} 2862}
2470/*}}} */ 2863/*}}} */
2471 2864
2472 2865
… …
2534void 2927void
2535rxvt_term::process_escape_seq () 2928rxvt_term::process_escape_seq ()
2536{ 2929{
2537 unicode_t ch = cmd_getc (); 2930 unicode_t ch = cmd_getc ();
2538 2931
2539 if (PrivateModes & PrivMode_vt52) 2932 if (priv_modes & PrivMode_vt52)
2540 { 2933 {
2541 process_escape_vt52 (ch); 2934 process_escape_vt52 (ch);
2542 return; 2935 return;
2543 } 2936 }
2544 2937
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 2952 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 2953 break;
2561 case '+': 2954 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 2955 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 2956 break;
2564#ifndef NO_FRILLS 2957#if ENABLE_FRILLS
2565 case '6': 2958 case '6':
2566 scr_backindex (); 2959 scr_backindex ();
2567 break; 2960 break;
2568#endif 2961#endif
2569 case '7': 2962 case '7':
2570 scr_cursor (SAVE); 2963 scr_cursor (SAVE);
2571 break; 2964 break;
2572 case '8': 2965 case '8':
2573 scr_cursor (RESTORE); 2966 scr_cursor (RESTORE);
2574 break; 2967 break;
2575#ifndef NO_FRILLS 2968#if ENABLE_FRILLS
2576 case '9': 2969 case '9':
2577 scr_forwardindex (); 2970 scr_forwardindex ();
2578 break; 2971 break;
2579#endif 2972#endif
2580 case '=': 2973 case '=':
… …
2661 3054
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3055/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */ 3056/* *INDENT-OFF* */
2664enum { 3057enum {
2665 CSI_ICH = 0x40, 3058 CSI_ICH = 0x40,
2666 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3059 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2667 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3060 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2668 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3061 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2669 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3062 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2670 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3063 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2671 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3064 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2880 break; 3273 break;
2881 3274
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 3276 tt_write ((const unsigned char *)VT100_ANS,
2884 (unsigned int) (sizeof (VT100_ANS) - 1)); 3277 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 3278 break;
2886 3279
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3280 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 3281 process_sgr_mode (nargs, arg);
2889 break; 3282 break;
… …
2896 break; 3289 break;
2897 case 6: /* CPR requested */ 3290 case 6: /* CPR requested */
2898 scr_report_position (); 3291 scr_report_position ();
2899 break; 3292 break;
2900 case 7: /* unofficial extension */ 3293 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3294 if (options & Opt_insecure)
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3295 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3296 break;
2904 case 8: /* unofficial extension */ 3297 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3299 break;
2907 } 3300 }
… …
2943 break; 3336 break;
2944 3337
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3338 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3339 if (arg[0] == 4)
2947 scr_insert_mode (0); 3340 scr_insert_mode (0);
3341 else if (arg[0] == 20)
3342 priv_modes &= ~PrivMode_LFNL;
2948 break; 3343 break;
2949 3344
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3345 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3346 if (arg[0] == 4)
2952 scr_insert_mode (1); 3347 scr_insert_mode (1);
3348 else if (arg[0] == 20)
3349 priv_modes |= PrivMode_LFNL;
2953 break; 3350 break;
2954 3351
2955 /* 3352 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3353 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3354 */
… …
2969 break; 3366 break;
2970 case CSI_75: 3367 case CSI_75:
2971 scr_cursor (RESTORE); 3368 scr_cursor (RESTORE);
2972 break; 3369 break;
2973 3370
2974#ifndef NO_FRILLS 3371#if ENABLE_FRILLS
2975 case CSI_74: 3372 case CSI_74:
2976 process_window_ops (arg, nargs); 3373 process_window_ops (arg, nargs);
2977 break; 3374 break;
2978#endif 3375#endif
2979 3376
… …
2986 break; 3383 break;
2987 } 3384 }
2988} 3385}
2989/*}}} */ 3386/*}}} */
2990 3387
2991#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
2992/* ARGSUSED */ 3389/* ARGSUSED */
2993void 3390void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3391rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3392{
2996 int x, y; 3393 int x, y;
… …
3063 break; 3460 break;
3064 case 19: /* report window size (chars) */ 3461 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3066 break; 3463 break;
3067 case 20: /* report icon label */ 3464 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3465 {
3070 char *s; 3466 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3467 XGetIconName (display->display, TermWin.parent[0], &s);
3072 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s);
3073 } 3470 }
3074 break; 3471 break;
3075 case 21: /* report window title */ 3472 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3473 {
3078 char *s; 3474 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3475 XFetchName (display->display, TermWin.parent[0], &s);
3080 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s);
3081 } 3478 }
3082 break; 3479 break;
3083 } 3480 }
3084} 3481}
3085#endif 3482#endif
3086 3483
… …
3090 * ends_how is terminator used. returned input must be free()'d 3487 * ends_how is terminator used. returned input must be free()'d
3091 */ 3488 */
3092unsigned char * 3489unsigned char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3490rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3491{
3095 int seen_esc = 0; /* seen escape? */ 3492 unicode_t prev = 0, ch;
3096 unsigned int n = 0; 3493 unsigned int n = 0;
3097 unsigned char *s; 3494 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3495 unsigned char string[STRING_MAX];
3100 3496
3101 while ((ch = cmd_getc ())) 3497 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3498 {
3103 if (ch == C0_BEL || ch == CHAR_ST) 3499 if (prev == C0_ESC)
3104 break; 3500 {
3105
3106 if (seen_esc)
3107 if (ch == 0x5c) /* 7bit ST */ 3501 if (ch == 0x5c) /* 7bit ST */
3108 break; 3502 break;
3109 else 3503 else
3110 return NULL; 3504 return NULL;
3111
3112 if (ch == C0_ESC)
3113 { 3505 }
3114 seen_esc = 1; 3506 else if (ch == C0_BEL || ch == CHAR_ST)
3115 continue; 3507 break;
3116 }
3117 else if (ch == C0_HT) 3508 else if (ch < 0x20)
3118 ch = ' '; /* translate '\t' to space */
3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3120 return NULL; /* other control character - exit */ 3509 return NULL; /* other control character - exit */
3121 3510
3122 if (n >= sizeof (string) - 1) 3511 if (n >= sizeof (string) - 1)
3123 // stop at some sane length 3512 // stop at some sane length
3124 return NULL; 3513 return NULL;
3125 3514
3515 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else
3126 string[n++] = ch; 3521 string[n++] = prev = ch;
3127 seen_esc = 0;
3128 } 3522 }
3129 3523
3130 string[n++] = '\0'; 3524 string[n++] = '\0';
3131 3525
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL; 3527 return NULL;
3134 3528
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3529 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3530 strncpy (s, string, n);
3137 return s; 3531 return s;
3138} 3532}
3139 3533
3140/*----------------------------------------------------------------------*/ 3534/*----------------------------------------------------------------------*/
3141/* 3535/*
… …
3186void 3580void
3187rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3581rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3188{ 3582{
3189 if (str[0] == '?' && !str[1]) 3583 if (str[0] == '?' && !str[1])
3190 { 3584 {
3191 if (Options & Opt_insecure)
3192 {
3193 unsigned short r, g, b; 3585 unsigned short r, g, b;
3194 PixColors[color].get (display, r, g, b); 3586 pix_colors_focused[color].get (display, r, g, b);
3195 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3587 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3196 }
3197 } 3588 }
3198 else 3589 else
3199 set_window_color (color, str); 3590 set_window_color (color, str);
3200} 3591}
3201 3592
… …
3287 break; 3678 break;
3288 3679
3289 case XTerm_Color: 3680 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3681 for (buf = (char *)str; buf && *buf;)
3291 { 3682 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3683 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3684 break;
3294 3685
3295 *name++ = '\0'; 3686 *name++ = '\0';
3296 color = atoi (buf); 3687 color = atoi (buf);
3297 3688
3298 if (color < 0 || color >= TOTAL_COLORS) 3689 if (color < 0 || color >= TOTAL_COLORS)
3299 break; 3690 break;
3300 3691
3301 if ((buf = STRCHR (name, ';')) != NULL) 3692 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3693 *buf++ = '\0';
3303 3694
3304 if (name[0] == '?' && !name[1]) 3695 if (name[0] == '?' && !name[1])
3305 { 3696 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b; 3697 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b); 3698 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3310 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3699 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3311 }
3312 } 3700 }
3313 else 3701 else
3314 set_window_color (color + minCOLOR, name); 3702 set_window_color (color + minCOLOR, name);
3315 } 3703 }
3316 break; 3704 break;
… …
3350 scale_pixmap (""); /* reset to default scaling */ 3738 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */ 3739 set_bgPixmap (str); /* change pixmap */
3352#endif 3740#endif
3353 scr_touch (true); 3741 scr_touch (true);
3354 } 3742 }
3355 while ((str = STRCHR (str, ';')) != NULL) 3743 while ((str = strchr (str, ';')) != NULL)
3356 { 3744 {
3357 str++; 3745 str++;
3358#if XPM_BACKGROUND 3746#if XPM_BACKGROUND
3359 changed += scale_pixmap (str); 3747 changed += scale_pixmap (str);
3360#endif 3748#endif
… …
3380 // TODO, when secure mode? 3768 // TODO, when secure mode?
3381 break; 3769 break;
3382 3770
3383 case XTerm_font: 3771 case XTerm_font:
3384 if (query) 3772 if (query)
3385 {
3386 if (Options & Opt_insecure)
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3388 TermWin.fontset->fontdesc 3775 ? TermWin.fontset->fontdesc : "",
3389 ? TermWin.fontset->fontdesc
3390 : "",
3391 resp); 3776 resp);
3392 }
3393 else 3777 else
3394 change_font (str); 3778 change_font (str);
3395 break; 3779 break;
3396 3780
3397#ifndef NO_FRILLS 3781#if ENABLE_FRILLS
3398 case XTerm_locale: 3782 case XTerm_locale:
3399 if (query) 3783 if (query)
3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3403 }
3404 else 3785 else
3405 { 3786 {
3406 set_locale (str); 3787 set_locale (str);
3407# ifdef USE_XIM 3788# ifdef USE_XIM
3408 im_cb (); 3789 im_cb ();
3409# endif 3790# endif
3410 } 3791 }
3411 break; 3792 break;
3412 3793
3413 case XTerm_findfont: 3794 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 { 3795 {
3416 int fid = TermWin.fontset->find_font (atoi (str)); 3796 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont, 3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp); 3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3419 } 3801 }
3420 break; 3802 break;
3421#endif 3803#endif
3422 3804
3423#ifdef MENUBAR 3805#ifdef MENUBAR
3424 case XTerm_Menu: 3806 case XTerm_Menu:
3425 if (Options & Opt_insecure) 3807 if (options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break; 3809 break;
3428#endif 3810#endif
3429#if 0 3811#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3812 case XTerm_dumpscreen: /* no error notices */
… …
3457{ 3839{
3458 int state; 3840 int state;
3459 3841
3460 if (mode == 's') 3842 if (mode == 's')
3461 { 3843 {
3462 SavedModes |= (PrivateModes & bit); 3844 SavedModes |= (priv_modes & bit);
3463 return -1; 3845 return -1;
3464 } 3846 }
3465 else 3847 else
3466 { 3848 {
3467 if (mode == 'r') 3849 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3850 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 3851 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3852 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 3853 PrivMode (state, bit);
3472 } 3854 }
3473 3855
3474 return state; 3856 return state;
3475} 3857}
… …
3493 { 3, PrivMode_132 }, 3875 { 3, PrivMode_132 },
3494 { 4, PrivMode_smoothScroll }, 3876 { 4, PrivMode_smoothScroll },
3495 { 5, PrivMode_rVideo }, 3877 { 5, PrivMode_rVideo },
3496 { 6, PrivMode_relOrigin }, 3878 { 6, PrivMode_relOrigin },
3497 { 7, PrivMode_Autowrap }, 3879 { 7, PrivMode_Autowrap },
3880 // 8, bi-directional support mode
3498 { 9, PrivMode_MouseX10 }, 3881 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 3882#ifdef menuBar_esc
3500 { menuBar_esc, PrivMode_menuBar }, 3883 { menuBar_esc, PrivMode_menuBar },
3501#endif 3884#endif
3885 // 18, 19 printing-related
3886 { 25, PrivMode_VisibleCursor },
3502#ifdef scrollBar_esc 3887#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 3888 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 3889#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 3890 { 35, PrivMode_ShiftKeys }, // rxvt extension
3509 { 40, PrivMode_132OK }, 3891 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 3892 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 3893 // 45 margin bell NYI
3512 // 46 start logging 3894 // 46 start logging
… …
3553 3935
3554 /* extra handling for values with state unkept */ 3936 /* extra handling for values with state unkept */
3555 switch (arg[i]) 3937 switch (arg[i])
3556 { 3938 {
3557 case 1048: /* alternative cursor save */ 3939 case 1048: /* alternative cursor save */
3558 if (Options & Opt_secondaryScreen) 3940 if (options & Opt_secondaryScreen)
3559 if (mode == 0) 3941 if (mode == 0)
3560 scr_cursor (RESTORE); 3942 scr_cursor (RESTORE);
3561 else if (mode == 1) 3943 else if (mode == 1)
3562 scr_cursor (SAVE); 3944 scr_cursor (SAVE);
3563 break; 3945 break;
… …
3574 * within VT52 mode 3956 * within VT52 mode
3575 */ 3957 */
3576 PrivMode (1, PrivMode_vt52); 3958 PrivMode (1, PrivMode_vt52);
3577 break; 3959 break;
3578 case 3: /* 80/132 */ 3960 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 3961 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3581 break; 3963 break;
3582 case 4: /* smooth scrolling */ 3964 case 4: /* smooth scrolling */
3583 if (state) 3965 if (state)
3584 Options &= ~Opt_jumpScroll; 3966 options &= ~Opt_jumpScroll;
3585 else 3967 else
3586 Options |= Opt_jumpScroll; 3968 options |= Opt_jumpScroll;
3587 break; 3969 break;
3588 case 5: /* reverse video */ 3970 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 3971 scr_rvideo_mode (state);
3590 break; 3972 break;
3591 case 6: /* relative/absolute origins */ 3973 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 3977 scr_autowrap (state);
3596 break; 3978 break;
3597 /* case 8: - auto repeat, can't do on a per window basis */ 3979 /* case 8: - auto repeat, can't do on a per window basis */
3598 case 9: /* X10 mouse reporting */ 3980 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 3981 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 3982 priv_modes &= ~PrivMode_MouseX11;
3601 break; 3983 break;
3602#ifdef menuBar_esc 3984#ifdef menuBar_esc
3603 case menuBar_esc: 3985 case menuBar_esc:
3604#ifdef MENUBAR 3986#ifdef MENUBAR
3605 map_menuBar (state); 3987 map_menuBar (state);
… …
3625 break; 4007 break;
3626 /* case 66: - application key pad */ 4008 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 4009 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 4010 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 4011 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 4012 priv_modes &= ~PrivMode_MouseX10;
3631 break; 4013 break;
3632#if 0 4014#if 0
3633 case 1001: 4015 case 1001:
3634 break; /* X11 mouse highlighting */ 4016 break; /* X11 mouse highlighting */
3635#endif 4017#endif
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 4018 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state) 4019 if (state)
3638 Options &= ~Opt_scrollTtyOutput; 4020 options &= ~Opt_scrollTtyOutput;
3639 else 4021 else
3640 Options |= Opt_scrollTtyOutput; 4022 options |= Opt_scrollTtyOutput;
3641 break; 4023 break;
3642 case 1011: /* scroll to bottom on key press */ 4024 case 1011: /* scroll to bottom on key press */
3643 if (state) 4025 if (state)
3644 Options |= Opt_scrollTtyKeypress; 4026 options |= Opt_scrollTtyKeypress;
3645 else 4027 else
3646 Options &= ~Opt_scrollTtyKeypress; 4028 options &= ~Opt_scrollTtyKeypress;
3647 break; 4029 break;
3648 case 1047: /* secondary screen w/ clearing last */ 4030 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 4031 if (options & Opt_secondaryScreen)
3650 if (current_screen != PRIMARY) 4032 if (current_screen != PRIMARY)
3651 scr_erase_screen (2); 4033 scr_erase_screen (2);
3652 scr_change_screen (state); 4034 scr_change_screen (state);
3653 break; 4035 break;
3654 case 1049: /* secondary screen w/ clearing first */ 4036 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state); 4037 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen) 4038 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4039 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4040 scr_erase_screen (2);
3659 break; 4041 break;
3660 default: 4042 default:
3661 break; 4043 break;
… …
3687 rendset = 0, rendstyle = ~RS_None; 4069 rendset = 0, rendstyle = ~RS_None;
3688 break; 4070 break;
3689 case 1: 4071 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 4072 rendset = 1, rendstyle = RS_Bold;
3691 break; 4073 break;
4074 //case 2: // faint or second colour
4075 //case 3: // italic
3692 case 4: 4076 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 4077 rendset = 1, rendstyle = RS_Uline;
3694 break; 4078 break;
3695 case 5: 4079 case 5: // slowly blinking
4080 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 4081 rendset = 1, rendstyle = RS_Blink;
3697 break; 4082 break;
3698 //case 6: // scoansi light background 4083 //case 6: // scoansi light background
3699 case 7: 4084 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 4085 rendset = 1, rendstyle = RS_RVid;
3701 break; 4086 break;
3702 case 8: 4087 case 8:
3703 // invisible. NYI 4088 // invisible. NYI
3704 break; 4089 break;
4090 //case 9: // crossed out
3705 //case 10: // scoansi acs off 4091 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 4092 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 4093 //case 12: // scoansi acs on, |0x80, second alt font
3708 case 21: // disable bold, blink and invis (some terminals use this) 4094 //...
4095 //case 19: // ninth alt font
4096 //case 20: // gothic
4097 case 21: // disable bold, faint
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4098 rendset = 0, rendstyle = RS_Bold;
3710 break; 4099 break;
3711 case 22: 4100 case 22:
3712 rendset = 0, rendstyle = RS_Bold; 4101 rendset = 0, rendstyle = RS_Bold;
3713 break; 4102 break;
4103 //case 23: disable italic
3714 case 24: 4104 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4105 rendset = 0, rendstyle = RS_Uline;
3716 break; 4106 break;
3717 case 25: 4107 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4108 rendset = 0, rendstyle = RS_Blink;
3719 break; 4109 break;
4110 case 26:
4111 rendset = 0, rendstyle = RS_Blink;
4112 break;
3720 case 27: 4113 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4114 rendset = 0, rendstyle = RS_RVid;
3722 break; 4115 break;
3723 case 28:
3724 // visible. NYI 4116 //case 28: // visible. NYI
3725 break; 4117 //case 29: // not crossed-out
3726 } 4118 }
3727 4119
3728 if (rendset != -1) 4120 if (rendset != -1)
3729 { 4121 {
3730 scr_rendition (rendset, rendstyle); 4122 scr_rendition (rendset, rendstyle);
… …
3815{ 4207{
3816 unicode_t ch, cmd = cmd_getc (); 4208 unicode_t ch, cmd = cmd_getc ();
3817 4209
3818 if (cmd == 'Q') 4210 if (cmd == 'Q')
3819 { /* query graphics */ 4211 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4212 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4213 return;
3822 } 4214 }
3823 /* swallow other graphics sequences until terminating ':' */ 4215 /* swallow other graphics sequences until terminating ':' */
3824 do 4216 do
3825 ch = cmd_getc (); 4217 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4232 unsigned char buf[256];
3841 4233
3842 va_start (arg_ptr, fmt); 4234 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4235 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4236 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4237 tt_write (buf, strlen (buf));
3846} 4238}
3847 4239
3848/* ---------------------------------------------------------------------- */ 4240/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4241/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4242 * or generated by us in response to a query ESC sequence.
… …
3856 4248
3857 if (len) 4249 if (len)
3858 { 4250 {
3859 if (v_buflen == 0) 4251 if (v_buflen == 0)
3860 { 4252 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3862 4254
3863 if ((unsigned int)written == len) 4255 if ((unsigned int)written == len)
3864 return; 4256 return;
3865 4257
3866 data += written; 4258 data += written;
… …
3874 v_buflen += len; 4266 v_buflen += len;
3875 } 4267 }
3876 4268
3877 for (;;) 4269 for (;;)
3878 { 4270 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880 4272
3881 if (written > 0) 4273 if (written > 0)
3882 { 4274 {
3883 v_buflen -= written; 4275 v_buflen -= written;
3884 4276

Diff Legend

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