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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.145 by root, Mon Aug 16 12:04:57 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
52 52
53#include <wchar.h> 53#include <wchar.h>
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 56
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
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
57/*{{{ Convert the keypress event into a string */ 247/*{{{ Convert the keypress event into a string */
58void 248void
59rxvt_term::lookup_key (XKeyEvent &ev) 249rxvt_term::lookup_key (XKeyEvent &ev)
60{ 250{
61 int ctrl, meta, shft, len; 251 int ctrl, meta, shft, len;
… …
88#ifdef USE_XIM 278#ifdef USE_XIM
89 if (Input_Context) 279 if (Input_Context)
90 { 280 {
91 Status status_return; 281 Status status_return;
92 282
283#if 0
93#ifdef X_HAVE_UTF8_STRING 284#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 285 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 286 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 287 KBUFSZ, &keysym, &status_return);
97 else 288 else
289#endif
98#endif 290#endif
99 { 291 {
100 wchar_t wkbuf[KBUFSZ + 1]; 292 wchar_t wkbuf[KBUFSZ + 1];
101 293
102 // the XOpenIM manpage lies about hardcoding the locale 294 // the XOpenIM manpage lies about hardcoding the locale
… …
110 SET_LOCALE (locale); 302 SET_LOCALE (locale);
111 303
112 if (status_return == XLookupChars 304 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 305 || status_return == XLookupBoth)
114 { 306 {
307 /* make sure the user can type ctrl-@, i.e. NUL */
308 if (len == 1 && *wkbuf == 0)
309 {
310 kbuf[0] = 0;
311 len = 1;
312 }
313 else
314 {
115 wkbuf[len] = 0; 315 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 316 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 317 if (len < 0)
118 len = 0; 318 len = 0;
319 }
119 } 320 }
120 else 321 else
121 len = 0; 322 len = 0;
122 } 323 }
123 324
… …
131 valid_keysym = keysym != NoSymbol; 332 valid_keysym = keysym != NoSymbol;
132 } 333 }
133 334
134 if (valid_keysym) 335 if (valid_keysym)
135 { 336 {
136 /* for some backwards compatibility */
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
138# ifdef HOTKEY_CTRL
139 if (ctrl)
140# else
141 if (meta)
142# endif
143 {
144 if (keysym == ks_bigfont)
145 {
146 change_font (0, FONT_UP);
147 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (0, FONT_DN);
152 return;
153 }
154 }
155#endif
156
157 if (TermWin.saveLines) 337 if (TermWin.saveLines)
158 { 338 {
159#ifdef UNSHIFTED_SCROLLKEYS 339#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) 340 if (!ctrl && !meta)
161 {
162#else 341#else
163 if (IS_SCROLL_MOD) 342 if (IS_SCROLL_MOD)
343#endif
164 { 344 {
165#endif
166 int lnsppg; 345 int lnsppg;
167 346
168#ifdef PAGING_CONTEXT_LINES 347#ifdef PAGING_CONTEXT_LINES
169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
170#else 349#else
… …
219 if (keysym >= XK_F1 && keysym <= XK_F10) 398 if (keysym >= XK_F1 && keysym <= XK_F10)
220 { 399 {
221 keysym += (XK_F11 - XK_F1); 400 keysym += (XK_F11 - XK_F1);
222 shft = 0; /* turn off Shift */ 401 shft = 0; /* turn off Shift */
223 } 402 }
224 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 403 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
225 { 404 {
226 switch (keysym) 405 switch (keysym)
227 { 406 {
228 /* normal XTerm key bindings */ 407 /* normal XTerm key bindings */
229 case XK_Insert: /* Shift+Insert = paste mouse selection */ 408 case XK_Insert: /* Shift+Insert = paste mouse selection */
230 selection_request (ev.time, 0, 0); 409 selection_request (ev.time, 0, 0);
231 return; 410 return;
411#if TODO // TODO
232 /* rxvt extras */ 412 /* rxvt extras */
233 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 413 case XK_KP_Add: /* Shift+KP_Add = bigger font */
234 change_font (0, FONT_UP); 414 change_font (FONT_UP);
235 return; 415 return;
236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
237 change_font (0, FONT_DN); 417 change_font (FONT_DN);
238 return; 418 return;
419#endif
239 } 420 }
240 } 421 }
241 } 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
242#ifdef PRINTPIPE 470#ifdef PRINTPIPE
243 if (keysym == XK_Print) 471 if (keysym == XK_Print)
244 { 472 {
245 scr_printscreen (ctrl | shft); 473 scr_printscreen (ctrl | shft);
246 return;
247 }
248#endif
249#ifdef GREEK_SUPPORT
250 if (keysym == ks_greekmodeswith)
251 {
252 greek_mode = !greek_mode;
253 if (greek_mode)
254 {
255 xterm_seq (XTerm_title,
256 (greek_getmode () == GREEK_ELOT928
257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
258 greek_reset ();
259 }
260 else
261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
262 return; 474 return;
263 } 475 }
264#endif 476#endif
265 477
266 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 478 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
… …
268#ifdef KEYSYM_RESOURCE 480#ifdef KEYSYM_RESOURCE
269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 481 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
270 { 482 {
271 unsigned int l; 483 unsigned int l;
272 const unsigned char *kbuf0; 484 const unsigned char *kbuf0;
273 const unsigned char ch = C0_ESC;
274 485
275 kbuf0 = (Keysym_map[keysym & 0xFF]); 486 kbuf0 = (Keysym_map[keysym & 0xFF]);
276 l = (unsigned int)*kbuf0++; 487 l = (unsigned int)*kbuf0++;
277 488
278 /* escape prefix */ 489 /* escape prefix */
279 if (meta) 490 if (meta
280# ifdef META8_OPTION 491# ifdef META8_OPTION
281 if (meta_char == C0_ESC) 492 && meta_char == C0_ESC
282# endif 493# endif
494 )
495 {
496 const unsigned char ch = C0_ESC;
283 tt_write (&ch, 1); 497 tt_write (&ch, 1);
498 }
499
284 tt_write (kbuf0, l); 500 tt_write (kbuf0, l);
285 return; 501 return;
286 } 502 }
287 else 503 else
288#endif 504#endif
… …
290 newlen = 1; 506 newlen = 1;
291 switch (keysym) 507 switch (keysym)
292 { 508 {
293#ifndef NO_BACKSPACE_KEY 509#ifndef NO_BACKSPACE_KEY
294 case XK_BackSpace: 510 case XK_BackSpace:
295 if (PrivateModes & PrivMode_HaveBackSpace) 511 if (priv_modes & PrivMode_HaveBackSpace)
296 { 512 {
297 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 513 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
298 ^ !!ctrl) ? '\b' : '\177'; 514 ^ !!ctrl) ? '\b' : '\177';
299 kbuf[1] = '\0'; 515 kbuf[1] = '\0';
300 } 516 }
301 else 517 else
302 STRCPY (kbuf, key_backspace); 518 strcpy (kbuf, key_backspace);
303# ifdef MULTICHAR_SET
304 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
305 {
306 int col, row;
307
308 newlen = STRLEN (kbuf);
309 col = screen.cur.col - 1;
310 row = screen.cur.row + TermWin.saveLines;
311 if (IS_MULTI2 (screen.rend[row][col]))
312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
313 }
314# endif
315 break; 519 break;
316#endif 520#endif
317#ifndef NO_DELETE_KEY 521#ifndef NO_DELETE_KEY
318 case XK_Delete: 522 case XK_Delete:
319 STRCPY (kbuf, key_delete); 523 strcpy (kbuf, key_delete);
320# ifdef MULTICHAR_SET
321 if (Options & Opt_mc_hack)
322 {
323 int col, row;
324
325 newlen = STRLEN (kbuf);
326 col = screen.cur.col;
327 row = screen.cur.row + TermWin.saveLines;
328 if (IS_MULTI1 (screen.rend[row][col]))
329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
330 }
331# endif
332 break; 524 break;
333#endif 525#endif
334 case XK_Tab: 526 case XK_Tab:
335 if (shft) 527 if (shft)
336 STRCPY (kbuf, "\033[Z"); 528 strcpy (kbuf, "\033[Z");
337 else 529 else
338 { 530 {
339#ifdef CTRL_TAB_MAKES_META 531#ifdef CTRL_TAB_MAKES_META
340 if (ctrl) 532 if (ctrl)
341 meta = 1; 533 meta = 1;
… …
347 newlen = 0; 539 newlen = 0;
348 } 540 }
349 break; 541 break;
350 542
351#ifdef XK_KP_Left 543#ifdef XK_KP_Left
352 case XK_KP_Up: /* \033Ox or standard */ 544 case XK_KP_Up: /* \033Ox or standard */
353 case XK_KP_Down: /* \033Or or standard */ 545 case XK_KP_Down: /* \033Or or standard */
354 case XK_KP_Right: /* \033Ov or standard */ 546 case XK_KP_Right: /* \033Ov or standard */
355 case XK_KP_Left: /* \033Ot or standard */ 547 case XK_KP_Left: /* \033Ot or standard */
356 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 548 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
357 { 549 {
358 STRCPY (kbuf, "\033OZ"); 550 strcpy (kbuf, "\033OZ");
359 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 551 kbuf[2] = "txvr"[keysym - XK_KP_Left];
360 break; 552 break;
361 } 553 }
362 else 554 else
363 /* translate to std. cursor key */ 555 /* translate to std. cursor key */
… …
366#endif 558#endif
367 case XK_Up: /* "\033[A" */ 559 case XK_Up: /* "\033[A" */
368 case XK_Down: /* "\033[B" */ 560 case XK_Down: /* "\033[B" */
369 case XK_Right: /* "\033[C" */ 561 case XK_Right: /* "\033[C" */
370 case XK_Left: /* "\033[D" */ 562 case XK_Left: /* "\033[D" */
371 STRCPY (kbuf, "\033[Z"); 563 strcpy (kbuf, "\033[Z");
372 kbuf[2] = "DACB"[keysym - XK_Left]; 564 kbuf[2] = "DACB"[keysym - XK_Left];
373 /* do Shift first */ 565 /* do Shift first */
374 if (shft) 566 if (shft)
375 kbuf[2] = "dacb"[keysym - XK_Left]; 567 kbuf[2] = "dacb"[keysym - XK_Left];
376 else if (ctrl) 568 else if (ctrl)
377 { 569 {
378 kbuf[1] = 'O'; 570 kbuf[1] = 'O';
379 kbuf[2] = "dacb"[keysym - XK_Left]; 571 kbuf[2] = "dacb"[keysym - XK_Left];
380 } 572 }
381 else if (PrivateModes & PrivMode_aplCUR) 573 else if (priv_modes & PrivMode_aplCUR)
382 kbuf[1] = 'O'; 574 kbuf[1] = 'O';
383#ifdef MULTICHAR_SET
384 //TODO: ??
385 if (Options & Opt_mc_hack)
386 {
387 int col, row, m;
388
389 col = screen.cur.col;
390 row = screen.cur.row + TermWin.saveLines;
391 m = 0;
392 if (keysym == XK_Right
393 && IS_MULTI1 (screen.rend[row][col]))
394 m = 1;
395 else if (keysym == XK_Left)
396 {
397 if (col > 0)
398 {
399 if (IS_MULTI2 (screen.rend[row][col - 1]))
400 m = 1;
401 }
402 else if (screen.cur.row > 0)
403 {
404 col = screen.tlen[--row];
405 if (col == -1)
406 col = TermWin.ncol - 1;
407 else
408 col--;
409 if (col > 0
410 && IS_MULTI2 (screen.rend[row][col]))
411 m = 1;
412 }
413 }
414 if (m)
415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
416 }
417#endif
418 break; 575 break;
419 576
420#ifndef UNSHIFTED_SCROLLKEYS 577#ifndef UNSHIFTED_SCROLLKEYS
421# ifdef XK_KP_Prior 578# ifdef XK_KP_Prior
422 case XK_KP_Prior: 579 case XK_KP_Prior:
423 /* allow shift to override */ 580 /* allow shift to override */
424 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 581 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
425 { 582 {
426 STRCPY (kbuf, "\033Oy"); 583 strcpy (kbuf, "\033Oy");
427 break; 584 break;
428 } 585 }
429 /* FALLTHROUGH */ 586 /* FALLTHROUGH */
430# endif 587# endif
431 case XK_Prior: 588 case XK_Prior:
432 STRCPY (kbuf, "\033[5~"); 589 strcpy (kbuf, "\033[5~");
433 break; 590 break;
434# ifdef XK_KP_Next 591# ifdef XK_KP_Next
435 case XK_KP_Next: 592 case XK_KP_Next:
436 /* allow shift to override */ 593 /* allow shift to override */
437 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
438 { 595 {
439 STRCPY (kbuf, "\033Os"); 596 strcpy (kbuf, "\033Os");
440 break; 597 break;
441 } 598 }
442 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
443# endif 600# endif
444 case XK_Next: 601 case XK_Next:
445 STRCPY (kbuf, "\033[6~"); 602 strcpy (kbuf, "\033[6~");
446 break; 603 break;
447#endif 604#endif
448 case XK_KP_Enter: 605 case XK_KP_Enter:
449 /* allow shift to override */ 606 /* allow shift to override */
450 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
451 { 608 {
452 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';
453 } 621 }
454 else 622 else
455 { 623 {
456 kbuf[0] = '\r'; 624 kbuf[0] = '\015';
457 kbuf[1] = '\0'; 625 kbuf[1] = '\0';
458 } 626 }
459 break; 627 break;
460 628
461#ifdef XK_KP_Begin 629#ifdef XK_KP_Begin
462 case XK_KP_Begin: 630 case XK_KP_Begin:
463 STRCPY (kbuf, "\033Ou"); 631 strcpy (kbuf, "\033Ou");
464 break; 632 break;
465 633
466 case XK_KP_Insert: 634 case XK_KP_Insert:
467 STRCPY (kbuf, "\033Op"); 635 strcpy (kbuf, "\033Op");
468 break; 636 break;
469 637
470 case XK_KP_Delete: 638 case XK_KP_Delete:
471 STRCPY (kbuf, "\033On"); 639 strcpy (kbuf, "\033On");
472 break; 640 break;
473#endif 641#endif
474 case XK_KP_F1: /* "\033OP" */ 642 case XK_KP_F1: /* "\033OP" */
475 case XK_KP_F2: /* "\033OQ" */ 643 case XK_KP_F2: /* "\033OQ" */
476 case XK_KP_F3: /* "\033OR" */ 644 case XK_KP_F3: /* "\033OR" */
477 case XK_KP_F4: /* "\033OS" */ 645 case XK_KP_F4: /* "\033OS" */
478 STRCPY (kbuf, "\033OP"); 646 strcpy (kbuf, "\033OP");
479 kbuf[2] += (keysym - XK_KP_F1); 647 kbuf[2] += (keysym - XK_KP_F1);
480 break; 648 break;
481 649
482 case XK_KP_Multiply: /* "\033Oj" : "*" */ 650 case XK_KP_Multiply: /* "\033Oj" : "*" */
483 case XK_KP_Add: /* "\033Ok" : "+" */ 651 case XK_KP_Add: /* "\033Ok" : "+" */
… …
494 case XK_KP_6: /* "\033Ov" : "6" */ 662 case XK_KP_6: /* "\033Ov" : "6" */
495 case XK_KP_7: /* "\033Ow" : "7" */ 663 case XK_KP_7: /* "\033Ow" : "7" */
496 case XK_KP_8: /* "\033Ox" : "8" */ 664 case XK_KP_8: /* "\033Ox" : "8" */
497 case XK_KP_9: /* "\033Oy" : "9" */ 665 case XK_KP_9: /* "\033Oy" : "9" */
498 /* allow shift to override */ 666 /* allow shift to override */
499 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 667 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
500 { 668 {
501 STRCPY (kbuf, "\033Oj"); 669 strcpy (kbuf, "\033Oj");
502 kbuf[2] += (keysym - XK_KP_Multiply); 670 kbuf[2] += (keysym - XK_KP_Multiply);
503 } 671 }
504 else 672 else
505 { 673 {
506 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 674 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
507 kbuf[1] = '\0'; 675 kbuf[1] = '\0';
508 } 676 }
509 break; 677 break;
510 678
511 case XK_Find: 679 case XK_Find:
512 STRCPY (kbuf, "\033[1~"); 680 strcpy (kbuf, "\033[1~");
513 break; 681 break;
514 case XK_Insert: 682 case XK_Insert:
515 STRCPY (kbuf, "\033[2~"); 683 strcpy (kbuf, "\033[2~");
516 break; 684 break;
517#ifdef DXK_Remove /* support for DEC remove like key */ 685#ifdef DXK_Remove /* support for DEC remove like key */
518 case DXK_Remove: 686 case DXK_Remove:
519 /* FALLTHROUGH */ 687 /* FALLTHROUGH */
520#endif 688#endif
521 case XK_Execute: 689 case XK_Execute:
522 STRCPY (kbuf, "\033[3~"); 690 strcpy (kbuf, "\033[3~");
523 break; 691 break;
524 case XK_Select: 692 case XK_Select:
525 STRCPY (kbuf, "\033[4~"); 693 strcpy (kbuf, "\033[4~");
526 break; 694 break;
527#ifdef XK_KP_End 695#ifdef XK_KP_End
528 case XK_KP_End: 696 case XK_KP_End:
529 /* allow shift to override */ 697 /* allow shift to override */
530 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
531 { 699 {
532 STRCPY (kbuf, "\033Oq"); 700 strcpy (kbuf, "\033Oq");
533 break; 701 break;
534 } 702 }
535 /* FALLTHROUGH */ 703 /* FALLTHROUGH */
536#endif 704#endif
537 case XK_End: 705 case XK_End:
538 STRCPY (kbuf, KS_END); 706 strcpy (kbuf, KS_END);
539 break; 707 break;
540#ifdef XK_KP_Home 708#ifdef XK_KP_Home
541 case XK_KP_Home: 709 case XK_KP_Home:
542 /* allow shift to override */ 710 /* allow shift to override */
543 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 711 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
544 { 712 {
545 STRCPY (kbuf, "\033Ow"); 713 strcpy (kbuf, "\033Ow");
546 break; 714 break;
547 } 715 }
548 /* FALLTHROUGH */ 716 /* FALLTHROUGH */
549#endif 717#endif
550 case XK_Home: 718 case XK_Home:
551 STRCPY (kbuf, KS_HOME); 719 strcpy (kbuf, KS_HOME);
552 break; 720 break;
553 721
554#define FKEY(n, fkey) \ 722#define FKEY(n, fkey) \
555 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 723 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
556 724
… …
609 default: 777 default:
610 newlen = 0; 778 newlen = 0;
611 break; 779 break;
612 } 780 }
613 if (newlen) 781 if (newlen)
614 len = STRLEN (kbuf); 782 len = strlen (kbuf);
615 } 783 }
784
616 /* 785 /*
617 * Pass meta for all function keys, if 'meta' option set 786 * Pass meta for all function keys, if 'meta' option set
618 */ 787 */
619#ifdef META8_OPTION 788#ifdef META8_OPTION
620 if (meta && (meta_char == 0x80) && len > 0) 789 if (meta && (meta_char == 0x80) && len > 0)
… …
635 { 804 {
636 unsigned char *ch; 805 unsigned char *ch;
637 806
638 for (ch = kbuf; ch < kbuf + len; ch++) 807 for (ch = kbuf; ch < kbuf + len; ch++)
639 *ch |= 0x80; 808 *ch |= 0x80;
809
640 meta = 0; 810 meta = 0;
641 } 811 }
642#endif 812#endif
643#ifdef GREEK_SUPPORT
644 if (greek_mode)
645 len = greek_xlat (kbuf, len);
646#endif
647 /* nil */ ; 813 /* nil */ ;
648 } 814 }
649 } 815 }
650 816
651 if (len <= 0) 817 if (len <= 0)
652 return; /* not mapped */ 818 return; /* not mapped */
653 819
654 if (Options & Opt_scrollTtyKeypress) 820 if (options & Opt_scrollTtyKeypress)
655 if (TermWin.view_start) 821 if (TermWin.view_start)
656 { 822 {
657 TermWin.view_start = 0; 823 TermWin.view_start = 0;
658 want_refresh = 1; 824 want_refresh = 1;
659 } 825 }
… …
673 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 839 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
674 840
675 /* escape prefix */ 841 /* escape prefix */
676 if (meta 842 if (meta
677#ifdef META8_OPTION 843#ifdef META8_OPTION
678 && (meta_char == C0_ESC) 844 && meta_char == C0_ESC
679#endif 845#endif
680 ) 846 )
681 { 847 {
682 const unsigned char ch = C0_ESC; 848 const unsigned char ch = C0_ESC;
683
684 tt_write (&ch, 1); 849 tt_write (&ch, 1);
685 } 850 }
851
686#ifdef DEBUG_CMD 852#if defined(DEBUG_CMD)
687 if (debug_key)
688 { /* Display keyboard buffer contents */ 853 /* Display keyboard buffer contents */
689 char *p; 854 unsigned char *p;
690 int i; 855 int i;
691 856
692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 857 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
693 for (i = 0, p = kbuf; i < len; i++, p++) 858 for (i = 0, p = kbuf; i < len; i++, p++)
694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 859 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
695 fprintf (stderr, "'\n"); 860 fprintf (stderr, "'\n");
696 }
697#endif /* DEBUG_CMD */ 861#endif /* DEBUG_CMD */
698 tt_write (kbuf, (unsigned int)len); 862 tt_write (kbuf, (unsigned int)len);
699} 863}
700/*}}} */ 864/*}}} */
701 865
… …
703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 867/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
704/* attempt to `write' count to the input buffer */ 868/* attempt to `write' count to the input buffer */
705unsigned int 869unsigned int
706rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 870rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
707{ 871{
708 unsigned int n, s; 872 unsigned int n, s;
709 873
710 n = cmdbuf_ptr - cmdbuf_base; 874 n = cmdbuf_ptr - cmdbuf_base;
711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 875 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
876
712 if (n > 0 && s < count) 877 if (n > 0 && s < count)
713 { 878 {
714 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 879 memmove (cmdbuf_base, cmdbuf_ptr,
715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 880 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
716 cmdbuf_ptr = cmdbuf_base; 881 cmdbuf_ptr = cmdbuf_base;
717 cmdbuf_endp -= n; 882 cmdbuf_endp -= n;
718 s += n; 883 s += n;
719 } 884 }
885
720 if (count > s) 886 if (count > s)
721 { 887 {
722 rxvt_print_error ("data loss: cmd_write too large"); 888 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
723 count = s; 889 count = s;
724 } 890 }
891
725 for (; count--;) 892 for (; count--;)
726 *cmdbuf_endp++ = *str++; 893 *cmdbuf_endp++ = *str++;
894
895 cmd_parse ();
896
727 return 0; 897 return 0;
728} 898}
729#endif /* MENUBAR_MAX */ 899#endif /* MENUBAR_MAX */
730 900
731void 901void
… …
735 if (want_full_refresh) 905 if (want_full_refresh)
736 { 906 {
737 want_full_refresh = 0; 907 want_full_refresh = 0;
738 scr_clear (); 908 scr_clear ();
739 scr_touch (false); 909 scr_touch (false);
740 want_refresh = 1;
741 } 910 }
742#endif 911#endif
743 912
744 if (want_refresh) 913 if (want_refresh)
745 { 914 {
746 scr_refresh (refresh_type); 915 scr_refresh (refresh_type);
747 scrollbar_show (1); 916 scrollbar_show (1);
748#ifdef USE_XIM 917#ifdef USE_XIM
749 IMSendSpot (); 918 IMSendSpot ();
750#endif 919#endif
751
752 } 920 }
753 921
754 display->flush (); 922 display->flush ();
923
924 flush_ev.stop ();
755} 925}
756 926
757void 927void
758rxvt_term::check_cb (check_watcher &w) 928rxvt_term::check_cb (check_watcher &w)
759{ 929{
760 SET_R (this); 930 SET_R (this);
761 SET_LOCALE (locale); 931 SET_LOCALE (locale);
762 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;
763 flush (); 947 flush ();
764} 948}
765 949
766#ifdef CURSOR_BLINK 950#ifdef CURSOR_BLINK
767void 951void
… …
785 w.start (w.at + TEXT_BLINK_INTERVAL); 969 w.start (w.at + TEXT_BLINK_INTERVAL);
786 } 970 }
787} 971}
788#endif 972#endif
789 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
790bool 1017bool
791rxvt_term::pty_fill () 1018rxvt_term::pty_fill ()
792{ 1019{
793 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1020 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1021
1022 if (CBUFSIZ == n)
1023 {
1024 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1025 n = 0;
1026 }
794 1027
795 memmove (cmdbuf_base, cmdbuf_ptr, n); 1028 memmove (cmdbuf_base, cmdbuf_ptr, n);
796 cmdbuf_ptr = cmdbuf_base; 1029 cmdbuf_ptr = cmdbuf_base;
797 cmdbuf_endp = cmdbuf_ptr + n; 1030 cmdbuf_endp = cmdbuf_ptr + n;
798 1031
799 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
800 1033
801 if (n > 0) 1034 if (n > 0)
802 { 1035 {
803 cmdbuf_endp += n; 1036 cmdbuf_endp += n;
804 return true; 1037 return true;
805 } 1038 }
806 else if (n < 0 && errno != EAGAIN) 1039 else if (n < 0 && errno != EAGAIN)
807 destroy (); 1040 destroy ();
808 1041
809 return false; 1042 return false;
810} 1043}
811 1044
812void 1045void
813rxvt_term::pty_cb (io_watcher &w, short revents) 1046rxvt_term::pty_cb (io_watcher &w, short revents)
… …
816 SET_LOCALE (locale); 1049 SET_LOCALE (locale);
817 1050
818 if (revents & EVENT_WRITE) 1051 if (revents & EVENT_WRITE)
819 tt_write (0, 0); 1052 tt_write (0, 0);
820 else if (revents & EVENT_READ) 1053 else if (revents & EVENT_READ)
821 {
822 bool flag = true;
823
824 // loop, but don't allow a single term to monopolize us 1054 // loop, but don't allow a single term to monopolize us
825 // the number of loops is fully arbitrary, and thus wrong
826 while (flag && pty_fill ()) 1055 while (pty_fill ())
827 { 1056 if (cmd_parse ())
828 if (!seen_input)
829 {
830 seen_input = 1;
831 /* once we know the shell is running, send the screen size. Again! */
832 tt_winch ();
833 }
834
835 uint32_t ch = NOCHAR;
836
837 for (;;)
838 {
839 if (ch == NOCHAR)
840 ch = next_char ();
841
842 if (ch == NOCHAR) // TODO: improve
843 break; 1057 break;
844
845 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
846 {
847 /* Read a text string from the input buffer */
848 uint32_t buf[BUFSIZ];
849 bool refreshnow = false;
850 int nlines = 0;
851 uint32_t *str = buf;
852
853 *str++ = ch;
854
855 for (;;)
856 {
857 ch = next_char ();
858
859 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
860 break;
861 else
862 {
863 *str++ = ch;
864
865 if (ch == '\n')
866 {
867 nlines++;
868 refresh_count++;
869
870 if (! (Options & Opt_jumpScroll)
871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
872 {
873 refreshnow = true;
874 flag = false;
875 ch = NOCHAR;
876 break;
877 }
878
879 // scr_add_lines only works for nlines < TermWin.nrow - 1.
880 if (nlines >= TermWin.nrow - 1)
881 {
882 scr_add_lines (buf, nlines, str - buf);
883 nlines = 0;
884 str = buf;
885 }
886 }
887
888 if (str >= buf + BUFSIZ)
889 {
890 ch = NOCHAR;
891 break;
892 }
893 }
894 }
895
896 scr_add_lines (buf, nlines, str - buf);
897
898 /*
899 * If there have been a lot of new lines, then update the screen
900 * What the heck I'll cheat and only refresh less than every page-full.
901 * the number of pages between refreshes is refresh_limit, which
902 * is incremented here because we must be doing flat-out scrolling.
903 *
904 * refreshing should be correct for small scrolls, because of the
905 * time-out
906 */
907 if (refreshnow)
908 {
909 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
910 refresh_limit++;
911
912 scr_refresh (refresh_type);
913 }
914
915 }
916 else
917 {
918 switch (ch)
919 {
920 default:
921 process_nonprinting (ch);
922 break;
923 case C0_ESC: /* escape char */
924 process_escape_seq ();
925 break;
926 /*case 0x9b: */ /* CSI */
927 /* process_csi_seq (); */
928 }
929
930 ch = NOCHAR;
931 }
932 }
933 }
934 }
935} 1058}
936 1059
937// read the next character, currently handles UTF-8 1060void
938// will probably handle all sorts of other stuff in the future 1061rxvt_term::pointer_unblank ()
939uint32_t
940rxvt_term::next_char ()
941{ 1062{
942 while (cmdbuf_ptr < cmdbuf_endp) 1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
943 { 1064 recolour_cursor ();
944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
945 return *cmdbuf_ptr++;
946 1065
947 wchar_t wc; 1066#ifdef POINTER_BLANK
948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1067 hidden_pointer = 0;
949 1068
950 if (len == (size_t)-2) 1069 if (options & Opt_pointerBlank)
951 return NOCHAR; 1070 pointer_ev.start (NOW + pointerBlankDelay);
952 1071#endif
953 if (len == (size_t)-1)
954 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
955
956 // assume wchar == unicode
957 cmdbuf_ptr += len;
958 return wc;
959 }
960
961 return NOCHAR;
962}
963
964/* rxvt_cmd_getc () - Return next input character */
965/*
966 * Return the next input character after first passing any keyboard input
967 * to the command.
968 */
969uint32_t
970rxvt_term::cmd_getc ()
971{
972 for (;;)
973 {
974 uint32_t c = next_char ();
975 if (c != NOCHAR)
976 return c;
977
978 // incomplete sequences should occur rarely, still, a better solution
979 // would be preferred. either setjmp/longjmp or better design.
980 fcntl (cmd_fd, F_SETFL, 0);
981 pty_fill ();
982 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
983 }
984} 1072}
985 1073
986#ifdef POINTER_BLANK 1074#ifdef POINTER_BLANK
987void 1075void
988rxvt_term::pointer_unblank ()
989{
990 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
991 recolour_cursor ();
992
993 hidden_pointer = 0;
994
995 if (Options & Opt_pointerBlank)
996 pointer_ev.start (NOW + pointerBlankDelay);
997}
998
999void
1000rxvt_term::pointer_blank () 1076rxvt_term::pointer_blank ()
1001{ 1077{
1002 if (! (Options & Opt_pointerBlank)) 1078 if (! (options & Opt_pointerBlank))
1003 return; 1079 return;
1004 1080
1005 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1081 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1006 XFlush (display->display); 1082 XFlush (display->display);
1007 1083
… …
1017 pointer_blank (); 1093 pointer_blank ();
1018} 1094}
1019#endif 1095#endif
1020 1096
1021void 1097void
1022rxvt_term::mouse_report (const XButtonEvent &ev) 1098rxvt_term::mouse_report (XButtonEvent &ev)
1023{ 1099{
1024 int button_number, key_state = 0; 1100 int button_number, key_state = 0;
1025 int x, y; 1101 int x, y;
1026 1102
1027 x = ev.x; 1103 x = ev.x;
1028 y = ev.y; 1104 y = ev.y;
1029 pixel_position (&x, &y); 1105 pixel_position (&x, &y);
1030 1106
1031 if (MEvent.button == AnyButton) 1107 if (MEvent.button == AnyButton)
1032 {
1033 button_number = 3; 1108 button_number = 3;
1034 }
1035 else 1109 else
1036 { 1110 {
1037 button_number = MEvent.button - Button1; 1111 button_number = MEvent.button - Button1;
1038 /* add 0x3D for wheel events, like xterm does */ 1112 /* add 0x3D for wheel events, like xterm does */
1039 if (button_number >= 3) 1113 if (button_number >= 3)
1040 button_number += (64 - 3); 1114 button_number += (64 - 3);
1041 } 1115 }
1042 1116
1043 if (PrivateModes & PrivMode_MouseX10) 1117 if (priv_modes & PrivMode_MouseX10)
1044 { 1118 {
1045 /* 1119 /*
1046 * do not report ButtonRelease 1120 * do not report ButtonRelease
1047 * no state info allowed 1121 * no state info allowed
1048 */ 1122 */
… …
1106{ 1180{
1107 SET_R (this); 1181 SET_R (this);
1108 SET_LOCALE (locale); 1182 SET_LOCALE (locale);
1109 1183
1110#if defined(CURSOR_BLINK) 1184#if defined(CURSOR_BLINK)
1111 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1112 { 1186 {
1113 if (hidden_cursor) 1187 if (hidden_cursor)
1114 { 1188 {
1115 hidden_cursor = 0; 1189 hidden_cursor = 0;
1116 want_refresh = 1; 1190 want_refresh = 1;
… …
1119 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1120 } 1194 }
1121#endif 1195#endif
1122 1196
1123#if defined(POINTER_BLANK) 1197#if defined(POINTER_BLANK)
1124 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1125 { 1199 {
1126 if (ev.type == MotionNotify 1200 if (ev.type == MotionNotify
1127 || ev.type == ButtonPress 1201 || ev.type == ButtonPress
1128 || ev.type == ButtonRelease) 1202 || ev.type == ButtonRelease)
1129 if (hidden_pointer) 1203 if (hidden_pointer)
… …
1141 1215
1142 Window unused_root, unused_child; 1216 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1217 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1218 unsigned int unused_mask;
1145 1219
1146#ifdef DEBUG_X
1147 const char *const eventnames[] =
1148 { /* mason - this matches my system */
1149 "",
1150 "",
1151 "KeyPress",
1152 "KeyRelease",
1153 "ButtonPress",
1154 "ButtonRelease",
1155 "MotionNotify",
1156 "EnterNotify",
1157 "LeaveNotify",
1158 "FocusIn",
1159 "FocusOut",
1160 "KeymapNotify",
1161 "Expose",
1162 "GraphicsExpose",
1163 "NoExpose",
1164 "VisibilityNotify",
1165 "CreateNotify",
1166 "DestroyNotify",
1167 "UnmapNotify",
1168 "MapNotify",
1169 "MapRequest",
1170 "ReparentNotify",
1171 "ConfigureNotify",
1172 "ConfigureRequest",
1173 "GravityNotify",
1174 "ResizeRequest",
1175 "CirculateNotify",
1176 "CirculateRequest",
1177 "PropertyNotify",
1178 "SelectionClear",
1179 "SelectionRequest",
1180 "SelectionNotify",
1181 "ColormapNotify",
1182 "ClientMessage",
1183 "MappingNotify"
1184 };
1185#endif
1186
1187#ifdef DEBUG_X
1188 struct timeval tp;
1189 struct tm *ltt;
1190 (void)gettimeofday (&tp, NULL);
1191 ltt = localtime (& (tp.tv_sec));
1192 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));
1193#endif
1194
1195 switch (ev.type) 1220 switch (ev.type)
1196 { 1221 {
1197 case KeyPress: 1222 case KeyPress:
1223#if ISO_14755
1224 if (!(iso14755buf & ISO_14755_52))
1225#endif
1198 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;
1199 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
1200 1291
1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1292#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1202 case KeyRelease:
1203 {
1204 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)
1205 mouse_slip_wheel_speed = 0; 1296 mouse_slip_wheel_speed = 0;
1206 else 1297#endif
1207 {
1208 KeySym ks;
1209
1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1211 if (ks == XK_Control_L || ks == XK_Control_R)
1212 mouse_slip_wheel_speed = 0;
1213 }
1214 break; 1298 break;
1215 } 1299 }
1216#endif
1217 1300
1218 case ButtonPress: 1301 case ButtonPress:
1219 button_press (ev.xbutton); 1302 button_press (ev.xbutton);
1220 break; 1303 break;
1221 1304
… …
1233 && (ev.xclient.data.l[0] == DndFile 1316 && (ev.xclient.data.l[0] == DndFile
1234 || ev.xclient.data.l[0] == DndDir 1317 || ev.xclient.data.l[0] == DndDir
1235 || ev.xclient.data.l[0] == DndLink)) 1318 || ev.xclient.data.l[0] == DndLink))
1236 { 1319 {
1237 /* Get Dnd data */ 1320 /* Get Dnd data */
1238 Atom ActualType; 1321 Atom ActualType;
1239 int ActualFormat; 1322 int ActualFormat;
1240 unsigned char *data; 1323 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1324 unsigned long Size, RemainingBytes;
1242 1325
1243 XGetWindowProperty (display->display, display->root, 1326 XGetWindowProperty (display->display, display->root,
1244 xa[XA_DNDSELECTION], 1327 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1328 0L, 1000000L,
1246 False, AnyPropertyType, 1329 False, AnyPropertyType,
… …
1248 &Size, &RemainingBytes, 1331 &Size, &RemainingBytes,
1249 &data); 1332 &data);
1250 XChangeProperty (display->display, display->root, 1333 XChangeProperty (display->display, display->root,
1251 XA_CUT_BUFFER0, XA_STRING, 1334 XA_CUT_BUFFER0, XA_STRING,
1252 8, PropModeReplace, 1335 8, PropModeReplace,
1253 data, STRLEN (data)); 1336 data, strlen (data));
1337 XFree (data);
1254 selection_paste (display->root, XA_CUT_BUFFER0, True); 1338 selection_paste (display->root, XA_CUT_BUFFER0, True);
1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1256 } 1340 }
1257#endif /* OFFIX_DND */ 1341#endif /* OFFIX_DND */
1258 break; 1342 break;
1259 1343
1260 case MappingNotify: 1344 case MappingNotify:
1261 XRefreshKeyboardMapping (& (ev.xmapping)); 1345 XRefreshKeyboardMapping (&ev.xmapping);
1262 break; 1346 break;
1263 1347
1264 /* 1348 /*
1265 * XXX: this is not the _current_ arrangement 1349 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1350 * Here's my conclusion:
… …
1291 { 1375 {
1292 TermWin.focus = 1; 1376 TermWin.focus = 1;
1293 want_refresh = 1; 1377 want_refresh = 1;
1294#ifdef USE_XIM 1378#ifdef USE_XIM
1295 if (Input_Context != NULL) 1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1296 XSetICFocus (Input_Context); 1382 XSetICFocus (Input_Context);
1383 }
1297#endif 1384#endif
1298#ifdef CURSOR_BLINK 1385#ifdef CURSOR_BLINK
1299 if (Options & Opt_cursorBlink) 1386 if (options & Opt_cursorBlink)
1300 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 }
1301#endif 1397#endif
1302 1398
1303 } 1399 }
1304 break; 1400 break;
1305 1401
… …
1311#ifdef USE_XIM 1407#ifdef USE_XIM
1312 if (Input_Context != NULL) 1408 if (Input_Context != NULL)
1313 XUnsetICFocus (Input_Context); 1409 XUnsetICFocus (Input_Context);
1314#endif 1410#endif
1315#ifdef CURSOR_BLINK 1411#ifdef CURSOR_BLINK
1316 if (Options & Opt_cursorBlink) 1412 if (options & Opt_cursorBlink)
1317 cursor_blink_ev.stop (); 1413 cursor_blink_ev.stop ();
1318 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 }
1319#endif 1424#endif
1320 1425
1321 } 1426 }
1322 break; 1427 break;
1323 1428
… …
1333 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1334 } 1439 }
1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1336 1441
1337 if (szHint.width != width || szHint.height != height) 1442 if (szHint.width != width || szHint.height != height)
1338 {
1339 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1340 resize_all_windows (width, height, 1); 1443 resize_all_windows (width, height, 1);
1341 } 1444
1342#ifdef DEBUG_SIZE
1343 else
1344 {
1345 D_SIZE ((stderr, "Size: Not resizing"));
1346 }
1347#endif
1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1349 if (Options & Opt_transparent) 1446 if (options & Opt_transparent)
1350 { 1447 {
1351 check_our_parents (); 1448 check_our_parents ();
1352 if (am_transparent) 1449 if (am_transparent)
1353 want_full_refresh = 1; 1450 want_refresh = want_full_refresh = 1;
1354 } 1451 }
1355#endif 1452#endif
1356
1357 } 1453 }
1358 break; 1454 break;
1359 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
1461 break;
1462
1360 case SelectionClear: 1463 case SelectionClear:
1361 display->set_selection_owner (0); 1464 selection_clear ();
1362 break; 1465 break;
1363 1466
1364 case SelectionNotify: 1467 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1468 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1469 selection_paste (ev.xselection.requestor,
… …
1393 1496
1394 case GraphicsExpose: 1497 case GraphicsExpose:
1395 case Expose: 1498 case Expose:
1396 if (ev.xany.window == TermWin.vt) 1499 if (ev.xany.window == TermWin.vt)
1397 { 1500 {
1398#ifdef NO_SLOW_LINK_SUPPORT 1501 do
1399 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1400 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1401#else 1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1402 // 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))
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1405 //scr_expose (ev.xexpose.x, 0, 1511
1406 // ev.xexpose.width, TermWin.height, False); 1512 scr_refresh (refresh_type);
1407#endif
1408 want_refresh = 1;
1409 } 1513 }
1410 else 1514 else
1411 { 1515 {
1412 XEvent unused_event; 1516 XEvent unused_event;
1413 1517
1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1415 Expose, 1519 ;
1416 &unused_event)) ;
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1418 GraphicsExpose, 1521 ;
1419 &unused_event)) ; 1522
1420 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1421 { 1524 {
1422 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1423 scrollbar_show (0); 1526 scrollbar_show (0);
1424 } 1527 }
1425#ifdef MENUBAR 1528#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose (); 1530 menubar_expose ();
1428#endif 1531#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432 1532
1533#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1535 XClearWindow (display->display, ev.xany.window);
1536#endif
1433 } 1537 }
1434 break; 1538 break;
1435 1539
1436 case MotionNotify: 1540 case MotionNotify:
1437#ifdef POINTER_BLANK 1541#ifdef POINTER_BLANK
… …
1439 pointer_unblank (); 1543 pointer_unblank ();
1440#endif 1544#endif
1441#if MENUBAR 1545#if MENUBAR
1442 if (isMenuBarWindow (ev.xany.window)) 1546 if (isMenuBarWindow (ev.xany.window))
1443 { 1547 {
1444 menubar_control (& (ev.xbutton)); 1548 menubar_control (ev.xbutton);
1445 break; 1549 break;
1446 } 1550 }
1447#endif 1551#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1449 break; 1553 break;
1450 1554
1451 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1452 { 1556 {
1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1454 { 1558 {
1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1456 ; 1560 ;
1457 1561
1458 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (display->display, TermWin.vt,
1459 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1460 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y), 1565 & (ev.xbutton.x), & (ev.xbutton.y),
1462 &unused_mask); 1566 &unused_mask);
1463#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
1464 /* deal with a `jumpy' mouse */ 1568 /* deal with a `jumpy' mouse */
1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 { 1570 {
1467#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
1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1580 selection_extend (ev.xbutton.x, ev.xbutton.y,
1469 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1581 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1470#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1471 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1473 { 1585 {
1474 int dist; 1586 int dist;
1475 1587
1476 pending_scroll_selection=1;
1477
1478 /* don't clobber the current delay if we are 1588 /* don't clobber the current delay if we are
1479 * already in the middle of scrolling. 1589 * already in the middle of scrolling.
1480 */ 1590 */
1481 if (scroll_selection_delay<=0) 1591 if (!sel_scroll_ev.active)
1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1483 1593
1484 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1485 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1486 */ 1596 */
1487 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1488 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1489 selection_save_state=
1490 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1491 1600
1492 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1493 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y<TermWin.int_bwidth)
1494 { 1603 {
1495 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1496 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1497 } 1606 }
1498 else 1607 else
1499 { 1608 {
1500 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1501 dist = ev.xbutton.y -
1502 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1503 } 1611 }
1612
1504 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1505 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1506 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1507 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1508 } 1618 }
1509 else 1619 else
1510 { 1620 {
1511 /* we are within the text window, so we 1621 /* we are within the text window, so we
1512 * shouldn't be scrolling 1622 * shouldn't be scrolling
1513 */ 1623 */
1514 pending_scroll_selection = 0; 1624 if (sel_scroll_ev.active)
1625 sel_scroll_ev.stop();
1515 } 1626 }
1516#endif 1627#endif
1517#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1518
1519 } 1629 }
1520#endif 1630#endif
1521
1522 } 1631 }
1523 } 1632 }
1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1525 { 1634 {
1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1527 MotionNotify, &ev)) ; 1636 MotionNotify, &ev)) ;
1528 XQueryPointer (display->display, scrollBar.win, 1637 XQueryPointer (display->display, scrollBar.win,
1529 &unused_root, &unused_child, 1638 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y, 1639 &unused_root_x, &unused_root_y,
1531 & (ev.xbutton.x), & (ev.xbutton.y), 1640 & (ev.xbutton.x), & (ev.xbutton.y),
1532 &unused_mask); 1641 &unused_mask);
… …
1538 } 1647 }
1539 break; 1648 break;
1540 } 1649 }
1541} 1650}
1542 1651
1652#if TRANSPARENT
1543void 1653void
1544rxvt_term::rootwin_cb (XEvent &ev) 1654rxvt_term::rootwin_cb (XEvent &ev)
1545{ 1655{
1546 SET_R (this); 1656 SET_R (this);
1547 SET_LOCALE (locale); 1657 SET_LOCALE (locale);
1548 1658
1549 switch (ev.type) 1659 switch (ev.type)
1550 { 1660 {
1551 case PropertyNotify: 1661 case PropertyNotify:
1552 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1553 {
1554 if (ev.xproperty.state == PropertyNewValue)
1555 selection_property (ev.xproperty.window, ev.xproperty.atom);
1556 break;
1557 }
1558#ifdef TRANSPARENT
1559 else
1560 {
1561 /* 1662 /*
1562 * 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,
1563 * 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.
1564 */ 1665 */
1565 if (xa[XA_XROOTPMAPID] == 0) 1666 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1567 1668
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return; 1670 return;
1570 }
1571 1671
1572 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1573 case ReparentNotify: 1673 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ()) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1575 if (am_transparent)
1576 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1577 break; 1676 break;
1578#endif
1579 } 1677 }
1580} 1678}
1679#endif
1581 1680
1582void 1681void
1583rxvt_term::button_press (const XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1584{ 1683{
1585 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1586 1685
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1588 if (!bypass_keystate) 1687 if (!bypass_keystate)
1589 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1590 /* 1690 /*
1591 * VT window processing of button press 1691 * VT window processing of button press
1592 */ 1692 */
1593 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1594 { 1694 {
1595#if RXVT_GRAPHICS 1695#if ISO_14755
1596 if (ev.subwindow != None) 1696 // 5.4
1597 rxvt_Gr_ButtonPress (ev.x, ev.y); 1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 else 1698 {
1599#endif 1699 iso14755_54 (ev.x, ev.y);
1600 1700 return;
1601 { 1701 }
1702#endif
1703
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1603 if (reportmode) 1705 if (reportmode)
1706 {
1707 /* mouse report from vt window */
1708 /* save the xbutton state (for ButtonRelease) */
1709 MEvent.state = ev.state;
1710#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime)
1604 { 1712 {
1605 /* mouse report from vt window */ 1713 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1714 MEvent.clicks++;
1607 MEvent.state = ev.state; 1715 if (MEvent.clicks > 1)
1608#ifdef MOUSE_REPORT_DOUBLECLICK
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1716 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1717 /* only report double clicks */
1616 MEvent.clicks = 2; 1718 MEvent.clicks = 2;
1617 mouse_report (ev); 1719 mouse_report (ev);
1618 1720
1619 /* don't report the release */ 1721 /* don't report the release */
1620 MEvent.clicks = 0; 1722 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1723 MEvent.button = AnyButton;
1622 }
1623 } 1724 }
1624 else
1625 {
1626 /* different button, or time expired */
1627 MEvent.clicks = 1;
1628 MEvent.button = ev.button;
1629 mouse_report (ev);
1630 }
1631#else
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634#endif /* MOUSE_REPORT_DOUBLECLICK */
1635
1636 } 1725 }
1637 else 1726 else
1638 { 1727 {
1728 /* different button, or time expired */
1729 MEvent.clicks = 1;
1730 MEvent.button = ev.button;
1731 mouse_report (ev);
1732 }
1733#else
1734 MEvent.button = ev.button;
1735 mouse_report (ev);
1736#endif /* MOUSE_REPORT_DOUBLECLICK */
1737
1738 }
1739 else
1740 {
1639 if (ev.button != MEvent.button) 1741 if (ev.button != MEvent.button)
1640 MEvent.clicks = 0; 1742 MEvent.clicks = 0;
1641 switch (ev.button) 1743 switch (ev.button)
1642 { 1744 {
1643 case Button1: 1745 case Button1:
1644 /* allow shift+left click to extend selection */ 1746 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1646 { 1748 {
1647 if (MEvent.button == Button1 && clickintime)
1648 selection_rotate (ev.x, ev.y);
1649 else
1650 selection_extend (ev.x, ev.y, 1);
1651 }
1652 else
1653 {
1654 if (MEvent.button == Button1 && clickintime)
1655 MEvent.clicks++;
1656 else
1657 MEvent.clicks = 1;
1658
1659 selection_click (MEvent.clicks, ev.x, ev.y);
1660 }
1661
1662 MEvent.button = Button1;
1663 break;
1664
1665 case Button3:
1666 if (MEvent.button == Button3 && clickintime) 1749 if (MEvent.button == Button1 && clickintime)
1667 selection_rotate (ev.x, ev.y); 1750 selection_rotate (ev.x, ev.y);
1668 else 1751 else
1669 selection_extend (ev.x, ev.y, 1); 1752 selection_extend (ev.x, ev.y, 1);
1753 }
1754 else
1755 {
1756 if (MEvent.button == Button1 && clickintime)
1757 MEvent.clicks++;
1758 else
1759 MEvent.clicks = 1;
1760
1761 selection_click (MEvent.clicks, ev.x, ev.y);
1762 }
1763
1764 MEvent.button = Button1;
1765 break;
1766
1767 case Button3:
1768 if (MEvent.button == Button3 && clickintime)
1769 selection_rotate (ev.x, ev.y);
1770 else
1771 selection_extend (ev.x, ev.y, 1);
1772
1670 MEvent.button = Button3; 1773 MEvent.button = Button3;
1671 break; 1774 break;
1672 }
1673 } 1775 }
1776 }
1777
1674 MEvent.time = ev.time; 1778 MEvent.time = ev.time;
1675 return; 1779 return;
1676 }
1677 } 1780 }
1678 1781
1679 /* 1782 /*
1680 * Scrollbar window processing of button press 1783 * Scrollbar window processing of button press
1681 */ 1784 */
… …
1745 upordown = 1; /* down */ 1848 upordown = 1; /* down */
1746 } 1849 }
1747 if (upordown) 1850 if (upordown)
1748 { 1851 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1852#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1853 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1751#endif 1854#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1)) 1855 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 { 1856 {
1754 if (upordown < 0) 1857 if (upordown < 0)
1755 scrollBar.setUp (); 1858 scrollBar.setUp ();
… …
1771 break; 1874 break;
1772 case R_SB_ALIGN_BOTTOM: 1875 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top; 1876 csrO = scrollBar.bot - scrollBar.top;
1774 break; 1877 break;
1775 } 1878 }
1879
1776 if (scrollBar.style == R_SB_XTERM 1880 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y) 1881 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y)) 1882 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO, 1883 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1780 scrollbar_size ()); 1884
1781 scrollBar.setMotion (); 1885 scrollBar.setMotion ();
1782 break; 1886 break;
1783 1887
1784 case Button1: 1888 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1889 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1809 scr_page ((ev.button == Button1 ? DN : UP), 1913 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow 1914 (TermWin.nrow
1811 * scrollbar_position (ev.y) 1915 * scrollbar_position (ev.y)
1812 / scrollbar_size ())); 1916 / scrollbar_size ()));
1813 } 1917 }
1918
1814 break; 1919 break;
1815 } 1920 }
1816 } 1921 }
1817 return; 1922 return;
1818 } 1923 }
… …
1824 menubar_control (ev); 1929 menubar_control (ev);
1825#endif 1930#endif
1826} 1931}
1827 1932
1828void 1933void
1829rxvt_term::button_release (const XButtonEvent &ev) 1934rxvt_term::button_release (XButtonEvent &ev)
1830{ 1935{
1831 int reportmode = 0; 1936 int reportmode = 0;
1832 1937
1833 csrO = 0; /* reset csr Offset */ 1938 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 1939 if (!bypass_keystate)
1835 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1940 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836 1941
1837 if (scrollbar_isUpDn ()) 1942 if (scrollbar_isUpDn ())
1838 { 1943 {
1839 scrollBar.setIdle (); 1944 scrollBar.setIdle ();
1840 scrollbar_show (0); 1945 scrollbar_show (0);
1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1946#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1842 refresh_type &= ~SMOOTH_REFRESH; 1947 refresh_type &= ~SMOOTH_REFRESH;
1843#endif 1948#endif
1844
1845 } 1949 }
1950
1846#ifdef SELECTION_SCROLLING 1951#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 1952 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop();
1848#endif 1954#endif
1955
1849 if (ev.window == TermWin.vt) 1956 if (ev.window == TermWin.vt)
1850 { 1957 {
1851#ifdef RXVT_GRAPHICS 1958#if ISO_14755
1852 if (ev.subwindow != None) 1959 // 5.4
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y); 1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1854 else 1961 return;
1855#endif 1962#endif
1856
1857 {
1858 if (reportmode) 1963 if (reportmode)
1964 {
1965 /* mouse report from vt window */
1966 /* don't report release of wheel "buttons" */
1967 if (ev.button >= 4)
1968 return;
1969#ifdef MOUSE_REPORT_DOUBLECLICK
1970 /* only report the release of 'slow' single clicks */
1971 if (MEvent.button != AnyButton
1972 && (ev.button != MEvent.button
1973 || (ev.time - MEvent.time
1974 > MULTICLICK_TIME / 2)))
1859 { 1975 {
1860 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4)
1863 return;
1864#ifdef MOUSE_REPORT_DOUBLECLICK
1865 /* only report the release of 'slow' single clicks */
1866 if (MEvent.button != AnyButton
1867 && (ev.button != MEvent.button
1868 || (ev.time - MEvent.time
1869 > MULTICLICK_TIME / 2)))
1870 {
1871 MEvent.clicks = 0; 1976 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 1977 MEvent.button = AnyButton;
1877 mouse_report (ev); 1978 mouse_report (ev);
1979 }
1980#else /* MOUSE_REPORT_DOUBLECLICK */
1981 MEvent.button = AnyButton;
1982 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 1983#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 1984 return;
1880 } 1985 }
1986
1881 /* 1987 /*
1882 * dumb hack to compensate for the failure of click-and-drag 1988 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 1989 * when overriding mouse reporting
1884 */ 1990 */
1885 if (PrivateModes & PrivMode_mouse_report 1991 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 1992 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 1993 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 1994 selection_extend (ev.x, ev.y, 0);
1889 1995
1890 switch (ev.button) 1996 switch (ev.button)
1997 {
1998 case Button1:
1999 case Button3:
2000 selection_make (ev.time);
2001 break;
2002 case Button2:
2003 selection_request (ev.time, ev.x, ev.y);
2004 break;
2005#ifdef MOUSE_WHEEL
2006 case Button4:
2007 case Button5:
1891 { 2008 {
1892 case Button1: 2009 int i;
1893 case Button3: 2010 page_dirn v;
1894 selection_make (ev.time); 2011
2012 v = ev.button == Button4 ? UP : DN;
2013
2014 if (ev.state & ShiftMask)
1895 break; 2015 i = 1;
1896 case Button2: 2016 else if (options & Opt_mouseWheelScrollPage)
1897 selection_request (ev.time, ev.x, ev.y); 2017 i = TermWin.nrow - 1;
2018 else
1898 break; 2019 i = 5;
2020
1899#ifdef MOUSE_WHEEL 2021# ifdef MOUSE_SLIP_WHEELING
1900 case Button4: 2022 if (ev.state & ControlMask)
1901 case Button5:
1902 { 2023 {
1903 int i;
1904 page_dirn v;
1905
1906 v = (ev.button == Button4) ? UP : DN;
1907 if (ev.state & ShiftMask)
1908 i = 1;
1909 else if ((Options & Opt_mouseWheelScrollPage))
1910 i = TermWin.nrow - 1;
1911 else
1912 i = 5;
1913# ifdef MOUSE_SLIP_WHEELING
1914 if (ev.state & ControlMask)
1915 {
1916 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)
1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030
2031 slip_wheel_ev.start ();
1918 } 2032 }
2033 else
2034 {
1919# endif 2035# endif
1920# ifdef JUMP_MOUSE_WHEEL 2036# ifdef JUMP_MOUSE_WHEEL
1921 scr_page (v, i); 2037 scr_page (v, i);
1922 scr_refresh (SMOOTH_REFRESH); 2038 scr_refresh (SMOOTH_REFRESH);
1923 scrollbar_show (1); 2039 scrollbar_show (1);
… …
1927 scr_page (v, 1); 2043 scr_page (v, 1);
1928 scr_refresh (SMOOTH_REFRESH); 2044 scr_refresh (SMOOTH_REFRESH);
1929 scrollbar_show (1); 2045 scrollbar_show (1);
1930 } 2046 }
1931# endif 2047# endif
1932 2048# ifdef MOUSE_SLIP_WHEELING
1933 } 2049 }
1934 break;
1935#endif 2050#endif
1936
1937 } 2051 }
2052 break;
2053#endif
1938 } 2054 }
1939 } 2055 }
1940#ifdef MENUBAR 2056#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window)) 2057 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev); 2058 menubar_control (ev);
1943#endif 2059#endif
1944} 2060}
1945 2061
1946
1947#ifdef TRANSPARENT 2062#ifdef TRANSPARENT
2063#if TINTING
2064/* taken from aterm-0.4.2 */
2065
2066typedef uint32_t RUINT32T;
2067
2068void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2069{
2070 int sh_r, sh_g, sh_b;
2071 RUINT32T mask_r, mask_g, mask_b;
2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_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;
2076
2077 Visual* visual = display->visual;
2078
2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080
2081 /* for convenience */
2082 mask_r = visual->red_mask;
2083 mask_g = visual->green_mask;
2084 mask_b = visual->blue_mask;
2085
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;
2159 } else {
2160 if (shade < 0) shade = 0;
2161 if (shade > 100) shade = 100;
2162
2163 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2164
2165 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2166 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2167 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2168 }
2169
2170 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2171 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2172 {
2173 unsigned int tmp;
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++)
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);
2226 }
2227 break;
2228 }
2229 case 16:
2230 {
2231 unsigned short *p1, *pf, *p, *pl;
2232 p1 = (unsigned short *) srcImage->data;
2233 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2234 while (p1 < pf)
2235 {
2236 p = p1;
2237 pl = p1 + srcImage->width;
2238 for (; p < pl; p++)
2239 {
2240 *p = lookup_r[(*p & 0xf800)>>11] |
2241 lookup_g[(*p & 0x07e0)>> 5] |
2242 lookup_b[(*p & 0x001f)];
2243 }
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)
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);
2264 }
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);
2272
2273 while (p1 < pf)
2274 {
2275 p = p1;
2276 pl = p1 + srcImage->width;
2277 for (; p < pl; p++)
2278 {
2279 *p = lookup_r[(*p & 0xff0000)>>16] |
2280 lookup_g[(*p & 0x00ff00)>> 8] |
2281 lookup_b[(*p & 0x0000ff)] |
2282 (*p & ~0xffffff);
2283 }
2284 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2285 }
2286 break;
2287 }
2288 }
2289
2290 free (lookup);
2291}
2292#endif
2293
1948/* 2294/*
1949 * Check our parents are still who we think they are. 2295 * Check our parents are still who we think they are.
1950 * Do transparency updates if required 2296 * Do transparency updates if required
1951 */ 2297 */
1952int 2298int
1953rxvt_term::check_our_parents () 2299rxvt_term::check_our_parents ()
1954{ 2300{
1955 int i, pchanged, aformat, have_pixmap, rootdepth; 2301 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after; 2302 unsigned long nitems, bytes_after;
1957 Atom atype; 2303 Atom atype;
1958 unsigned char *prop = NULL; 2304 unsigned char *prop = NULL;
1959 Window root, oldp, *list; 2305 Window root, oldp, *list;
1960 Pixmap rootpixmap = None; 2306 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr; 2307 XWindowAttributes wattr, wrootattr;
1962 2308
1963 pchanged = 0; 2309 pchanged = 0;
1964 2310
1965 if (! (Options & Opt_transparent)) 2311 if (!(options & Opt_transparent))
1966 return pchanged; /* Don't try any more */ 2312 return pchanged; /* Don't try any more */
1967 2313
1968 XGetWindowAttributes (display->display, display->root, &wrootattr); 2314 XGetWindowAttributes (display->display, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth; 2315 rootdepth = wrootattr.depth;
1970 2316
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2317 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2318
1972 if (rootdepth != wattr.depth) 2319 if (rootdepth != wattr.depth)
1973 { 2320 {
1974 if (am_transparent) 2321 if (am_transparent)
1975 { 2322 {
1976 pchanged = 1; 2323 pchanged = 1;
1977 XSetWindowBackground (display->display, TermWin.vt, 2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0; 2325 am_transparent = am_pixmap_trans = 0;
1980 } 2326 }
2327
1981 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
1982 } 2329 }
1983 2330
1984 /* Get all X ops out of the queue so that our information is up-to-date. */ 2331 /* Get all X ops out of the queue so that our information is up-to-date. */
1985 XSync (display->display, False); 2332 XSync (display->display, False);
… …
1987 /* 2334 /*
1988 * Make the frame window set by the window manager have 2335 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame 2336 * the root background. Some window managers put multiple nested frame
1990 * windows for each client, so we have to take care about that. 2337 * windows for each client, so we have to take care about that.
1991 */ 2338 */
1992 i = (xa[XA_XROOTPMAPID] != 0 2339 i = (xa[XA_XROOTPMAPID]
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2340 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2341 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &nitems, &bytes_after, &prop) == Success)); 2342 &nitems, &bytes_after, &prop) == Success);
2343
1996 if (!i || prop == NULL) 2344 if (!i || prop == NULL)
2345 i = (xa[XA_XSETROOTID]
2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348 &nitems, &bytes_after, &prop) == Success);
2349
2350 if (!i || prop == NULL
2351#if TINTING
2352 || !rs[Rs_color + Color_tint]
2353#endif
2354 )
1997 have_pixmap = 0; 2355 have_pixmap = 0;
1998 else 2356 else
1999 { 2357 {
2000 have_pixmap = 1; 2358 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2359 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2360 XFree (prop);
2003 } 2361 }
2362
2004 if (have_pixmap) 2363 if (have_pixmap)
2005 { 2364 {
2006 /* 2365 /*
2007 * Copy display->root pixmap transparency 2366 * Copy display->root pixmap transparency
2008 */ 2367 */
2009 int sx, sy, nx, ny; 2368 int sx, sy, nx, ny;
2010 unsigned int nw, nh; 2369 unsigned int nw, nh;
2011 Window cr; 2370 Window cr;
2012 XImage *image; 2371 XImage *image;
2013 GC gc; 2372 GC gc;
2014 XGCValues gcvalue; 2373 XGCValues gcvalue;
2015 2374
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2375 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2017 0, 0, &sx, &sy, &cr); 2376 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width; 2377 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height; 2378 nh = (unsigned int)szHint.height;
2020 nx = ny = 0; 2379 nx = ny = 0;
2380
2021 if (sx < 0) 2381 if (sx < 0)
2022 { 2382 {
2023 nw += sx; 2383 nw += sx;
2024 nx = -sx; 2384 nx = -sx;
2025 sx = 0; 2385 sx = 0;
2026 } 2386 }
2387
2027 if (sy < 0) 2388 if (sy < 0)
2028 { 2389 {
2029 nh += sy; 2390 nh += sy;
2030 ny = -sy; 2391 ny = -sy;
2031 sy = 0; 2392 sy = 0;
2032 } 2393 }
2394
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2395 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2396 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2035 allowedxerror = -1; 2397 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2398 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2037 ZPixmap); 2399
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2400 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */ 2401 /* XXX: may need a delay here? */
2040 allowedxerror = 0; 2402 allowedxerror = 0;
2403
2041 if (image == NULL) 2404 if (image == NULL)
2042 { 2405 {
2043 if (am_transparent && am_pixmap_trans) 2406 if (am_transparent && am_pixmap_trans)
2044 { 2407 {
2045 pchanged = 1; 2408 pchanged = 1;
… …
2047 { 2410 {
2048 XFreePixmap (display->display, TermWin.pixmap); 2411 XFreePixmap (display->display, TermWin.pixmap);
2049 TermWin.pixmap = None; 2412 TermWin.pixmap = None;
2050 } 2413 }
2051 } 2414 }
2415
2052 am_pixmap_trans = 0; 2416 am_pixmap_trans = 0;
2053 } 2417 }
2054 else 2418 else
2055 { 2419 {
2056 if (TermWin.pixmap != None) 2420 if (TermWin.pixmap != None)
2057 XFreePixmap (display->display, TermWin.pixmap); 2421 XFreePixmap (display->display, TermWin.pixmap);
2422
2423#if TINTING
2424 if (ISSET_PIXCOLOR (Color_tint))
2425 {
2426 unsigned short rm, gm, bm;
2427 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2428
2429 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2430
2431 ShadeXImage (display, image, shade, rm, gm, bm);
2432 }
2433#endif
2434
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height, 2436 szHint.width, szHint.height, image->depth);
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height); 2439 nx, ny, image->width, image->height);
2066 XFreeGC (display->display, gc); 2440 XFreeGC (display->display, gc);
2067 XDestroyImage (image); 2441 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2069 TermWin.pixmap); 2443 XClearWindow (display->display, TermWin.parent[0]);
2444
2070 if (!am_transparent || !am_pixmap_trans) 2445 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1; 2446 pchanged = 1;
2447
2072 am_transparent = am_pixmap_trans = 1; 2448 am_transparent = am_pixmap_trans = 1;
2073 } 2449 }
2074 } 2450 }
2451
2075 if (!am_pixmap_trans) 2452 if (!am_pixmap_trans)
2076 { 2453 {
2077 unsigned int n; 2454 unsigned int n;
2078 /* 2455 /*
2079 * InheritPixmap transparency 2456 * InheritPixmap transparency
2080 */ 2457 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2083 i++)
2084 { 2459 {
2085 oldp = TermWin.parent[i]; 2460 oldp = TermWin.parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2461 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2087 &TermWin.parent[i], &list, &n); 2462 &TermWin.parent[i], &list, &n);
2088 XFree (list); 2463 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2464
2090 if (TermWin.parent[i] == display->root) 2465 if (TermWin.parent[i] == display->root)
2091 { 2466 {
2092 if (oldp != None) 2467 if (oldp != None)
2093 pchanged = 1; 2468 pchanged = 1;
2469
2094 break; 2470 break;
2095 } 2471 }
2472
2096 if (oldp != TermWin.parent[i]) 2473 if (oldp != TermWin.parent[i])
2097 pchanged = 1; 2474 pchanged = 1;
2098 } 2475 }
2476
2099 n = 0; 2477 n = 0;
2478
2100 if (pchanged) 2479 if (pchanged)
2101 { 2480 {
2102 for (; n < (unsigned int)i; n++) 2481 for (; n < (unsigned int)i; n++)
2103 { 2482 {
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2105 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2106 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2107 { 2485 {
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2109 break; 2487 break;
2110 } 2488 }
2111 } 2489 }
2112 } 2490 }
2113 if (n > (int) (sizeof (TermWin.parent) 2491
2114 / sizeof (TermWin.parent[0]))) 2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2115 { 2493 {
2116 D_X ((stderr, "InheritPixmap Turning off"));
2117 XSetWindowBackground (display->display, TermWin.parent[0], 2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2118 PixColors[Color_fg]);
2119 XSetWindowBackground (display->display, TermWin.vt, 2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2120 PixColors[Color_bg]);
2121 am_transparent = 0; 2496 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */ 2497 /* XXX: also turn off Opt_transparent? */
2123 } 2498 }
2124 else 2499 else
2125 { 2500 {
2501#if WAIT_FOR_WM
2126 /* wait (an arbitrary period) for the WM to do its thing 2502 /* wait (an arbitrary period) for the WM to do its thing
2127 * needed for fvwm2.2.2 (and before?) */ 2503 * needed for fvwm2.2.2 (and before?) */
2128# ifdef HAVE_NANOSLEEP
2129 struct timespec rqt;
2130
2131 rqt.tv_sec = 1;
2132 rqt.tv_nsec = 0;
2133 nanosleep (&rqt, NULL);
2134# else
2135 sleep (1); 2504 sleep (1);
2136# endif 2505#endif
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2138 for (n = 0; n < (unsigned int)i; n++) 2506 for (n = 0; n < (unsigned int)i; n++)
2507 {
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2140 ParentRelative); 2509 XClearWindow (display->display, TermWin.parent[n]);
2510 }
2511
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2142 ParentRelative);
2143 am_transparent = 1; 2513 am_transparent = 1;
2144 } 2514 }
2515
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2146 TermWin.parent[i] = None; 2517 TermWin.parent[i] = None;
2147 } 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);
2527 }
2528
2148 return pchanged; 2529 return pchanged;
2149} 2530}
2150#endif 2531#endif
2151 2532
2152/*}}} */ 2533/*}}} */
2534
2535bool
2536rxvt_term::cmd_parse ()
2537{
2538 bool flag = false;
2539 unicode_t ch = NOCHAR;
2540 unsigned char *seq_begin; // remember start of esc-sequence here
2541
2542 for (;;)
2543 {
2544 if (ch == NOCHAR)
2545 {
2546 seq_begin = cmdbuf_ptr;
2547 ch = next_char ();
2548 }
2549
2550 if (ch == NOCHAR) // TODO: improve
2551 break;
2552
2553 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
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
2565 /* Read a text string from the input buffer */
2566 unicode_t buf[UBUFSIZ];
2567 bool refreshnow = false;
2568 int nlines = 0;
2569 unicode_t *str = buf;
2570
2571 for (;;)
2572 {
2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2574 break;
2575
2576 *str++ = ch;
2577
2578 if (ch == C0_LF)
2579 {
2580 nlines++;
2581 refresh_count++;
2582
2583 if (!(options & Opt_jumpScroll)
2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2585 {
2586 refreshnow = true;
2587 ch = NOCHAR;
2588 break;
2589 }
2590
2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2592 if (nlines >= TermWin.nrow - 1)
2593 {
2594 scr_add_lines (buf, nlines, str - buf);
2595 nlines = 0;
2596 str = buf;
2597 }
2598 }
2599
2600 if (str >= buf + UBUFSIZ)
2601 {
2602 ch = NOCHAR;
2603 break;
2604 }
2605
2606 seq_begin = cmdbuf_ptr;
2607 ch = next_char ();
2608 }
2609
2610 scr_add_lines (buf, nlines, str - buf);
2611
2612 /*
2613 * If there have been a lot of new lines, then update the screen
2614 * What the heck I'll cheat and only refresh less than every page-full.
2615 * the number of pages between refreshes is refresh_limit, which
2616 * is incremented here because we must be doing flat-out scrolling.
2617 */
2618 if (refreshnow)
2619 {
2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2621 refresh_limit++;
2622 else
2623 {
2624 flag = true;
2625 scr_refresh (refresh_type);
2626 }
2627 }
2628
2629 }
2630 else
2631 {
2632 try
2633 {
2634 process_nonprinting (ch);
2635 }
2636 catch (const class out_of_input &o)
2637 {
2638 // we ran out of input, retry later
2639 cmdbuf_ptr = seq_begin;
2640 break;
2641 }
2642
2643 ch = NOCHAR;
2644 }
2645 }
2646
2647 return flag;
2648}
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
2659// read the next character
2660unicode_t
2661rxvt_term::next_char ()
2662{
2663 while (cmdbuf_ptr < cmdbuf_endp)
2664 {
2665 // assume 7-bit to be ascii ALWAYS
2666 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2667 return *cmdbuf_ptr++;
2668
2669 wchar_t wc;
2670 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2671
2672 if (len == (size_t)-2)
2673 {
2674 // the mbstate stores incomplete sequences. didn't know this :/
2675 cmdbuf_ptr = cmdbuf_endp;
2676 break;
2677 }
2678
2679 if (len == (size_t)-1)
2680 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2681
2682 // assume wchar == unicode
2683 cmdbuf_ptr += len;
2684 return wc;
2685 }
2686
2687 return NOCHAR;
2688}
2689
2690/* rxvt_cmd_getc () - Return next input character */
2691/*
2692 * Return the next input character after first passing any keyboard input
2693 * to the command.
2694 */
2695unicode_t
2696rxvt_term::cmd_getc ()
2697{
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 ();
2710
2711 if (c == NOCHAR)
2712 throw out_of_input;
2713
2714 return c;
2715}
2153 2716
2154/*{{{ print pipe */ 2717/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2718/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2719#ifdef PRINTPIPE
2157FILE * 2720FILE *
2158rxvt_term::popen_printer () 2721rxvt_term::popen_printer ()
2159{ 2722{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2723 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2724
2162 if (stream == NULL) 2725 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2726 rxvt_warn ("can't open printer pipe, not printing.\n");
2727
2164 return stream; 2728 return stream;
2165} 2729}
2166 2730
2167int 2731int
2168rxvt_term::pclose_printer (FILE *stream) 2732rxvt_term::pclose_printer (FILE *stream)
2169{ 2733{
2170 fflush (stream); 2734 fflush (stream);
2171 /* pclose () reported not to work on SunOS 4.1.3 */
2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2173 /* pclose works provided SIGCHLD handler uses waitpid */
2174 return pclose (stream); /* return fclose (stream); */
2175# else
2176 return pclose (stream); 2735 return pclose (stream);
2177# endif
2178} 2736}
2179 2737
2180/* 2738/*
2181 * simulate attached vt100 printer 2739 * simulate attached vt100 printer
2182 */ 2740 */
2183void 2741void
2184rxvt_term::process_print_pipe () 2742rxvt_term::process_print_pipe ()
2185{ 2743{
2186 int done; 2744 int done;
2187 FILE *fd; 2745 FILE *fd;
2188 2746
2189 if ((fd = popen_printer ()) == NULL) 2747 if ((fd = popen_printer ()) == NULL)
2190 return; 2748 return;
2191 2749
2192 /* 2750 /*
2193 * Send all input to the printer until either ESC[4i or ESC[?4i 2751 * Send all input to the printer until either ESC[4i or ESC[?4i
2194 * is received. 2752 * is received.
2195 */ 2753 */
2196 for (done = 0; !done;) 2754 for (done = 0; !done;)
2197 { 2755 {
2198 unsigned char buf[8]; 2756 unsigned char buf[8];
2199 unsigned char ch; 2757 unicode_t ch;
2200 unsigned int i, len; 2758 unsigned int i, len;
2201 2759
2202 if ((ch = cmd_getc ()) != C0_ESC) 2760 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2761 {
2204 if (putc (ch, fd) == EOF) 2762 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2763 break; /* done = 1 */
… …
2220 { 2778 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2779 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2780 break; /* done = 1 */
2223 } 2781 }
2224 } 2782 }
2783
2225 for (i = 0; i < len; i++) 2784 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2785 if (putc (buf[i], fd) == EOF)
2227 { 2786 {
2228 done = 1; 2787 done = 1;
2229 break; 2788 break;
2230 } 2789 }
2231 } 2790 }
2232 } 2791 }
2792
2233 pclose_printer (fd); 2793 pclose_printer (fd);
2234} 2794}
2235#endif /* PRINTPIPE */ 2795#endif /* PRINTPIPE */
2236/*}}} */ 2796/*}}} */
2237 2797
2238/* *INDENT-OFF* */ 2798/* *INDENT-OFF* */
2239enum { 2799enum {
2240 C1_40 = 0x40, 2800 C1_40 = 0x40,
2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2801 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2242 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2802 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2243 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2803 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2244 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2804 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2245}; 2805};
2246/* *INDENT-ON* */ 2806/* *INDENT-ON* */
2247 2807
2248/*{{{ process non-printing single characters */ 2808/*{{{ process non-printing single characters */
2249void 2809void
2250rxvt_term::process_nonprinting (unsigned char ch) 2810rxvt_term::process_nonprinting (unicode_t ch)
2251{ 2811{
2252 switch (ch) 2812 switch (ch)
2253 { 2813 {
2814 case C0_ESC:
2815 process_escape_seq ();
2816 break;
2254 case C0_ENQ: /* terminal Status */ 2817 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 2818 if (rs[Rs_answerbackstring])
2256 tt_write (
2257 (const unsigned char *)rs[Rs_answerbackstring], 2819 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2258 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2820 (unsigned int)strlen (rs[Rs_answerbackstring]));
2259 else 2821 else
2260 tt_write ((unsigned char *)VT100_ANS, 2822 tt_write ((unsigned char *)VT100_ANS,
2261 (unsigned int)STRLEN (VT100_ANS)); 2823 (unsigned int)strlen (VT100_ANS));
2262 break; 2824 break;
2263 case C0_BEL: /* bell */ 2825 case C0_BEL: /* bell */
2264 scr_bell (); 2826 scr_bell ();
2265 break; 2827 break;
2266 case C0_BS: /* backspace */ 2828 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 2843 scr_charset_choose (1);
2282 break; 2844 break;
2283 case C0_SI: /* shift in - acs */ 2845 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 2846 scr_charset_choose (0);
2285 break; 2847 break;
2848
2849#ifdef EIGHT_BIT_CONTROLS
2850 // 8-bit controls
2851 case 0x90: /* DCS */
2852 process_dcs_seq ();
2853 break;
2854 case 0x9b: /* CSI */
2855 process_csi_seq ();
2856 break;
2857 case 0x9d: /* CSI */
2858 process_osc_seq ();
2859 break;
2860#endif
2286 } 2861 }
2287} 2862}
2288/*}}} */ 2863/*}}} */
2289 2864
2290 2865
2291/*{{{ process VT52 escape sequences */ 2866/*{{{ process VT52 escape sequences */
2292void 2867void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 2868rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 2869{
2295 int row, col; 2870 int row, col;
2296 2871
2297 switch (ch) 2872 switch (ch)
2298 { 2873 {
… …
2350 2925
2351/*{{{ process escape sequences */ 2926/*{{{ process escape sequences */
2352void 2927void
2353rxvt_term::process_escape_seq () 2928rxvt_term::process_escape_seq ()
2354{ 2929{
2355 unsigned char ch = cmd_getc (); 2930 unicode_t ch = cmd_getc ();
2356 2931
2357 if (PrivateModes & PrivMode_vt52) 2932 if (priv_modes & PrivMode_vt52)
2358 { 2933 {
2359 process_escape_vt52 (ch); 2934 process_escape_vt52 (ch);
2360 return; 2935 return;
2361 } 2936 }
2362 2937
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 2952 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 2953 break;
2379 case '+': 2954 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 2955 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 2956 break;
2382#ifdef MULTICHAR_SET 2957#if ENABLE_FRILLS
2383 case '$':
2384 scr_charset_set (-2, (unsigned int)cmd_getc ());
2385 break;
2386#endif
2387#ifndef NO_FRILLS
2388 case '6': 2958 case '6':
2389 scr_backindex (); 2959 scr_backindex ();
2390 break; 2960 break;
2391#endif 2961#endif
2392 case '7': 2962 case '7':
2393 scr_cursor (SAVE); 2963 scr_cursor (SAVE);
2394 break; 2964 break;
2395 case '8': 2965 case '8':
2396 scr_cursor (RESTORE); 2966 scr_cursor (RESTORE);
2397 break; 2967 break;
2398#ifndef NO_FRILLS 2968#if ENABLE_FRILLS
2399 case '9': 2969 case '9':
2400 scr_forwardindex (); 2970 scr_forwardindex ();
2401 break; 2971 break;
2402#endif 2972#endif
2403 case '=': 2973 case '=':
… …
2413 break; 2983 break;
2414 2984
2415 /* 8.3.87: NEXT LINE */ 2985 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 2986 case C1_NEL: /* ESC E */
2417 { 2987 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 2988 unicode_t nlcr[] = { C0_LF, C0_CR };
2419 scr_add_lines (nlcr, 1, 2); 2989 scr_add_lines (nlcr, 1, 2);
2420 } 2990 }
2421 break; 2991 break;
2422 2992
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 2993 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2434 case C1_RI: /* ESC M */ 3004 case C1_RI: /* ESC M */
2435 scr_index (DN); 3005 scr_index (DN);
2436 break; 3006 break;
2437 3007
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 3008 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 3009 /*case C1_SS2: scr_single_shift (2); break; */
2440 3010
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 3011 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 3012 /*case C1_SS3: scr_single_shift (3); break; */
2443 3013
2444 /* 8.3.27: DEVICE CONTROL STRING */ 3014 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 3015 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 3016 process_dcs_seq ();
2447 break; 3017 break;
… …
2462 process_osc_seq (); 3032 process_osc_seq ();
2463 break; 3033 break;
2464 3034
2465 /* 8.3.106: RESET TO INITIAL STATE */ 3035 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 3036 case 'c':
3037 mbstate.reset ();
2467 scr_poweron (); 3038 scr_poweron ();
2468 scrollbar_show (1); 3039 scrollbar_show (1);
2469 break; 3040 break;
2470 3041
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3042 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2483 3054
2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3055/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2485/* *INDENT-OFF* */ 3056/* *INDENT-OFF* */
2486enum { 3057enum {
2487 CSI_ICH = 0x40, 3058 CSI_ICH = 0x40,
2488 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,
2489 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 ,
2490 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,
2491 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,
2492 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,
2493 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,
… …
2508 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3079 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2509 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3080 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2510 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3081 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2511 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3082 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2512 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3083 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2513 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3084 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2514 }; 3085 };
2515/* *INDENT-ON* */ 3086/* *INDENT-ON* */
2516 3087
2517void 3088void
2518rxvt_term::process_csi_seq () 3089rxvt_term::process_csi_seq ()
2519{ 3090{
2520 unsigned char ch, priv, i; 3091 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 3092 unsigned int nargs, p;
2522 int n, ndef; 3093 int n, ndef;
2523 int arg[ESC_ARGS]; 3094 int arg[ESC_ARGS];
2524 3095
2525 for (nargs = ESC_ARGS; nargs > 0;) 3096 for (nargs = ESC_ARGS; nargs > 0;)
2526 arg[--nargs] = 0; 3097 arg[--nargs] = 0;
2527 3098
2528 priv = 0; 3099 priv = 0;
… …
2530 if (ch >= '<' && ch <= '?') 3101 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 3102 { /* '<' '=' '>' '?' */
2532 priv = ch; 3103 priv = ch;
2533 ch = cmd_getc (); 3104 ch = cmd_getc ();
2534 } 3105 }
3106
2535 /* read any numerical arguments */ 3107 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 3108 for (n = -1; ch < CSI_ICH; )
2537 { 3109 {
2538 if (isdigit (ch)) 3110 if (isdigit (ch))
2539 { 3111 {
… …
2546 { 3118 {
2547 if (nargs < ESC_ARGS) 3119 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 3120 arg[nargs++] = n;
2549 n = -1; 3121 n = -1;
2550 } 3122 }
2551 else if (ch == '\b') 3123 else if (IS_CONTROL (ch))
2552 {
2553 scr_backspace ();
2554 }
2555 else if (ch == C0_ESC)
2556 {
2557 process_escape_seq ();
2558 return;
2559 }
2560 else if (ch < ' ')
2561 {
2562 process_nonprinting (ch); 3124 process_nonprinting (ch);
2563 } 3125
2564 ch = cmd_getc (); 3126 ch = cmd_getc ();
2565 } 3127 }
2566 3128
2567 if (ch > CSI_7F) 3129 if (ch > CSI_7F)
2568 return; 3130 return;
… …
2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2711 break; 3273 break;
2712 3274
2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2714 tt_write ((const unsigned char *)VT100_ANS, 3276 tt_write ((const unsigned char *)VT100_ANS,
2715 (unsigned int) (sizeof (VT100_ANS) - 1)); 3277 (unsigned int) (sizeof (VT100_ANS) - 1));
2716 break; 3278 break;
2717 3279
2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3280 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2719 process_sgr_mode (nargs, arg); 3281 process_sgr_mode (nargs, arg);
2720 break; 3282 break;
… …
2726 tt_printf ("\033[0n"); 3288 tt_printf ("\033[0n");
2727 break; 3289 break;
2728 case 6: /* CPR requested */ 3290 case 6: /* CPR requested */
2729 scr_report_position (); 3291 scr_report_position ();
2730 break; 3292 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 3293 case 7: /* unofficial extension */
3294 if (options & Opt_insecure)
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3295 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2734 break; 3296 break;
2735#endif
2736 case 8: /* unofficial extension */ 3297 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 3299 break;
2739 } 3300 }
2740 break; 3301 break;
2741 3302
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3303 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2775 break; 3336 break;
2776 3337
2777 case CSI_RM: /* 8.3.107: RESET MODE */ 3338 case CSI_RM: /* 8.3.107: RESET MODE */
2778 if (arg[0] == 4) 3339 if (arg[0] == 4)
2779 scr_insert_mode (0); 3340 scr_insert_mode (0);
3341 else if (arg[0] == 20)
3342 priv_modes &= ~PrivMode_LFNL;
2780 break; 3343 break;
2781 3344
2782 case CSI_SM: /* 8.3.126: SET MODE */ 3345 case CSI_SM: /* 8.3.126: SET MODE */
2783 if (arg[0] == 4) 3346 if (arg[0] == 4)
2784 scr_insert_mode (1); 3347 scr_insert_mode (1);
3348 else if (arg[0] == 20)
3349 priv_modes |= PrivMode_LFNL;
2785 break; 3350 break;
2786 3351
2787 /* 3352 /*
2788 * PRIVATE USE beyond this point. All CSI_7? sequences here 3353 * PRIVATE USE beyond this point. All CSI_7? sequences here
2789 */ 3354 */
… …
2801 break; 3366 break;
2802 case CSI_75: 3367 case CSI_75:
2803 scr_cursor (RESTORE); 3368 scr_cursor (RESTORE);
2804 break; 3369 break;
2805 3370
2806#ifndef NO_FRILLS 3371#if ENABLE_FRILLS
2807 case CSI_74: 3372 case CSI_74:
2808 process_window_ops (arg, nargs); 3373 process_window_ops (arg, nargs);
2809 break; 3374 break;
2810#endif 3375#endif
2811 3376
2812 case CSI_78: /* DECREQTPARM */ 3377 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 3378 if (arg[0] == 0 || arg[0] == 1)
2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3379 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2815 /* FALLTHROUGH */ 3380 break;
2816 3381
2817 default: 3382 default:
2818 break; 3383 break;
2819 } 3384 }
2820} 3385}
2821/*}}} */ 3386/*}}} */
2822 3387
2823#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
2824/* ARGSUSED */ 3389/* ARGSUSED */
2825void 3390void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3391rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 3392{
2828 int x, y; 3393 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 3394 XWindowAttributes wattr;
2833 Window wdummy; 3395 Window wdummy;
2834 3396
2835 if (nargs == 0) 3397 if (nargs == 0)
2836 return; 3398 return;
3399
2837 switch (args[0]) 3400 switch (args[0])
2838 { 3401 {
2839 /* 3402 /*
2840 * commands 3403 * commands
2841 */ 3404 */
2842 case 1: /* deiconify window */ 3405 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3406 XMapWindow (display->display, TermWin.parent[0]);
2844 break; 3407 break;
2845 case 2: /* iconify window */ 3408 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3409 XIconifyWindow (display->display, TermWin.parent[0],
… …
2863 break; 3426 break;
2864 case 8: /* set size (chars) */ 3427 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3428 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3429 (unsigned int) (args[1] * TermWin.fheight));
2867 break; 3430 break;
3431
3432 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3433 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3434 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3435 set_widthheight ((unsigned int)TermWin.width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3436 (unsigned int) (args[1] * TermWin.fheight));
2872 break; 3437 break;
3438
3439
2873 /* 3440 /*
2874 * reports - some output format copied from XTerm 3441 * reports - some output format copied from XTerm
2875 */ 3442 */
2876 case 11: /* report window state */ 3443 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3444 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3445 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3446 break;
2880 case 13: /* report window position */ 3447 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3448 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3449 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3450 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3451 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3452 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3453 break;
2887 case 14: /* report window size (pixels) */ 3454 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3455 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3456 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3457 break;
2891 case 18: /* report window size (chars) */ 3458 case 18: /* report text area size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3459 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2893 break; 3460 break;
2894#if 0 /* XXX: currently disabled due to security concerns */ 3461 case 19: /* report window size (chars) */
3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3463 break;
2895 case 20: /* report icon label */ 3464 case 20: /* report icon label */
3465 {
3466 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3467 XGetIconName (display->display, TermWin.parent[0], &s);
2897 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);
3470 }
2898 break; 3471 break;
2899 case 21: /* report window title */ 3472 case 21: /* report window title */
3473 {
3474 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3475 XFetchName (display->display, TermWin.parent[0], &s);
2901 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);
3478 }
2902 break; 3479 break;
2903#endif
2904
2905 } 3480 }
2906} 3481}
2907#endif 3482#endif
2908 3483
2909/*----------------------------------------------------------------------*/ 3484/*----------------------------------------------------------------------*/
2910/* 3485/*
2911 * get input up until STRING TERMINATOR (or BEL) 3486 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3487 * ends_how is terminator used. returned input must be free()'d
2913 */ 3488 */
2914unsigned char * 3489unsigned char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3490rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3491{
2917 int seen_esc = 0; /* seen escape? */ 3492 unicode_t prev = 0, ch;
2918 unsigned int n = 0; 3493 unsigned int n = 0;
2919 unsigned char *s; 3494 unsigned char *s;
2920 unsigned char ch, string[STRING_MAX]; 3495 unsigned char string[STRING_MAX];
2921 3496
2922 for (; (ch = cmd_getc ());) 3497 while ((ch = cmd_getc ()) != NOCHAR)
2923 { 3498 {
2924 if (ch == C0_BEL
2925 || ch == CHAR_ST
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2927 break;
2928 if (ch == C0_ESC) 3499 if (prev == C0_ESC)
2929 {
2930 seen_esc = 1;
2931 continue;
2932 } 3500 {
2933 else if (ch == '\t') 3501 if (ch == 0x5c) /* 7bit ST */
2934 ch = ' '; /* translate '\t' to space */ 3502 break;
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3503 else
3504 return NULL;
3505 }
3506 else if (ch == C0_BEL || ch == CHAR_ST)
3507 break;
3508 else if (ch < 0x20)
2936 return NULL; /* other control character - exit */ 3509 return NULL; /* other control character - exit */
3510
2937 if (n < sizeof (string) - 1) 3511 if (n >= sizeof (string) - 1)
3512 // stop at some sane length
3513 return NULL;
3514
3515 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else
2938 string[n++] = ch; 3521 string[n++] = prev = ch;
2939 seen_esc = 0;
2940 } 3522 }
3523
2941 string[n++] = '\0'; 3524 string[n++] = '\0';
3525
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2943 return NULL; 3527 return NULL;
3528
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3529 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3530 strncpy (s, string, n);
2946 return s; 3531 return s;
2947} 3532}
2948 3533
2949/*----------------------------------------------------------------------*/ 3534/*----------------------------------------------------------------------*/
2950/* 3535/*
2951 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3536 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2952 */ 3537 */
2953void 3538void
2954rxvt_term::process_dcs_seq () 3539rxvt_term::process_dcs_seq ()
2955{ 3540{
2956 unsigned char eh, *s; 3541 unsigned char *s;
3542 unicode_t eh;
3543
2957 /* 3544 /*
2958 * Not handled yet 3545 * Not handled yet
2959 */ 3546 */
2960 s = get_to_st (&eh); 3547 s = get_to_st (eh);
2961 if (s) 3548 if (s)
2962 free (s); 3549 free (s);
3550
2963 return; 3551 return;
2964} 3552}
2965 3553
2966/*----------------------------------------------------------------------*/ 3554/*----------------------------------------------------------------------*/
2967/* 3555/*
2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3556 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2969 */ 3557 */
2970void 3558void
2971rxvt_term::process_osc_seq () 3559rxvt_term::process_osc_seq ()
2972{ 3560{
2973 unsigned char ch, eh, *s; 3561 unicode_t ch, eh;
2974 int arg; 3562 int arg;
2975 3563
2976 ch = cmd_getc (); 3564 ch = cmd_getc ();
2977 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3565 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2978 arg = arg * 10 + (ch - '0'); 3566 arg = arg * 10 + (ch - '0');
2979 3567
2980 if (ch == ';') 3568 if (ch == ';')
2981 { 3569 {
2982 s = get_to_st (&eh); 3570 unsigned char *s = get_to_st (eh);
3571
2983 if (s) 3572 if (s)
2984 { 3573 {
2985 /*
2986 * rxvt_menubar_dispatch () violates the constness of the string,
2987 * so do it here
2988 */
2989 if (arg == XTerm_Menu)
2990#if 0 /* XXX: currently disabled due to security concerns */
2991 menubar_dispatch ((char *)s);
2992#else
2993 (void)0;
2994#endif
2995 else
2996 xterm_seq (arg, (char *)s, eh); 3574 process_xterm_seq (arg, (char *)s, eh);
2997 free (s); 3575 free (s);
2998 } 3576 }
2999 } 3577 }
3000} 3578}
3579
3580void
3581rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3582{
3583 if (str[0] == '?' && !str[1])
3584 {
3585 unsigned short r, g, b;
3586 pix_colors_focused[color].get (display, r, g, b);
3587 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3588 }
3589 else
3590 set_window_color (color, str);
3591}
3592
3001/* 3593/*
3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3594 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3003 * 0 = change iconName/title 3595 * 0 = change iconName/title
3004 * 1 = change iconName 3596 * 1 = change iconName
3005 * 2 = change title 3597 * 2 = change title
3006 * 4 = change color 3598 * 4 = change color
3599 * 10 = change fg color
3600 * 11 = change bg color
3007 * 12 = change text color 3601 * 12 = change text color
3008 * 13 = change mouse foreground color 3602 * 13 = change mouse foreground color
3009 * 17 = change highlight character colour 3603 * 17 = change highlight character colour
3010 * 18 = change bold character color 3604 * 18 = change bold character color
3011 * 19 = change underlined character color 3605 * 19 = change underlined character color
3012 * 46 = change logfile (not implemented) 3606 * 46 = change logfile (not implemented)
3013 * 50 = change font 3607 * 50 = change font
3014 * 3608 *
3015 * rxvt extensions: 3609 * rxvt extensions:
3016 * 10 = menu (may change in future)
3017 * 20 = bg pixmap 3610 * 20 = bg pixmap
3018 * 39 = change default fg color 3611 * 39 = change default fg color
3019 * 49 = change default bg color 3612 * 49 = change default bg color
3020 * 55 = dump scrollback buffer and all of screen 3613 * 55 = dump scrollback buffer and all of screen
3614 * 701 = change locale
3615 * 702 = find font
3616 * 703 = menu
3021 */ 3617 */
3022void 3618void
3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3619rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3024{ 3620{
3025 int changed = 0; 3621 int changed = 0;
3026 int color; 3622 int color;
3027 char *buf, *name; 3623 char *buf, *name;
3624 bool query = str[0] == '?' && !str[1];
3028 3625
3029 assert (str != NULL); 3626 assert (str != NULL);
3030 switch (op) 3627 switch (op)
3031 { 3628 {
3032 case XTerm_name: 3629 case XTerm_name:
3033 set_title (str); 3630 set_title (str);
3034 /* FALLTHROUGH */ 3631 /* FALLTHROUGH */
3035 case XTerm_iconName: 3632 case XTerm_iconName:
3036 set_iconName (str); 3633 set_icon_name (str);
3037 break; 3634 break;
3038 case XTerm_title: 3635 case XTerm_title:
3039 set_title (str); 3636 set_title (str);
3040 break; 3637 break;
3638 case XTerm_property:
3639 if (str[0] == '?')
3640 {
3641 Atom prop = XInternAtom (display->display, str + 1, True);
3642 Atom actual_type;
3643 int actual_format;
3644 unsigned long nitems;
3645 unsigned long bytes_after;
3646 unsigned char *value = 0;
3647 const char *str = "";
3648
3649 if (prop
3650 && XGetWindowProperty (display->display, TermWin.parent[0],
3651 prop, 0, 1<<16, 0, AnyPropertyType,
3652 &actual_type, &actual_format,
3653 &nitems, &bytes_after, &value) == Success
3654 && actual_type != None
3655 && actual_format == 8)
3656 str = (const char *)(value);
3657
3658 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3659
3660 XFree (value);
3661 }
3662 else
3663 {
3664 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665
3666 if (eq)
3667 {
3668 *eq = 0;
3669 XChangeProperty (display->display, TermWin.parent[0],
3670 display->atom (str), XA_STRING, 8,
3671 PropModeReplace, (unsigned char *)eq + 1,
3672 strlen (eq + 1));
3673 }
3674 else
3675 XDeleteProperty (display->display, TermWin.parent[0],
3676 display->atom (str));
3677 }
3678 break;
3679
3041 case XTerm_Color: 3680 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3681 for (buf = (char *)str; buf && *buf;)
3043 { 3682 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3683 if ((name = strchr (buf, ';')) == NULL)
3045 break; 3684 break;
3685
3046 *name++ = '\0'; 3686 *name++ = '\0';
3047 color = atoi (buf); 3687 color = atoi (buf);
3688
3048 if (color < 0 || color >= TOTAL_COLORS) 3689 if (color < 0 || color >= TOTAL_COLORS)
3049 break; 3690 break;
3691
3050 if ((buf = STRCHR (name, ';')) != NULL) 3692 if ((buf = strchr (name, ';')) != NULL)
3051 *buf++ = '\0'; 3693 *buf++ = '\0';
3694
3695 if (name[0] == '?' && !name[1])
3696 {
3697 unsigned short r, g, b;
3698 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3699 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3700 }
3701 else
3052 set_window_color (color + minCOLOR, name); 3702 set_window_color (color + minCOLOR, name);
3053 } 3703 }
3704 break;
3705 case XTerm_Color00:
3706 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3707 break;
3708 case XTerm_Color01:
3709 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3054 break; 3710 break;
3055#ifndef NO_CURSORCOLOR 3711#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3712 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3713 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3058 break; 3714 break;
3059#endif 3715#endif
3060 case XTerm_Color_pointer: 3716 case XTerm_Color_pointer_fg:
3061 set_window_color (Color_pointer, str); 3717 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3718 break;
3719 case XTerm_Color_pointer_bg:
3720 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3062 break; 3721 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3722#ifndef NO_BOLD_UNDERLINE_REVERSE
3064 case XTerm_Color_BD: 3723 case XTerm_Color_BD:
3065 set_window_color (Color_BD, str); 3724 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3066 break; 3725 break;
3067 case XTerm_Color_UL: 3726 case XTerm_Color_UL:
3068 set_window_color (Color_UL, str); 3727 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3069 break; 3728 break;
3070 case XTerm_Color_RV: 3729 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3730 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3072 break; 3731 break;
3073#endif 3732#endif
3074 3733
3075 case XTerm_Menu:
3076 /*
3077 * rxvt_menubar_dispatch () violates the constness of the string,
3078 * so DON'T do it here
3079 */
3080 break;
3081 case XTerm_Pixmap: 3734 case XTerm_Pixmap:
3082 if (*str != ';') 3735 if (*str != ';')
3083 { 3736 {
3084#if XPM_BACKGROUND 3737#if XPM_BACKGROUND
3085 scale_pixmap (""); /* reset to default scaling */ 3738 scale_pixmap (""); /* reset to default scaling */
3086 set_bgPixmap (str); /* change pixmap */ 3739 set_bgPixmap (str); /* change pixmap */
3087#endif 3740#endif
3088 scr_touch (true); 3741 scr_touch (true);
3089 } 3742 }
3090 while ((str = STRCHR (str, ';')) != NULL) 3743 while ((str = strchr (str, ';')) != NULL)
3091 { 3744 {
3092 str++; 3745 str++;
3093#if XPM_BACKGROUND 3746#if XPM_BACKGROUND
3094 changed += scale_pixmap (str); 3747 changed += scale_pixmap (str);
3095#endif 3748#endif
… …
3108 set_window_color (Color_fg, str); 3761 set_window_color (Color_fg, str);
3109 break; 3762 break;
3110 case XTerm_restoreBG: 3763 case XTerm_restoreBG:
3111 set_window_color (Color_bg, str); 3764 set_window_color (Color_bg, str);
3112 break; 3765 break;
3766
3113 case XTerm_logfile: 3767 case XTerm_logfile:
3768 // TODO, when secure mode?
3114 break; 3769 break;
3770
3115 case XTerm_font: 3771 case XTerm_font:
3772 if (query)
3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3775 ? TermWin.fontset->fontdesc : "",
3776 resp);
3777 else
3116 change_font (0, str); 3778 change_font (str);
3779 break;
3780
3781#if ENABLE_FRILLS
3782 case XTerm_locale:
3783 if (query)
3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3785 else
3786 {
3787 set_locale (str);
3788# ifdef USE_XIM
3789 im_cb ();
3790# endif
3791 }
3792 break;
3793
3794 case XTerm_findfont:
3795 {
3796 int fid = TermWin.fontset->find_font (atoi (str));
3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3801 }
3802 break;
3803#endif
3804
3805#ifdef MENUBAR
3806 case XTerm_Menu:
3807 if (options & Opt_insecure)
3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3117 break; 3809 break;
3810#endif
3118#if 0 3811#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3812 case XTerm_dumpscreen: /* no error notices */
3120 { 3813 {
3121 int fd; 3814 int fd;
3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3815 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3123 { 3816 {
3124 scr_dump (fd); 3817 scr_dump (fd);
3125 close (fd); 3818 close (fd);
3126 } 3819 }
3127 } 3820 }
3128 break; 3821 break;
3129#endif 3822#endif
3130
3131 } 3823 }
3132} 3824}
3133/*----------------------------------------------------------------------*/ 3825/*----------------------------------------------------------------------*/
3134 3826
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3827/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 3835 * so no need for fancy checking
3144 */ 3836 */
3145int 3837int
3146rxvt_term::privcases (int mode, unsigned long bit) 3838rxvt_term::privcases (int mode, unsigned long bit)
3147{ 3839{
3148 int state; 3840 int state;
3149 3841
3150 if (mode == 's') 3842 if (mode == 's')
3151 { 3843 {
3152 SavedModes |= (PrivateModes & bit); 3844 SavedModes |= (priv_modes & bit);
3153 return -1; 3845 return -1;
3154 } 3846 }
3155 else 3847 else
3156 { 3848 {
3157 if (mode == 'r') 3849 if (mode == 'r')
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3850 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 3851 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3852 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3161 PrivMode (state, bit); 3853 PrivMode (state, bit);
3162 } 3854 }
3855
3163 return state; 3856 return state;
3164} 3857}
3165 3858
3166/* we're not using priv _yet_ */ 3859/* we're not using priv _yet_ */
3167void 3860void
3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3861rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3169{ 3862{
3170 unsigned int i, j; 3863 unsigned int i, j;
3171 int state; 3864 int state;
3865
3172 static const struct 3866 static const struct
3173 { 3867 {
3174 const int argval; 3868 const int argval;
3175 const unsigned long bit; 3869 const unsigned long bit;
3176 } 3870 }
3871
3177 argtopriv[] = { 3872 argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 3873 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 3874 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 3875 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 3876 { 4, PrivMode_smoothScroll },
3182 { 5, PrivMode_rVideo }, 3877 { 5, PrivMode_rVideo },
3183 { 6, PrivMode_relOrigin }, 3878 { 6, PrivMode_relOrigin },
3184 { 7, PrivMode_Autowrap }, 3879 { 7, PrivMode_Autowrap },
3880 // 8, bi-directional support mode
3185 { 9, PrivMode_MouseX10 }, 3881 { 9, PrivMode_MouseX10 },
3186#ifdef menuBar_esc 3882#ifdef menuBar_esc
3187 { menuBar_esc, PrivMode_menuBar }, 3883 { menuBar_esc, PrivMode_menuBar },
3188#endif 3884#endif
3885 // 18, 19 printing-related
3886 { 25, PrivMode_VisibleCursor },
3189#ifdef scrollBar_esc 3887#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 3888 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 3889#endif
3192 { 25, PrivMode_VisibleCursor },
3193 { 35, PrivMode_ShiftKeys }, 3890 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 3891 { 40, PrivMode_132OK },
3892 // 41 xterm more fixes NYI
3893 // 45 margin bell NYI
3894 // 46 start logging
3195 { 47, PrivMode_Screen }, 3895 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 3896 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 3897#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 3898 { 67, PrivMode_BackSpace },
3199#endif 3899#endif
3200 { 1000, PrivMode_MouseX11 }, 3900 { 1000, PrivMode_MouseX11 },
3901 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3902 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3903 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3201 { 1010, PrivMode_TtyOutputInh }, 3904 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 1011, PrivMode_Keypress }, 3905 { 1011, PrivMode_Keypress }, // rxvt extension
3906 // 1035 enable modifiers for alt, numlock NYI
3907 // 1036 send ESC for meta keys NYI
3908 // 1037 send DEL for keypad delete NYI
3203 { 1047, PrivMode_Screen }, 3909 { 1047, PrivMode_Screen },
3910 // 1048 save and restore cursor
3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3911 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3912 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3205 }; 3913 };
3206 3914
3207 if (nargs == 0) 3915 if (nargs == 0)
3208 return; 3916 return;
3209 3917
… …
3224 state = privcases (mode, argtopriv[j].bit); 3932 state = privcases (mode, argtopriv[j].bit);
3225 break; 3933 break;
3226 } 3934 }
3227 3935
3228 /* extra handling for values with state unkept */ 3936 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 3937 switch (arg[i])
3231 { 3938 {
3232 case 1048: /* alternative cursor save */ 3939 case 1048: /* alternative cursor save */
3940 if (options & Opt_secondaryScreen)
3233 if (mode == 0) 3941 if (mode == 0)
3234 scr_cursor (RESTORE); 3942 scr_cursor (RESTORE);
3235 else if (mode == 1) 3943 else if (mode == 1)
3236 scr_cursor (SAVE); 3944 scr_cursor (SAVE);
3237 /* FALLTHROUGH */
3238 default:
3239 continue; /* for (;i;) */
3240 }
3241
3242 /* extra handling for values with valid 0 or 1 state */
3243 switch (arg[i])
3244 {
3245 /* case 1: - application cursor keys */
3246 case 2: /* VT52 mode */
3247 /* oddball mode. should be set regardless of set/reset
3248 * parameter. Return from VT52 mode with an ESC < from
3249 * within VT52 mode
3250 */
3251 PrivMode (1, PrivMode_vt52);
3252 break; 3945 break;
3946 }
3947
3948 if (state >= 0)
3949 /* extra handling for values with valid 0 or 1 state */
3950 switch (arg[i])
3951 {
3952 /* case 1: - application cursor keys */
3953 case 2: /* VT52 mode */
3954 /* oddball mode. should be set regardless of set/reset
3955 * parameter. Return from VT52 mode with an ESC < from
3956 * within VT52 mode
3957 */
3958 PrivMode (1, PrivMode_vt52);
3959 break;
3253 case 3: /* 80/132 */ 3960 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 3961 if (priv_modes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3256 (unsigned int)TermWin.height);
3257 break; 3963 break;
3258 case 4: /* smooth scrolling */ 3964 case 4: /* smooth scrolling */
3259 if (state) 3965 if (state)
3260 Options &= ~Opt_jumpScroll; 3966 options &= ~Opt_jumpScroll;
3261 else 3967 else
3262 Options |= Opt_jumpScroll; 3968 options |= Opt_jumpScroll;
3263 break; 3969 break;
3264 case 5: /* reverse video */ 3970 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 3971 scr_rvideo_mode (state);
3266 break; 3972 break;
3267 case 6: /* relative/absolute origins */ 3973 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 3974 scr_relative_origin (state);
3269 break; 3975 break;
3270 case 7: /* autowrap */ 3976 case 7: /* autowrap */
3271 scr_autowrap (state); 3977 scr_autowrap (state);
3272 break; 3978 break;
3273 /* 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 */
3274 case 9: /* X10 mouse reporting */ 3980 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 3981 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 3982 priv_modes &= ~PrivMode_MouseX11;
3277 break; 3983 break;
3278#ifdef menuBar_esc 3984#ifdef menuBar_esc
3279 case menuBar_esc: 3985 case menuBar_esc:
3280#ifdef MENUBAR 3986#ifdef MENUBAR
3281 map_menuBar (state); 3987 map_menuBar (state);
3282#endif 3988#endif
3283 break; 3989 break;
3284#endif 3990#endif
3285#ifdef scrollBar_esc 3991#ifdef scrollBar_esc
3286 case scrollBar_esc: 3992 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 3993 if (scrollbar_mapping (state))
3288 { 3994 {
3289 resize_all_windows (0, 0, 0); 3995 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 3996 scr_touch (true);
3291 } 3997 }
3292 break; 3998 break;
3293#endif 3999#endif
3294 case 25: /* visible/invisible cursor */ 4000 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 4001 scr_cursor_visible (state);
3296 break; 4002 break;
3297 /* case 35: - shift keys */ 4003 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 4004 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 4005 case 47: /* secondary screen */
3300 scr_change_screen (state); 4006 scr_change_screen (state);
3301 break; 4007 break;
3302 /* case 66: - application key pad */ 4008 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 4009 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 4010 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 4011 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 4012 priv_modes &= ~PrivMode_MouseX10;
3307 break; 4013 break;
3308#if 0 4014#if 0
3309 case 1001: 4015 case 1001:
3310 break; /* X11 mouse highlighting */ 4016 break; /* X11 mouse highlighting */
3311#endif 4017#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 4018 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state) 4019 if (state)
3314 Options &= ~Opt_scrollTtyOutput; 4020 options &= ~Opt_scrollTtyOutput;
3315 else 4021 else
3316 Options |= Opt_scrollTtyOutput; 4022 options |= Opt_scrollTtyOutput;
3317 break; 4023 break;
3318 case 1011: /* scroll to bottom on key press */ 4024 case 1011: /* scroll to bottom on key press */
3319 if (state) 4025 if (state)
3320 Options |= Opt_scrollTtyKeypress; 4026 options |= Opt_scrollTtyKeypress;
3321 else 4027 else
3322 Options &= ~Opt_scrollTtyKeypress; 4028 options &= ~Opt_scrollTtyKeypress;
3323 break; 4029 break;
3324 case 1047: /* secondary screen w/ clearing */ 4030 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4031 if (options & Opt_secondaryScreen)
3326 if (current_screen != PRIMARY) 4032 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 4033 scr_erase_screen (2);
3328 scr_change_screen (state); 4034 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 break; 4035 break;
4036 case 1049: /* secondary screen w/ clearing first */
4037 scr_change_screen (state);
4038 if (options & Opt_secondaryScreen)
4039 if (current_screen != PRIMARY)
4040 scr_erase_screen (2);
4041 break;
4042 default:
4043 break;
3332 } 4044 }
3333 } 4045 }
3334} 4046}
3335/*}}} */ 4047/*}}} */
3336 4048
3337/*{{{ process sgr sequences */ 4049/*{{{ process sgr sequences */
3338void 4050void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4051rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 4052{
3341 unsigned int i; 4053 unsigned int i;
3342 short rendset; 4054 short rendset;
3343 int rendstyle; 4055 int rendstyle;
3344 4056
3345 if (nargs == 0) 4057 if (nargs == 0)
3346 { 4058 {
3347 scr_rendition (0, ~RS_None); 4059 scr_rendition (0, ~RS_None);
3348 return; 4060 return;
3349 } 4061 }
4062
3350 for (i = 0; i < nargs; i++) 4063 for (i = 0; i < nargs; i++)
3351 { 4064 {
3352 rendset = -1; 4065 rendset = -1;
3353 switch (arg[i]) 4066 switch (arg[i])
3354 { 4067 {
… …
3356 rendset = 0, rendstyle = ~RS_None; 4069 rendset = 0, rendstyle = ~RS_None;
3357 break; 4070 break;
3358 case 1: 4071 case 1:
3359 rendset = 1, rendstyle = RS_Bold; 4072 rendset = 1, rendstyle = RS_Bold;
3360 break; 4073 break;
4074 //case 2: // faint or second colour
4075 //case 3: // italic
3361 case 4: 4076 case 4:
3362 rendset = 1, rendstyle = RS_Uline; 4077 rendset = 1, rendstyle = RS_Uline;
3363 break; 4078 break;
3364 case 5: 4079 case 5: // slowly blinking
4080 case 6: // rapidly blinking
3365 rendset = 1, rendstyle = RS_Blink; 4081 rendset = 1, rendstyle = RS_Blink;
3366 break; 4082 break;
4083 //case 6: // scoansi light background
3367 case 7: 4084 case 7:
3368 rendset = 1, rendstyle = RS_RVid; 4085 rendset = 1, rendstyle = RS_RVid;
4086 break;
4087 case 8:
4088 // invisible. NYI
4089 break;
4090 //case 9: // crossed out
4091 //case 10: // scoansi acs off, primary font
4092 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font
4094 //...
4095 //case 19: // ninth alt font
4096 //case 20: // gothic
4097 case 21: // disable bold, faint
4098 rendset = 0, rendstyle = RS_Bold;
3369 break; 4099 break;
3370 case 22: 4100 case 22:
3371 rendset = 0, rendstyle = RS_Bold; 4101 rendset = 0, rendstyle = RS_Bold;
3372 break; 4102 break;
4103 //case 23: disable italic
3373 case 24: 4104 case 24:
3374 rendset = 0, rendstyle = RS_Uline; 4105 rendset = 0, rendstyle = RS_Uline;
3375 break; 4106 break;
3376 case 25: 4107 case 25:
3377 rendset = 0, rendstyle = RS_Blink; 4108 rendset = 0, rendstyle = RS_Blink;
3378 break; 4109 break;
4110 case 26:
4111 rendset = 0, rendstyle = RS_Blink;
4112 break;
3379 case 27: 4113 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 4114 rendset = 0, rendstyle = RS_RVid;
3381 break; 4115 break;
4116 //case 28: // visible. NYI
4117 //case 29: // not crossed-out
3382 } 4118 }
4119
3383 if (rendset != -1) 4120 if (rendset != -1)
3384 { 4121 {
3385 scr_rendition (rendset, rendstyle); 4122 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 4123 continue; /* for (;i;) */
3387 } 4124 }
… …
3394 case 33: 4131 case 33:
3395 case 34: 4132 case 34:
3396 case 35: 4133 case 35:
3397 case 36: 4134 case 36:
3398 case 37: 4135 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4136 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 4137 break;
3402#ifdef TTY_256COLOR 4138#ifdef TTY_256COLOR
3403 case 38: 4139 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 4140 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 4141 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4142 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 4143 i += 2;
3409 } 4144 }
3410 break; 4145 break;
3411#endif 4146#endif
3412 case 39: /* default fg */ 4147 case 39: /* default fg */
… …
3419 case 43: 4154 case 43:
3420 case 44: 4155 case 44:
3421 case 45: 4156 case 45:
3422 case 46: 4157 case 46:
3423 case 47: 4158 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4159 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 4160 break;
3427#ifdef TTY_256COLOR 4161#ifdef TTY_256COLOR
3428 case 48: 4162 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 4163 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 4164 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4165 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 4166 i += 2;
3434 } 4167 }
3435 break; 4168 break;
3436#endif 4169#endif
3437 case 49: /* default bg */ 4170 case 49: /* default bg */
… …
3466 } 4199 }
3467 } 4200 }
3468} 4201}
3469/*}}} */ 4202/*}}} */
3470 4203
3471/*{{{ process Rob Nation's own graphics mode sequences */ 4204/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3472void 4205void
3473rxvt_term::process_graphics () 4206rxvt_term::process_graphics ()
3474{ 4207{
3475 unsigned char ch, cmd = cmd_getc (); 4208 unicode_t ch, cmd = cmd_getc ();
3476 4209
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 4210 if (cmd == 'Q')
3479 { /* query graphics */ 4211 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 4212 tt_printf ("\033G0\012"); /* no graphics */
3481 return; 4213 return;
3482 } 4214 }
3483 /* swallow other graphics sequences until terminating ':' */ 4215 /* swallow other graphics sequences until terminating ':' */
3484 do 4216 do
3485 ch = cmd_getc (); 4217 ch = cmd_getc ();
3486 while (ch != ':'); 4218 while (ch != ':');
3487#else
3488 unsigned int nargs;
3489 int args[NGRX_PTS];
3490 unsigned char *text = NULL;
3491
3492 if (cmd == 'Q')
3493 { /* query graphics */
3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3495 return;
3496 }
3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3498 {
3499 int neg;
3500
3501 ch = cmd_getc ();
3502 neg = (ch == '-');
3503 if (neg || ch == '+')
3504 ch = cmd_getc ();
3505
3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3508 if (neg)
3509 args[nargs] = -args[nargs];
3510
3511 nargs++;
3512 args[nargs] = 0;
3513 if (ch != ';')
3514 break;
3515 }
3516
3517 if ((cmd == 'T') && (nargs >= 5))
3518 {
3519 int i, len = args[4];
3520
3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3522
3523 if (text != NULL)
3524 {
3525 for (i = 0; i < len; i++)
3526 text[i] = cmd_getc ();
3527 text[len] = '\0';
3528 }
3529 }
3530 Gr_do_graphics (cmd, nargs, args, text);
3531#endif
3532} 4219}
3533/*}}} */ 4220/*}}} */
3534 4221
3535/* ------------------------------------------------------------------------- */ 4222/* ------------------------------------------------------------------------- */
3536 4223
… …
3545 unsigned char buf[256]; 4232 unsigned char buf[256];
3546 4233
3547 va_start (arg_ptr, fmt); 4234 va_start (arg_ptr, fmt);
3548 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4235 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3549 va_end (arg_ptr); 4236 va_end (arg_ptr);
3550 tt_write (buf, STRLEN (buf)); 4237 tt_write (buf, strlen (buf));
3551} 4238}
3552 4239
3553/* ---------------------------------------------------------------------- */ 4240/* ---------------------------------------------------------------------- */
3554/* 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,
3555 * or generated by us in response to a query ESC sequence. 4242 * or generated by us in response to a query ESC sequence.
… …
3561 4248
3562 if (len) 4249 if (len)
3563 { 4250 {
3564 if (v_buflen == 0) 4251 if (v_buflen == 0)
3565 { 4252 {
3566 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));
3567 4254
3568 if ((unsigned int)written == len) 4255 if ((unsigned int)written == len)
3569 return; 4256 return;
3570 4257
3571 data += written; 4258 data += written;
… …
3579 v_buflen += len; 4266 v_buflen += len;
3580 } 4267 }
3581 4268
3582 for (;;) 4269 for (;;)
3583 { 4270 {
3584 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));
3585 4272
3586 if (written > 0) 4273 if (written > 0)
3587 { 4274 {
3588 v_buflen -= written; 4275 v_buflen -= written;
3589 4276

Diff Legend

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