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.40 by pcg, Mon Feb 9 22:45:29 2004 UTC vs.
Revision 1.59 by pcg, Wed Feb 25 15:39:48 2004 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
55 56
56/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
57void 58void
58rxvt_term::lookup_key (XKeyEvent &ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
59{ 60{
60 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
61 unsigned int newlen; 62 unsigned int newlen;
62 KeySym keysym; 63 KeySym keysym;
63#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
65#endif 66#endif
66 int valid_keysym; 67 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
68 69
69 /* 70 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
… …
77 meta = (ev.state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (numlock_state || (ev.state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 numlock_state = (ev.state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 84 }
84 85
85 kbuf[0] = 0; 86 kbuf[0] = 0;
86 87
87#ifdef USE_XIM 88#ifdef USE_XIM
88 if (Input_Context) 89 if (Input_Context)
89 { 90 {
90 Status status_return; 91 Status status_return;
91 92
92#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
96 else 97 else
97#endif 98#endif
98
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
… …
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 { 114 {
115 /* make sure the user can type ctrl-@, i.e. NUL */
116 if (len == 1 && *wkbuf == 0)
117 {
118 kbuf[0] = 0;
119 len = 1;
120 }
121 else
122 {
115 wkbuf[len] = 0; 123 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 125 if (len < 0)
118 len = 0; 126 len = 0;
127 }
119 } 128 }
120 else 129 else
121 len = 0; 130 len = 0;
122 } 131 }
123 132
124 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
126 } 135 }
127 else 136 else
128#endif 137#endif
129
130 { 138 {
131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
133 } 141 }
134 142
135 if (valid_keysym) 143 if (valid_keysym)
136 { 144 {
137 /* for some backwards compatibility */ 145 /* for some backwards compatibility */
… …
142 if (meta) 150 if (meta)
143# endif 151# endif
144 { 152 {
145 if (keysym == ks_bigfont) 153 if (keysym == ks_bigfont)
146 { 154 {
147 change_font (0, FONT_UP); 155 change_font (FONT_UP);
148 return; 156 return;
149 } 157 }
150 else if (keysym == ks_smallfont) 158 else if (keysym == ks_smallfont)
151 { 159 {
152 change_font (0, FONT_DN); 160 change_font (FONT_DN);
153 return; 161 return;
154 } 162 }
155 } 163 }
156#endif 164#endif
157 165
… …
162 { 170 {
163#else 171#else
164 if (IS_SCROLL_MOD) 172 if (IS_SCROLL_MOD)
165 { 173 {
166#endif 174#endif
167 int lnsppg; 175 int lnsppg;
168 176
169#ifdef PAGING_CONTEXT_LINES 177#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 178 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 179#else
172 lnsppg = TermWin.nrow * 4 / 5; 180 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 218 scr_move_to (1, 0);
211 return; 219 return;
212 } 220 }
213 } 221 }
214#endif 222#endif
215
216 } 223 }
217 224
218 if (shft) 225 if (shft)
219 { 226 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 227 /* Shift + F1 - F10 generates F11 - F20 */
… …
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 238 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev.time, 0, 0); 239 selection_request (ev.time, 0, 0);
233 return; 240 return;
234 /* rxvt extras */ 241 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 242 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 243 change_font (FONT_UP);
237 return; 244 return;
238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 245 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
239 change_font (0, FONT_DN); 246 change_font (FONT_DN);
240 return; 247 return;
241 } 248 }
242 } 249 }
243 } 250 }
244#ifdef PRINTPIPE 251#ifdef PRINTPIPE
… …
246 { 253 {
247 scr_printscreen (ctrl | shft); 254 scr_printscreen (ctrl | shft);
248 return; 255 return;
249 } 256 }
250#endif 257#endif
251#ifdef GREEK_SUPPORT
252 if (keysym == ks_greekmodeswith)
253 {
254 greek_mode = !greek_mode;
255 if (greek_mode)
256 {
257 xterm_seq (XTerm_title,
258 (greek_getmode() == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset();
261 }
262 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return;
265 }
266#endif
267 258
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 259 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 { 260 {
270#ifdef KEYSYM_RESOURCE 261#ifdef KEYSYM_RESOURCE
271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 263 {
273 unsigned int l; 264 unsigned int l;
274 const unsigned char *kbuf0; 265 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC; 266 const unsigned char ch = C0_ESC;
276 267
… …
286 tt_write (kbuf0, l); 277 tt_write (kbuf0, l);
287 return; 278 return;
288 } 279 }
289 else 280 else
290#endif 281#endif
291
292 { 282 {
293 newlen = 1; 283 newlen = 1;
294 switch (keysym) 284 switch (keysym)
295 { 285 {
296#ifndef NO_BACKSPACE_KEY 286#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 287 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 288 if (PrivateModes & PrivMode_HaveBackSpace)
299 { 289 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 290 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 291 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 292 kbuf[1] = '\0';
303 } 293 }
304 else 294 else
305 STRCPY(kbuf, key_backspace); 295 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET 296# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0) 297 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 { 298 {
309 int col, row; 299 int col, row;
310 300
311 newlen = STRLEN(kbuf); 301 newlen = STRLEN (kbuf);
312 col = screen.cur.col - 1; 302 col = screen.cur.col - 1;
313 row = screen.cur.row + TermWin.saveLines; 303 row = screen.cur.row + TermWin.saveLines;
314 if (IS_MULTI2(screen.rend[row][col])) 304 if (IS_MULTI2 (screen.rend[row][col]))
315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 305 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
316 } 306 }
317# endif 307# endif
318 break; 308 break;
319#endif 309#endif
320#ifndef NO_DELETE_KEY 310#ifndef NO_DELETE_KEY
321 case XK_Delete: 311 case XK_Delete:
322 STRCPY(kbuf, key_delete); 312 STRCPY (kbuf, key_delete);
323# ifdef MULTICHAR_SET 313# ifdef MULTICHAR_SET
324 if (Options & Opt_mc_hack) 314 if (Options & Opt_mc_hack)
325 { 315 {
326 int col, row; 316 int col, row;
327 317
328 newlen = STRLEN(kbuf); 318 newlen = STRLEN (kbuf);
329 col = screen.cur.col; 319 col = screen.cur.col;
330 row = screen.cur.row + TermWin.saveLines; 320 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col])) 321 if (IS_MULTI1 (screen.rend[row][col]))
332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 322 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
333 } 323 }
334# endif 324# endif
335 break; 325 break;
336#endif 326#endif
337 case XK_Tab: 327 case XK_Tab:
338 if (shft) 328 if (shft)
339 STRCPY(kbuf, "\033[Z"); 329 STRCPY (kbuf, "\033[Z");
340 else 330 else
341 { 331 {
342#ifdef CTRL_TAB_MAKES_META 332#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 333 if (ctrl)
344 meta = 1; 334 meta = 1;
… …
348 meta = 1; 338 meta = 1;
349#endif 339#endif
350 newlen = 0; 340 newlen = 0;
351 } 341 }
352 break; 342 break;
353
354 343
355#ifdef XK_KP_Left 344#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 345 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 346 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 347 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 348 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 349 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 350 {
362 STRCPY(kbuf, "\033OZ"); 351 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 352 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 353 break;
365 } 354 }
366 else 355 else
367 /* translate to std. cursor key */ 356 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 357 keysym = XK_Left + (keysym - XK_KP_Left);
… …
370#endif 359#endif
371 case XK_Up: /* "\033[A" */ 360 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 361 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 362 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 363 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 364 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 365 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 366 /* do Shift first */
378 if (shft) 367 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 368 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 369 else if (ctrl)
381 { 370 {
382 kbuf[1] = 'O'; 371 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 372 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 373 }
385 else if (PrivateModes & PrivMode_aplCUR) 374 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 375 kbuf[1] = 'O';
387#ifdef MULTICHAR_SET 376#ifdef MULTICHAR_SET
388 //TODO: ?? 377 //TODO: ??
… …
392 381
393 col = screen.cur.col; 382 col = screen.cur.col;
394 row = screen.cur.row + TermWin.saveLines; 383 row = screen.cur.row + TermWin.saveLines;
395 m = 0; 384 m = 0;
396 if (keysym == XK_Right 385 if (keysym == XK_Right
397 && IS_MULTI1(screen.rend[row][col])) 386 && IS_MULTI1 (screen.rend[row][col]))
398 m = 1; 387 m = 1;
399 else if (keysym == XK_Left) 388 else if (keysym == XK_Left)
400 { 389 {
401 if (col > 0) 390 if (col > 0)
402 { 391 {
403 if (IS_MULTI2(screen.rend[row][col - 1])) 392 if (IS_MULTI2 (screen.rend[row][col - 1]))
404 m = 1; 393 m = 1;
405 } 394 }
406 else if (screen.cur.row > 0) 395 else if (screen.cur.row > 0)
407 { 396 {
408 col = screen.tlen[--row]; 397 col = screen.tlen[--row];
409 if (col == -1) 398 if (col == -1)
410 col = TermWin.ncol - 1; 399 col = TermWin.ncol - 1;
411 else 400 else
412 col--; 401 col--;
413 if (col > 0 402 if (col > 0
414 && IS_MULTI2(screen.rend[row][col])) 403 && IS_MULTI2 (screen.rend[row][col]))
415 m = 1; 404 m = 1;
416 } 405 }
417 } 406 }
418 if (m) 407 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 408 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
420 } 409 }
421#endif 410#endif
422 break; 411 break;
423 412
424#ifndef UNSHIFTED_SCROLLKEYS 413#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 414# ifdef XK_KP_Prior
426 case XK_KP_Prior: 415 case XK_KP_Prior:
427 /* allow shift to override */ 416 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 417 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
429 { 418 {
430 STRCPY(kbuf, "\033Oy"); 419 STRCPY (kbuf, "\033Oy");
431 break; 420 break;
432 } 421 }
433 /* FALLTHROUGH */ 422 /* FALLTHROUGH */
434# endif 423# endif
435 case XK_Prior: 424 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 425 STRCPY (kbuf, "\033[5~");
437 break; 426 break;
438# ifdef XK_KP_Next 427# ifdef XK_KP_Next
439 case XK_KP_Next: 428 case XK_KP_Next:
440 /* allow shift to override */ 429 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 430 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 { 431 {
443 STRCPY(kbuf, "\033Os"); 432 STRCPY (kbuf, "\033Os");
444 break; 433 break;
445 } 434 }
446 /* FALLTHROUGH */ 435 /* FALLTHROUGH */
447# endif 436# endif
448 case XK_Next: 437 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 438 STRCPY (kbuf, "\033[6~");
450 break; 439 break;
451#endif 440#endif
452 case XK_KP_Enter: 441 case XK_KP_Enter:
453 /* allow shift to override */ 442 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 443 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 { 444 {
456 STRCPY(kbuf, "\033OM"); 445 STRCPY (kbuf, "\033OM");
457 } 446 }
458 else 447 else
459 { 448 {
460 kbuf[0] = '\r'; 449 kbuf[0] = '\r';
461 kbuf[1] = '\0'; 450 kbuf[1] = '\0';
462 } 451 }
463 break; 452 break;
464 453
465#ifdef XK_KP_Begin 454#ifdef XK_KP_Begin
466 case XK_KP_Begin: 455 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 456 STRCPY (kbuf, "\033Ou");
468 break; 457 break;
469 458
470 case XK_KP_Insert: 459 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op"); 460 STRCPY (kbuf, "\033Op");
472 break; 461 break;
473 462
474 case XK_KP_Delete: 463 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On"); 464 STRCPY (kbuf, "\033On");
476 break; 465 break;
477#endif 466#endif
478 case XK_KP_F1: /* "\033OP" */ 467 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 468 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 469 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 470 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 471 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 472 kbuf[2] += (keysym - XK_KP_F1);
484 break; 473 break;
485 474
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 475 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 476 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 477 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 478 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 479 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 480 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 481 case XK_KP_0: /* "\033Op" : "0" */
… …
500 case XK_KP_8: /* "\033Ox" : "8" */ 489 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 490 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 491 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 492 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
504 { 493 {
505 STRCPY(kbuf, "\033Oj"); 494 STRCPY (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 495 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 496 }
508 else 497 else
509 { 498 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 499 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 500 kbuf[1] = '\0';
512 } 501 }
513 break; 502 break;
514 503
515 case XK_Find: 504 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 505 STRCPY (kbuf, "\033[1~");
517 break; 506 break;
518 case XK_Insert: 507 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 508 STRCPY (kbuf, "\033[2~");
520 break; 509 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 510#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 511 case DXK_Remove:
523 /* FALLTHROUGH */ 512 /* FALLTHROUGH */
524#endif 513#endif
525 case XK_Execute: 514 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 515 STRCPY (kbuf, "\033[3~");
527 break; 516 break;
528 case XK_Select: 517 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 518 STRCPY (kbuf, "\033[4~");
530 break; 519 break;
531#ifdef XK_KP_End 520#ifdef XK_KP_End
532 case XK_KP_End: 521 case XK_KP_End:
533 /* allow shift to override */ 522 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 523 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
535 { 524 {
536 STRCPY(kbuf, "\033Oq"); 525 STRCPY (kbuf, "\033Oq");
537 break; 526 break;
538 } 527 }
539 /* FALLTHROUGH */ 528 /* FALLTHROUGH */
540#endif 529#endif
541 case XK_End: 530 case XK_End:
542 STRCPY(kbuf, KS_END); 531 STRCPY (kbuf, KS_END);
543 break; 532 break;
544#ifdef XK_KP_Home 533#ifdef XK_KP_Home
545 case XK_KP_Home: 534 case XK_KP_Home:
546 /* allow shift to override */ 535 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 536 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
548 { 537 {
549 STRCPY(kbuf, "\033Ow"); 538 STRCPY (kbuf, "\033Ow");
550 break; 539 break;
551 } 540 }
552 /* FALLTHROUGH */ 541 /* FALLTHROUGH */
553#endif 542#endif
554 case XK_Home: 543 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 544 STRCPY (kbuf, KS_HOME);
556 break; 545 break;
557 546
558#define FKEY(n, fkey) \ 547#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 548 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 549
561 case XK_F1: /* "\033[11~" */ 550 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 551 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 552 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 553 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 554 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 555 FKEY (11, XK_F1);
567 break; 556 break;
568 case XK_F6: /* "\033[17~" */ 557 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 558 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 559 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 560 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 561 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 562 FKEY (17, XK_F6);
574 break; 563 break;
575 case XK_F11: /* "\033[23~" */ 564 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 565 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 566 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 567 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 568 FKEY (23, XK_F11);
580 break; 569 break;
581 case XK_F15: /* "\033[28~" */ 570 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 571 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 572 FKEY (28, XK_F15);
584 break; 573 break;
585 case XK_Help: /* "\033[28~" */ 574 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 575 FKEY (28, XK_Help);
587 break; 576 break;
588 case XK_Menu: /* "\033[29~" */ 577 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 578 FKEY (29, XK_Menu);
590 break; 579 break;
591 case XK_F17: /* "\033[31~" */ 580 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 581 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 582 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 583 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 594 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 595 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 596 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 597 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 598 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 599 FKEY (31, XK_F17);
611 break; 600 break;
612#undef FKEY 601#undef FKEY
613 default: 602 default:
614 newlen = 0; 603 newlen = 0;
615 break; 604 break;
616 } 605 }
617 if (newlen) 606 if (newlen)
618 len = STRLEN(kbuf); 607 len = STRLEN (kbuf);
619 } 608 }
620 /* 609 /*
621 * Pass meta for all function keys, if 'meta' option set 610 * Pass meta for all function keys, if 'meta' option set
622 */ 611 */
623#ifdef META8_OPTION 612#ifdef META8_OPTION
… …
641 630
642 for (ch = kbuf; ch < kbuf + len; ch++) 631 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 632 *ch |= 0x80;
644 meta = 0; 633 meta = 0;
645 } 634 }
646#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat(kbuf, len);
650#endif 635#endif
651 /* nil */ ; 636 /* nil */ ;
652 } 637 }
653 } 638 }
654 639
… …
677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 662 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
678 663
679 /* escape prefix */ 664 /* escape prefix */
680 if (meta 665 if (meta
681#ifdef META8_OPTION 666#ifdef META8_OPTION
682 && (meta_char == C0_ESC) 667 && meta_char == C0_ESC
683#endif 668#endif
684 ) 669 )
685 { 670 {
686 const unsigned char ch = C0_ESC; 671 const unsigned char ch = C0_ESC;
687
688 tt_write(&ch, 1); 672 tt_write (&ch, 1);
689 } 673 }
674
690#ifdef DEBUG_CMD 675#if defined(DEBUG_CMD)
691 if (debug_key)
692 { /* Display keyboard buffer contents */ 676 /* Display keyboard buffer contents */
693 char *p; 677 unsigned char *p;
694 int i; 678 int i;
695 679
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 680 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 681 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 682 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 683 fprintf (stderr, "'\n");
700 }
701#endif /* DEBUG_CMD */ 684#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 685 tt_write (kbuf, (unsigned int)len);
703} 686}
704/*}}} */ 687/*}}} */
705 688
706#if (MENUBAR_MAX) 689#if (MENUBAR_MAX)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 690/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 691/* attempt to `write' count to the input buffer */
709unsigned int 692unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 693rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 694{
712 unsigned int n, s; 695 unsigned int n, s;
713 696
714 n = cmdbuf_ptr - cmdbuf_base; 697 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 698 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
699
716 if (n > 0 && s < count) 700 if (n > 0 && s < count)
717 { 701 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 702 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 703 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 704 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 705 cmdbuf_endp -= n;
722 s += n; 706 s += n;
723 } 707 }
708
724 if (count > s) 709 if (count > s)
725 { 710 {
726 rxvt_print_error("data loss: cmd_write too large"); 711 rxvt_print_error ("data loss: cmd_write too large");
727 count = s; 712 count = s;
728 } 713 }
714
729 for (; count--;) 715 for (; count--;)
730 *cmdbuf_endp++ = *str++; 716 *cmdbuf_endp++ = *str++;
717
718 cmd_parse ();
719
731 return 0; 720 return 0;
732} 721}
733#endif /* MENUBAR_MAX */ 722#endif /* MENUBAR_MAX */
734 723
735void 724void
… …
753 IMSendSpot (); 742 IMSendSpot ();
754#endif 743#endif
755 744
756 } 745 }
757 746
758 XFlush (display->display); 747 display->flush ();
759} 748}
760 749
761void 750void
762rxvt_term::check_cb (check_watcher &w) 751rxvt_term::check_cb (check_watcher &w)
763{ 752{
… …
807 cmdbuf_endp += n; 796 cmdbuf_endp += n;
808 return true; 797 return true;
809 } 798 }
810 else if (n < 0 && errno != EAGAIN) 799 else if (n < 0 && errno != EAGAIN)
811 destroy (); 800 destroy ();
812 801
813 return false; 802 return false;
814} 803}
815 804
816void 805void
817rxvt_term::pty_cb (io_watcher &w, short revents) 806rxvt_term::pty_cb (io_watcher &w, short revents)
… …
834 seen_input = 1; 823 seen_input = 1;
835 /* once we know the shell is running, send the screen size. Again! */ 824 /* once we know the shell is running, send the screen size. Again! */
836 tt_winch (); 825 tt_winch ();
837 } 826 }
838 827
828 if (cmd_parse ())
829 break;
830 }
831 }
832}
833
834bool
835rxvt_term::cmd_parse ()
836{
837 bool flag = false;
839 uint32_t ch = NOCHAR; 838 uint32_t ch = NOCHAR;
839
840 for (;;)
841 {
842 if (ch == NOCHAR)
843 ch = next_char ();
844
845 if (ch == NOCHAR) // TODO: improve
846 break;
847
848 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
849 {
850 /* Read a text string from the input buffer */
851 uint32_t buf[BUFSIZ];
852 bool refreshnow = false;
853 int nlines = 0;
854 uint32_t *str = buf;
855
856 *str++ = ch;
840 857
841 for (;;) 858 for (;;)
842 { 859 {
843 if (ch == NOCHAR)
844 ch = next_char (); 860 ch = next_char ();
845 861
846 if (ch == NOCHAR) // TODO: improve 862 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
847 break; 863 break;
848 864 else
849 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
850 { 865 {
851 /* Read a text string from the input buffer */
852 uint32_t buf[BUFSIZ];
853 bool refreshnow = false;
854 int nlines = 0;
855 uint32_t *str = buf;
856
857 *str++ = ch; 866 *str++ = ch;
858 867
859 for (;;) 868 if (ch == '\n')
860 { 869 {
861 ch = next_char ();
862
863 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
864 break;
865 else 870 nlines++;
871 refresh_count++;
872
873 if (! (Options & Opt_jumpScroll)
874 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
866 { 875 {
867 *str++ = ch;
868
869 if (ch == '\n')
870 {
871 nlines++;
872 refresh_count++;
873
874 if (!(Options & Opt_jumpScroll)
875 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
876 {
877 refreshnow = true; 876 refreshnow = true;
878 flag = false; 877 flag = false;
879 ch = NOCHAR; 878 ch = NOCHAR;
880 break; 879 break;
881 } 880 }
882 881
883 // scr_add_lines only works for nlines < TermWin.nrow - 1. 882 // scr_add_lines only works for nlines < TermWin.nrow - 1.
884 if (nlines >= TermWin.nrow - 1) 883 if (nlines >= TermWin.nrow - 1)
885 { 884 {
886 scr_add_lines (buf, nlines, str - buf); 885 scr_add_lines (buf, nlines, str - buf);
887 nlines = 0; 886 nlines = 0;
888 str = buf; 887 str = buf;
889 }
890 }
891
892 if (str >= buf + BUFSIZ)
893 {
894 ch = NOCHAR;
895 break;
896 }
897 } 888 }
898 } 889 }
899 890
900 scr_add_lines (buf, nlines, str - buf); 891 if (str >= buf + BUFSIZ)
901
902 /*
903 * If there have been a lot of new lines, then update the screen
904 * What the heck I'll cheat and only refresh less than every page-full.
905 * the number of pages between refreshes is refresh_limit, which
906 * is incremented here because we must be doing flat-out scrolling.
907 *
908 * refreshing should be correct for small scrolls, because of the
909 * time-out
910 */
911 if (refreshnow)
912 { 892 {
913 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 893 ch = NOCHAR;
914 refresh_limit++; 894 break;
915
916 scr_refresh (refresh_type);
917 } 895 }
918
919 }
920 else
921 {
922 switch (ch)
923 {
924 default:
925 process_nonprinting (ch);
926 break;
927 case C0_ESC: /* escape char */
928 process_escape_seq ();
929 break;
930 /*case 0x9b: */ /* CSI */
931 /* process_csi_seq (); */
932 }
933
934 ch = NOCHAR;
935 } 896 }
936 } 897 }
898
899 scr_add_lines (buf, nlines, str - buf);
900
901 /*
902 * If there have been a lot of new lines, then update the screen
903 * What the heck I'll cheat and only refresh less than every page-full.
904 * the number of pages between refreshes is refresh_limit, which
905 * is incremented here because we must be doing flat-out scrolling.
906 *
907 * refreshing should be correct for small scrolls, because of the
908 * time-out
909 */
910 if (refreshnow)
911 {
912 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
913 refresh_limit++;
914
915 scr_refresh (refresh_type);
916 }
917
918 }
919 else
937 } 920 {
921 switch (ch)
922 {
923 default:
924 process_nonprinting (ch);
925 break;
926 case C0_ESC: /* escape char */
927 process_escape_seq ();
928 break;
929 /*case 0x9b: */ /* CSI */
930 /* process_csi_seq (); */
931 }
932
933 ch = NOCHAR;
934 }
938 } 935 }
936
937 return flag;
939} 938}
940 939
941// read the next character, currently handles UTF-8 940// read the next character, currently handles UTF-8
942// will probably handle all sorts of other stuff in the future 941// will probably handle all sorts of other stuff in the future
943uint32_t 942uint32_t
… …
947 { 946 {
948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 947 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
949 return *cmdbuf_ptr++; 948 return *cmdbuf_ptr++;
950 949
951 wchar_t wc; 950 wchar_t wc;
952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 951 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
953 952
954 if (len == (size_t)-2) 953 if (len == (size_t)-2)
955 return NOCHAR; 954 return NOCHAR;
956 955
957 if (len == (size_t)-1) 956 if (len == (size_t)-1)
… …
963 } 962 }
964 963
965 return NOCHAR; 964 return NOCHAR;
966} 965}
967 966
968/* rxvt_cmd_getc() - Return next input character */ 967/* rxvt_cmd_getc () - Return next input character */
969/* 968/*
970 * Return the next input character after first passing any keyboard input 969 * Return the next input character after first passing any keyboard input
971 * to the command. 970 * to the command.
972 */ 971 */
973uint32_t 972uint32_t
… …
1001} 1000}
1002 1001
1003void 1002void
1004rxvt_term::pointer_blank () 1003rxvt_term::pointer_blank ()
1005{ 1004{
1006 if (!(Options & Opt_pointerBlank)) 1005 if (! (Options & Opt_pointerBlank))
1007 return; 1006 return;
1008 1007
1009 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1008 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1010 XFlush (display->display); 1009 XFlush (display->display);
1011 1010
… …
1021 pointer_blank (); 1020 pointer_blank ();
1022} 1021}
1023#endif 1022#endif
1024 1023
1025void 1024void
1026rxvt_term::mouse_report (const XButtonEvent &ev) 1025rxvt_term::mouse_report (XButtonEvent &ev)
1027{ 1026{
1028 int button_number, key_state = 0; 1027 int button_number, key_state = 0;
1029 int x, y; 1028 int x, y;
1030 1029
1031 x = ev.x; 1030 x = ev.x;
1032 y = ev.y; 1031 y = ev.y;
1033 pixel_position (&x, &y); 1032 pixel_position (&x, &y);
1034 1033
… …
1071#endif 1070#endif
1072 1071
1073 } 1072 }
1074 1073
1075#ifdef DEBUG_MOUSEREPORT 1074#ifdef DEBUG_MOUSEREPORT
1076 fprintf(stderr, "Mouse ["); 1075 fprintf (stderr, "Mouse [");
1077 if (key_state & 16) 1076 if (key_state & 16)
1078 fputc('C', stderr); 1077 fputc ('C', stderr);
1079 if (key_state & 4) 1078 if (key_state & 4)
1080 fputc('S', stderr); 1079 fputc ('S', stderr);
1081 if (key_state & 8) 1080 if (key_state & 8)
1082 fputc('A', stderr); 1081 fputc ('A', stderr);
1083 if (key_state & 32) 1082 if (key_state & 32)
1084 fputc('2', stderr); 1083 fputc ('2', stderr);
1085 fprintf(stderr, "]: <%d>, %d/%d\n", 1084 fprintf (stderr, "]: <%d>, %d/%d\n",
1086 button_number, 1085 button_number,
1087 x + 1, 1086 x + 1,
1088 y + 1); 1087 y + 1);
1089#else 1088#else
1090 tt_printf("\033[M%c%c%c", 1089 tt_printf ("\033[M%c%c%c",
1091 (32 + button_number + key_state), 1090 (32 + button_number + key_state),
1092 (32 + x + 1), 1091 (32 + x + 1),
1093 (32 + y + 1)); 1092 (32 + y + 1));
1094#endif 1093#endif
1095} 1094}
1096 1095
1097#ifdef USING_W11LIB 1096#ifdef USING_W11LIB
1098void 1097void
1099rxvt_W11_process_x_event(XEvent *ev) 1098rxvt_W11_process_x_event (XEvent *ev)
1100{ 1099{
1101 rxvt_t *r = rxvt_get_r(); 1100 rxvt_t *r = rxvt_get_r ();
1102 1101
1103 x_cb (*ev); 1102 x_cb (*ev);
1104} 1103}
1105#endif 1104#endif
1106 1105
… …
1189#endif 1188#endif
1190 1189
1191#ifdef DEBUG_X 1190#ifdef DEBUG_X
1192 struct timeval tp; 1191 struct timeval tp;
1193 struct tm *ltt; 1192 struct tm *ltt;
1194 (void)gettimeofday(&tp, NULL); 1193 (void)gettimeofday (&tp, NULL);
1195 ltt = localtime(&(tp.tv_sec)); 1194 ltt = localtime (& (tp.tv_sec));
1196 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)); 1195 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));
1197#endif 1196#endif
1198 1197
1199 switch (ev.type) 1198 switch (ev.type)
1200 { 1199 {
1201 case KeyPress: 1200 case KeyPress:
… …
1203 break; 1202 break;
1204 1203
1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1204#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1206 case KeyRelease: 1205 case KeyRelease:
1207 { 1206 {
1208 if (!(ev.xkey.state & ControlMask)) 1207 if (! (ev.xkey.state & ControlMask))
1209 mouse_slip_wheel_speed = 0; 1208 mouse_slip_wheel_speed = 0;
1210 else 1209 else
1211 { 1210 {
1212 KeySym ks; 1211 KeySym ks;
1213 1212
1214 ks = XKeycodeToKeysym(display->display, ev.xkey.keycode, 0); 1213 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1215 if (ks == XK_Control_L || ks == XK_Control_R) 1214 if (ks == XK_Control_L || ks == XK_Control_R)
1216 mouse_slip_wheel_speed = 0; 1215 mouse_slip_wheel_speed = 0;
1217 } 1216 }
1218 break; 1217 break;
1219 } 1218 }
… …
1242 Atom ActualType; 1241 Atom ActualType;
1243 int ActualFormat; 1242 int ActualFormat;
1244 unsigned char *data; 1243 unsigned char *data;
1245 unsigned long Size, RemainingBytes; 1244 unsigned long Size, RemainingBytes;
1246 1245
1247 XGetWindowProperty(display->display, display->root, 1246 XGetWindowProperty (display->display, display->root,
1248 xa[XA_DNDSELECTION], 1247 xa[XA_DNDSELECTION],
1249 0L, 1000000L, 1248 0L, 1000000L,
1250 False, AnyPropertyType, 1249 False, AnyPropertyType,
1251 &ActualType, &ActualFormat, 1250 &ActualType, &ActualFormat,
1252 &Size, &RemainingBytes, 1251 &Size, &RemainingBytes,
1253 &data); 1252 &data);
1254 XChangeProperty(display->display, display->root, 1253 XChangeProperty (display->display, display->root,
1255 XA_CUT_BUFFER0, XA_STRING, 1254 XA_CUT_BUFFER0, XA_STRING,
1256 8, PropModeReplace, 1255 8, PropModeReplace,
1257 data, STRLEN(data)); 1256 data, STRLEN (data));
1258 selection_paste (display->root, XA_CUT_BUFFER0, True); 1257 selection_paste (display->root, XA_CUT_BUFFER0, True);
1259 XSetInputFocus(display->display, display->root, RevertToNone, CurrentTime); 1258 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1260 } 1259 }
1261#endif /* OFFIX_DND */ 1260#endif /* OFFIX_DND */
1262 break; 1261 break;
1263 1262
1264 case MappingNotify: 1263 case MappingNotify:
1265 XRefreshKeyboardMapping(&(ev.xmapping)); 1264 XRefreshKeyboardMapping (& (ev.xmapping));
1266 break; 1265 break;
1267 1266
1268 /* 1267 /*
1269 * XXX: this is not the _current_ arrangement 1268 * XXX: this is not the _current_ arrangement
1270 * Here's my conclusion: 1269 * Here's my conclusion:
… …
1295 { 1294 {
1296 TermWin.focus = 1; 1295 TermWin.focus = 1;
1297 want_refresh = 1; 1296 want_refresh = 1;
1298#ifdef USE_XIM 1297#ifdef USE_XIM
1299 if (Input_Context != NULL) 1298 if (Input_Context != NULL)
1300 XSetICFocus(Input_Context); 1299 XSetICFocus (Input_Context);
1301#endif 1300#endif
1302#ifdef CURSOR_BLINK 1301#ifdef CURSOR_BLINK
1303 if (Options & Opt_cursorBlink) 1302 if (Options & Opt_cursorBlink)
1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1303 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1305#endif 1304#endif
… …
1312 { 1311 {
1313 TermWin.focus = 0; 1312 TermWin.focus = 0;
1314 want_refresh = 1; 1313 want_refresh = 1;
1315#ifdef USE_XIM 1314#ifdef USE_XIM
1316 if (Input_Context != NULL) 1315 if (Input_Context != NULL)
1317 XUnsetICFocus(Input_Context); 1316 XUnsetICFocus (Input_Context);
1318#endif 1317#endif
1319#ifdef CURSOR_BLINK 1318#ifdef CURSOR_BLINK
1320 if (Options & Opt_cursorBlink) 1319 if (Options & Opt_cursorBlink)
1321 cursor_blink_ev.stop (); 1320 cursor_blink_ev.stop ();
1322 hidden_cursor = 0; 1321 hidden_cursor = 0;
… …
1332 1331
1333 do 1332 do
1334 { /* Wrap lots of configures into one */ 1333 { /* Wrap lots of configures into one */
1335 width = ev.xconfigure.width; 1334 width = ev.xconfigure.width;
1336 height = ev.xconfigure.height; 1335 height = ev.xconfigure.height;
1337 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1336 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1338 } 1337 }
1339 while (XCheckTypedWindowEvent(display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1338 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1340 1339
1341 if (szHint.width != width || szHint.height != height) 1340 if (szHint.width != width || szHint.height != height)
1342 { 1341 {
1343 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1342 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1344 resize_all_windows (width, height, 1); 1343 resize_all_windows (width, height, 1);
1345 } 1344 }
1346#ifdef DEBUG_SIZE 1345#ifdef DEBUG_SIZE
1347 else 1346 else
1348 { 1347 {
1349 D_SIZE((stderr, "Size: Not resizing")); 1348 D_SIZE ((stderr, "Size: Not resizing"));
1350 } 1349 }
1351#endif 1350#endif
1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1351#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1353 if (Options & Opt_transparent) 1352 if (Options & Opt_transparent)
1354 { 1353 {
… …
1360 1359
1361 } 1360 }
1362 break; 1361 break;
1363 1362
1364 case SelectionClear: 1363 case SelectionClear:
1365 selection_clear (); 1364 display->set_selection_owner (0);
1366 break; 1365 break;
1367 1366
1368 case SelectionNotify: 1367 case SelectionNotify:
1369 if (selection_wait == Sel_normal) 1368 if (selection_wait == Sel_normal)
1370 selection_paste (ev.xselection.requestor, 1369 selection_paste (ev.xselection.requestor,
… …
1413 } 1412 }
1414 else 1413 else
1415 { 1414 {
1416 XEvent unused_event; 1415 XEvent unused_event;
1417 1416
1418 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1419 Expose, 1418 Expose,
1420 &unused_event)) ; 1419 &unused_event)) ;
1421 while (XCheckTypedWindowEvent(display->display, ev.xany.window, 1420 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1422 GraphicsExpose, 1421 GraphicsExpose,
1423 &unused_event)) ; 1422 &unused_event)) ;
1424 if (isScrollbarWindow(ev.xany.window)) 1423 if (isScrollbarWindow (ev.xany.window))
1425 { 1424 {
1426 scrollBar.setIdle(); 1425 scrollBar.setIdle ();
1427 scrollbar_show (0); 1426 scrollbar_show (0);
1428 } 1427 }
1429#ifdef MENUBAR 1428#ifdef MENUBAR
1430 if (menubar_visible () && isMenuBarWindow(ev.xany.window)) 1429 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1431 menubar_expose (); 1430 menubar_expose ();
1432#endif 1431#endif
1433#ifdef RXVT_GRAPHICS
1434 Gr_expose (ev.xany.window);
1435#endif
1436
1437 } 1432 }
1438 break; 1433 break;
1439 1434
1440 case MotionNotify: 1435 case MotionNotify:
1441#ifdef POINTER_BLANK 1436#ifdef POINTER_BLANK
1442 if (hidden_pointer) 1437 if (hidden_pointer)
1443 pointer_unblank (); 1438 pointer_unblank ();
1444#endif 1439#endif
1445#if MENUBAR 1440#if MENUBAR
1446 if (isMenuBarWindow(ev.xany.window)) 1441 if (isMenuBarWindow (ev.xany.window))
1447 { 1442 {
1448 menubar_control (&(ev.xbutton)); 1443 menubar_control (ev.xbutton);
1449 break; 1444 break;
1450 } 1445 }
1451#endif 1446#endif
1452 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1447 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1453 break; 1448 break;
1454 1449
1455 if (ev.xany.window == TermWin.vt) 1450 if (ev.xany.window == TermWin.vt)
1456 { 1451 {
1457 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1452 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1458 { 1453 {
1459 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1454 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1460 ; 1455 ;
1461 1456
1462 XQueryPointer(display->display, TermWin.vt, 1457 XQueryPointer (display->display, TermWin.vt,
1463 &unused_root, &unused_child, 1458 &unused_root, &unused_child,
1464 &unused_root_x, &unused_root_y, 1459 &unused_root_x, &unused_root_y,
1465 &(ev.xbutton.x), &(ev.xbutton.y), 1460 & (ev.xbutton.x), & (ev.xbutton.y),
1466 &unused_mask); 1461 &unused_mask);
1467#ifdef MOUSE_THRESHOLD 1462#ifdef MOUSE_THRESHOLD
1468 /* deal with a `jumpy' mouse */ 1463 /* deal with a `jumpy' mouse */
1469 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1464 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1470 { 1465 {
1471#endif 1466#endif
1472 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1467 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1473 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1468 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1474#ifdef SELECTION_SCROLLING 1469#ifdef SELECTION_SCROLLING
1475 if (ev.xbutton.y < TermWin.int_bwidth 1470 if (ev.xbutton.y < TermWin.int_bwidth
1476 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1)) 1471 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1477 { 1472 {
1478 int dist; 1473 int dist;
1479 1474
1480 pending_scroll_selection=1; 1475 pending_scroll_selection=1;
1481 1476
… …
1503 { 1498 {
1504 scroll_selection_dir = DN; 1499 scroll_selection_dir = DN;
1505 dist = ev.xbutton.y - 1500 dist = ev.xbutton.y -
1506 (TermWin.int_bwidth + TermWin.height); 1501 (TermWin.int_bwidth + TermWin.height);
1507 } 1502 }
1508 scroll_selection_lines=(Pixel2Height(dist)/ 1503 scroll_selection_lines= (Pixel2Height (dist)/
1509 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1504 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1510 MIN_IT(scroll_selection_lines, 1505 MIN_IT (scroll_selection_lines,
1511 SELECTION_SCROLL_MAX_LINES); 1506 SELECTION_SCROLL_MAX_LINES);
1512 } 1507 }
1513 else 1508 else
1514 { 1509 {
1515 /* we are within the text window, so we 1510 /* we are within the text window, so we
… …
1523 } 1518 }
1524#endif 1519#endif
1525 1520
1526 } 1521 }
1527 } 1522 }
1528 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion()) 1523 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1529 { 1524 {
1530 while (XCheckTypedWindowEvent(display->display, scrollBar.win, 1525 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1531 MotionNotify, &ev)) ; 1526 MotionNotify, &ev)) ;
1532 XQueryPointer(display->display, scrollBar.win, 1527 XQueryPointer (display->display, scrollBar.win,
1533 &unused_root, &unused_child, 1528 &unused_root, &unused_child,
1534 &unused_root_x, &unused_root_y, 1529 &unused_root_x, &unused_root_y,
1535 &(ev.xbutton.x), &(ev.xbutton.y), 1530 & (ev.xbutton.x), & (ev.xbutton.y),
1536 &unused_mask); 1531 &unused_mask);
1537 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO, 1532 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1538 scrollbar_size()); 1533 scrollbar_size ());
1539 scr_refresh (refresh_type); 1534 scr_refresh (refresh_type);
1540 refresh_limit = 0; 1535 refresh_limit = 0;
1541 scrollbar_show (1); 1536 scrollbar_show (1);
1542 } 1537 }
1543 break; 1538 break;
… …
1565 /* 1560 /*
1566 * if user used some Esetroot compatible prog to set the root bg, 1561 * if user used some Esetroot compatible prog to set the root bg,
1567 * use the property to determine the pixmap. We use it later on. 1562 * use the property to determine the pixmap. We use it later on.
1568 */ 1563 */
1569 if (xa[XA_XROOTPMAPID] == 0) 1564 if (xa[XA_XROOTPMAPID] == 0)
1570 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False); 1565 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1571 1566
1572 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1567 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1573 return; 1568 return;
1574 } 1569 }
1575 1570
… …
1582#endif 1577#endif
1583 } 1578 }
1584} 1579}
1585 1580
1586void 1581void
1587rxvt_term::button_press (const XButtonEvent &ev) 1582rxvt_term::button_press (XButtonEvent &ev)
1588{ 1583{
1589 int reportmode = 0, clickintime; 1584 int reportmode = 0, clickintime;
1590 1585
1591 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1586 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1592 if (!bypass_keystate) 1587 if (!bypass_keystate)
1593 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1588 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1594 /* 1589 /*
1595 * VT window processing of button press 1590 * VT window processing of button press
1596 */ 1591 */
1597 if (ev.window == TermWin.vt) 1592 if (ev.window == TermWin.vt)
1598 { 1593 {
1599#if RXVT_GRAPHICS
1600 if (ev.subwindow != None)
1601 rxvt_Gr_ButtonPress (ev.x, ev.y);
1602 else
1603#endif
1604
1605 {
1606 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1594 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1607 if (reportmode) 1595 if (reportmode)
1596 {
1597 /* mouse report from vt window */
1598 /* save the xbutton state (for ButtonRelease) */
1599 MEvent.state = ev.state;
1600#ifdef MOUSE_REPORT_DOUBLECLICK
1601 if (ev.button == MEvent.button && clickintime)
1608 { 1602 {
1609 /* mouse report from vt window */ 1603 /* same button, within alloted time */
1610 /* save the xbutton state (for ButtonRelease) */ 1604 MEvent.clicks++;
1611 MEvent.state = ev.state; 1605 if (MEvent.clicks > 1)
1612#ifdef MOUSE_REPORT_DOUBLECLICK
1613 if (ev.button == MEvent.button && clickintime)
1614 { 1606 {
1615 /* same button, within alloted time */
1616 MEvent.clicks++;
1617 if (MEvent.clicks > 1)
1618 {
1619 /* only report double clicks */ 1607 /* only report double clicks */
1620 MEvent.clicks = 2; 1608 MEvent.clicks = 2;
1621 mouse_report (ev); 1609 mouse_report (ev);
1622 1610
1623 /* don't report the release */ 1611 /* don't report the release */
1624 MEvent.clicks = 0; 1612 MEvent.clicks = 0;
1625 MEvent.button = AnyButton; 1613 MEvent.button = AnyButton;
1626 }
1627 } 1614 }
1628 else
1629 {
1630 /* different button, or time expired */
1631 MEvent.clicks = 1;
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634 }
1635#else
1636 MEvent.button = ev.button;
1637 mouse_report (ev);
1638#endif /* MOUSE_REPORT_DOUBLECLICK */
1639
1640 } 1615 }
1641 else 1616 else
1642 { 1617 {
1618 /* different button, or time expired */
1619 MEvent.clicks = 1;
1620 MEvent.button = ev.button;
1621 mouse_report (ev);
1622 }
1623#else
1624 MEvent.button = ev.button;
1625 mouse_report (ev);
1626#endif /* MOUSE_REPORT_DOUBLECLICK */
1627
1628 }
1629 else
1630 {
1643 if (ev.button != MEvent.button) 1631 if (ev.button != MEvent.button)
1644 MEvent.clicks = 0; 1632 MEvent.clicks = 0;
1645 switch (ev.button) 1633 switch (ev.button)
1646 { 1634 {
1647 case Button1: 1635 case Button1:
1648 /* allow shift+left click to extend selection */ 1636 /* allow shift+left click to extend selection */
1649 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1637 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1650 { 1638 {
1651 if (MEvent.button == Button1 && clickintime)
1652 selection_rotate (ev.x, ev.y);
1653 else
1654 selection_extend (ev.x, ev.y, 1);
1655 }
1656 else
1657 {
1658 if (MEvent.button == Button1 && clickintime)
1659 MEvent.clicks++;
1660 else
1661 MEvent.clicks = 1;
1662
1663 selection_click (MEvent.clicks, ev.x, ev.y);
1664 }
1665
1666 MEvent.button = Button1;
1667 break;
1668
1669 case Button3:
1670 if (MEvent.button == Button3 && clickintime) 1639 if (MEvent.button == Button1 && clickintime)
1671 selection_rotate (ev.x, ev.y); 1640 selection_rotate (ev.x, ev.y);
1672 else 1641 else
1673 selection_extend (ev.x, ev.y, 1); 1642 selection_extend (ev.x, ev.y, 1);
1643 }
1644 else
1645 {
1646 if (MEvent.button == Button1 && clickintime)
1647 MEvent.clicks++;
1648 else
1649 MEvent.clicks = 1;
1650
1651 selection_click (MEvent.clicks, ev.x, ev.y);
1652 }
1653
1654 MEvent.button = Button1;
1655 break;
1656
1657 case Button3:
1658 if (MEvent.button == Button3 && clickintime)
1659 selection_rotate (ev.x, ev.y);
1660 else
1661 selection_extend (ev.x, ev.y, 1);
1674 MEvent.button = Button3; 1662 MEvent.button = Button3;
1675 break; 1663 break;
1676 }
1677 } 1664 }
1665 }
1678 MEvent.time = ev.time; 1666 MEvent.time = ev.time;
1679 return; 1667 return;
1680 }
1681 } 1668 }
1682 1669
1683 /* 1670 /*
1684 * Scrollbar window processing of button press 1671 * Scrollbar window processing of button press
1685 */ 1672 */
1686 if (isScrollbarWindow(ev.window)) 1673 if (isScrollbarWindow (ev.window))
1687 { 1674 {
1688 scrollBar.setIdle (); 1675 scrollBar.setIdle ();
1689 /* 1676 /*
1690 * Rxvt-style scrollbar: 1677 * Rxvt-style scrollbar:
1691 * move up if mouse is above slider 1678 * move up if mouse is above slider
… …
1703 * Mouse report disabled scrollbar: 1690 * Mouse report disabled scrollbar:
1704 * arrow buttons - send up/down 1691 * arrow buttons - send up/down
1705 * click on scrollbar - send pageup/down 1692 * click on scrollbar - send pageup/down
1706 */ 1693 */
1707 if ((scrollBar.style == R_SB_NEXT 1694 if ((scrollBar.style == R_SB_NEXT
1708 && scrollbarnext_upButton(ev.y)) 1695 && scrollbarnext_upButton (ev.y))
1709 || (scrollBar.style == R_SB_RXVT 1696 || (scrollBar.style == R_SB_RXVT
1710 && scrollbarrxvt_upButton(ev.y))) 1697 && scrollbarrxvt_upButton (ev.y)))
1711 tt_printf("\033[A"); 1698 tt_printf ("\033[A");
1712 else if ((scrollBar.style == R_SB_NEXT 1699 else if ((scrollBar.style == R_SB_NEXT
1713 && scrollbarnext_dnButton(ev.y)) 1700 && scrollbarnext_dnButton (ev.y))
1714 || (scrollBar.style == R_SB_RXVT 1701 || (scrollBar.style == R_SB_RXVT
1715 && scrollbarrxvt_dnButton(ev.y))) 1702 && scrollbarrxvt_dnButton (ev.y)))
1716 tt_printf("\033[B"); 1703 tt_printf ("\033[B");
1717 else 1704 else
1718 switch (ev.button) 1705 switch (ev.button)
1719 { 1706 {
1720 case Button2: 1707 case Button2:
1721 tt_printf("\014"); 1708 tt_printf ("\014");
1722 break; 1709 break;
1723 case Button1: 1710 case Button1:
1724 tt_printf("\033[6~"); 1711 tt_printf ("\033[6~");
1725 break; 1712 break;
1726 case Button3: 1713 case Button3:
1727 tt_printf("\033[5~"); 1714 tt_printf ("\033[5~");
1728 break; 1715 break;
1729 } 1716 }
1730 } 1717 }
1731 else 1718 else
1732#endif /* NO_SCROLLBAR_REPORT */ 1719#endif /* NO_SCROLLBAR_REPORT */
… …
1734 { 1721 {
1735 char upordown = 0; 1722 char upordown = 0;
1736 1723
1737 if (scrollBar.style == R_SB_NEXT) 1724 if (scrollBar.style == R_SB_NEXT)
1738 { 1725 {
1739 if (scrollbarnext_upButton(ev.y)) 1726 if (scrollbarnext_upButton (ev.y))
1740 upordown = -1; /* up */ 1727 upordown = -1; /* up */
1741 else if (scrollbarnext_dnButton(ev.y)) 1728 else if (scrollbarnext_dnButton (ev.y))
1742 upordown = 1; /* down */ 1729 upordown = 1; /* down */
1743 } 1730 }
1744 else if (scrollBar.style == R_SB_RXVT) 1731 else if (scrollBar.style == R_SB_RXVT)
1745 { 1732 {
1746 if (scrollbarrxvt_upButton(ev.y)) 1733 if (scrollbarrxvt_upButton (ev.y))
1747 upordown = -1; /* up */ 1734 upordown = -1; /* up */
1748 else if (scrollbarrxvt_dnButton(ev.y)) 1735 else if (scrollbarrxvt_dnButton (ev.y))
1749 upordown = 1; /* down */ 1736 upordown = 1; /* down */
1750 } 1737 }
1751 if (upordown) 1738 if (upordown)
1752 { 1739 {
1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1740#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
… …
1776 case R_SB_ALIGN_BOTTOM: 1763 case R_SB_ALIGN_BOTTOM:
1777 csrO = scrollBar.bot - scrollBar.top; 1764 csrO = scrollBar.bot - scrollBar.top;
1778 break; 1765 break;
1779 } 1766 }
1780 if (scrollBar.style == R_SB_XTERM 1767 if (scrollBar.style == R_SB_XTERM
1781 || scrollbar_above_slider(ev.y) 1768 || scrollbar_above_slider (ev.y)
1782 || scrollbar_below_slider(ev.y)) 1769 || scrollbar_below_slider (ev.y))
1783 scr_move_to ( scrollbar_position(ev.y) - csrO, 1770 scr_move_to ( scrollbar_position (ev.y) - csrO,
1784 scrollbar_size()); 1771 scrollbar_size ());
1785 scrollBar.setMotion (); 1772 scrollBar.setMotion ();
1786 break; 1773 break;
1787 1774
1788 case Button1: 1775 case Button1:
1789 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1776 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1791 /* FALLTHROUGH */ 1778 /* FALLTHROUGH */
1792 1779
1793 case Button3: 1780 case Button3:
1794 if (scrollBar.style != R_SB_XTERM) 1781 if (scrollBar.style != R_SB_XTERM)
1795 { 1782 {
1796 if (scrollbar_above_slider(ev.y)) 1783 if (scrollbar_above_slider (ev.y))
1797# ifdef RXVT_SCROLL_FULL 1784# ifdef RXVT_SCROLL_FULL
1798 scr_page (UP, TermWin.nrow - 1); 1785 scr_page (UP, TermWin.nrow - 1);
1799# else 1786# else
1800 scr_page (UP, TermWin.nrow / 4); 1787 scr_page (UP, TermWin.nrow / 4);
1801# endif 1788# endif
1802 else if (scrollbar_below_slider(ev.y)) 1789 else if (scrollbar_below_slider (ev.y))
1803# ifdef RXVT_SCROLL_FULL 1790# ifdef RXVT_SCROLL_FULL
1804 scr_page (DN, TermWin.nrow - 1); 1791 scr_page (DN, TermWin.nrow - 1);
1805# else 1792# else
1806 scr_page (DN, TermWin.nrow / 4); 1793 scr_page (DN, TermWin.nrow / 4);
1807# endif 1794# endif
… …
1810 } 1797 }
1811 else 1798 else
1812 { 1799 {
1813 scr_page ((ev.button == Button1 ? DN : UP), 1800 scr_page ((ev.button == Button1 ? DN : UP),
1814 (TermWin.nrow 1801 (TermWin.nrow
1815 * scrollbar_position(ev.y) 1802 * scrollbar_position (ev.y)
1816 / scrollbar_size())); 1803 / scrollbar_size ()));
1817 } 1804 }
1818 break; 1805 break;
1819 } 1806 }
1820 } 1807 }
1821 return; 1808 return;
1822 } 1809 }
1823#if MENUBAR 1810#if MENUBAR
1824 /* 1811 /*
1825 * Menubar window processing of button press 1812 * Menubar window processing of button press
1826 */ 1813 */
1827 if (isMenuBarWindow(ev.window)) 1814 if (isMenuBarWindow (ev.window))
1828 menubar_control (ev); 1815 menubar_control (ev);
1829#endif 1816#endif
1830} 1817}
1831 1818
1832void 1819void
1833rxvt_term::button_release (const XButtonEvent &ev) 1820rxvt_term::button_release (XButtonEvent &ev)
1834{ 1821{
1835 int reportmode = 0; 1822 int reportmode = 0;
1836 1823
1837 csrO = 0; /* reset csr Offset */ 1824 csrO = 0; /* reset csr Offset */
1838 if (!bypass_keystate) 1825 if (!bypass_keystate)
1839 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1826 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1840 1827
1841 if (scrollbar_isUpDn()) 1828 if (scrollbar_isUpDn ())
1842 { 1829 {
1843 scrollBar.setIdle (); 1830 scrollBar.setIdle ();
1844 scrollbar_show (0); 1831 scrollbar_show (0);
1845#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1832#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1846 refresh_type &= ~SMOOTH_REFRESH; 1833 refresh_type &= ~SMOOTH_REFRESH;
… …
1850#ifdef SELECTION_SCROLLING 1837#ifdef SELECTION_SCROLLING
1851 pending_scroll_selection=0; 1838 pending_scroll_selection=0;
1852#endif 1839#endif
1853 if (ev.window == TermWin.vt) 1840 if (ev.window == TermWin.vt)
1854 { 1841 {
1855#ifdef RXVT_GRAPHICS
1856 if (ev.subwindow != None)
1857 rxvt_Gr_ButtonRelease(ev.x, ev.y);
1858 else
1859#endif
1860
1861 {
1862 if (reportmode) 1842 if (reportmode)
1843 {
1844 /* mouse report from vt window */
1845 /* don't report release of wheel "buttons" */
1846 if (ev.button >= 4)
1847 return;
1848#ifdef MOUSE_REPORT_DOUBLECLICK
1849 /* only report the release of 'slow' single clicks */
1850 if (MEvent.button != AnyButton
1851 && (ev.button != MEvent.button
1852 || (ev.time - MEvent.time
1853 > MULTICLICK_TIME / 2)))
1863 { 1854 {
1864 /* mouse report from vt window */
1865 /* don't report release of wheel "buttons" */
1866 if (ev.button >= 4)
1867 return;
1868#ifdef MOUSE_REPORT_DOUBLECLICK
1869 /* only report the release of 'slow' single clicks */
1870 if (MEvent.button != AnyButton
1871 && (ev.button != MEvent.button
1872 || (ev.time - MEvent.time
1873 > MULTICLICK_TIME / 2)))
1874 {
1875 MEvent.clicks = 0; 1855 MEvent.clicks = 0;
1876 MEvent.button = AnyButton;
1877 mouse_report (ev);
1878 }
1879#else /* MOUSE_REPORT_DOUBLECLICK */
1880 MEvent.button = AnyButton; 1856 MEvent.button = AnyButton;
1881 mouse_report (ev); 1857 mouse_report (ev);
1858 }
1859#else /* MOUSE_REPORT_DOUBLECLICK */
1860 MEvent.button = AnyButton;
1861 mouse_report (ev);
1882#endif /* MOUSE_REPORT_DOUBLECLICK */ 1862#endif /* MOUSE_REPORT_DOUBLECLICK */
1883 return; 1863 return;
1884 } 1864 }
1885 /* 1865 /*
1886 * dumb hack to compensate for the failure of click-and-drag 1866 * dumb hack to compensate for the failure of click-and-drag
1887 * when overriding mouse reporting 1867 * when overriding mouse reporting
1888 */ 1868 */
1889 if (PrivateModes & PrivMode_mouse_report 1869 if (PrivateModes & PrivMode_mouse_report
1890 && bypass_keystate 1870 && bypass_keystate
1891 && ev.button == Button1 && MEvent.clicks <= 1) 1871 && ev.button == Button1 && MEvent.clicks <= 1)
1892 selection_extend (ev.x, ev.y, 0); 1872 selection_extend (ev.x, ev.y, 0);
1893 1873
1894 switch (ev.button) 1874 switch (ev.button)
1875 {
1876 case Button1:
1877 case Button3:
1878 selection_make (ev.time);
1879 break;
1880 case Button2:
1881 selection_request (ev.time, ev.x, ev.y);
1882 break;
1883#ifdef MOUSE_WHEEL
1884 case Button4:
1885 case Button5:
1895 { 1886 {
1896 case Button1: 1887 int i;
1897 case Button3: 1888 page_dirn v;
1898 selection_make (ev.time); 1889
1890 v = (ev.button == Button4) ? UP : DN;
1891 if (ev.state & ShiftMask)
1899 break; 1892 i = 1;
1900 case Button2: 1893 else if ((Options & Opt_mouseWheelScrollPage))
1901 selection_request (ev.time, ev.x, ev.y); 1894 i = TermWin.nrow - 1;
1895 else
1902 break; 1896 i = 5;
1903#ifdef MOUSE_WHEEL 1897# ifdef MOUSE_SLIP_WHEELING
1904 case Button4: 1898 if (ev.state & ControlMask)
1905 case Button5:
1906 { 1899 {
1907 int i;
1908 page_dirn v;
1909
1910 v = (ev.button == Button4) ? UP : DN;
1911 if (ev.state & ShiftMask)
1912 i = 1;
1913 else if ((Options & Opt_mouseWheelScrollPage))
1914 i = TermWin.nrow - 1;
1915 else
1916 i = 5;
1917# ifdef MOUSE_SLIP_WHEELING
1918 if (ev.state & ControlMask)
1919 {
1920 mouse_slip_wheel_speed += (v ? -1 : 1); 1900 mouse_slip_wheel_speed += (v ? -1 : 1);
1921 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1901 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1922 } 1902 }
1923# endif 1903# endif
1924# ifdef JUMP_MOUSE_WHEEL 1904# ifdef JUMP_MOUSE_WHEEL
1905 scr_page (v, i);
1906 scr_refresh (SMOOTH_REFRESH);
1907 scrollbar_show (1);
1908# else
1909 while (i--)
1910 {
1925 scr_page (v, i); 1911 scr_page (v, 1);
1926 scr_refresh (SMOOTH_REFRESH); 1912 scr_refresh (SMOOTH_REFRESH);
1927 scrollbar_show (1); 1913 scrollbar_show (1);
1928# else
1929 while (i--)
1930 {
1931 scr_page (v, 1);
1932 scr_refresh (SMOOTH_REFRESH);
1933 scrollbar_show (1);
1934 } 1914 }
1935# endif 1915# endif
1936 1916
1937 }
1938 break;
1939#endif
1940
1941 } 1917 }
1918 break;
1919#endif
1920
1942 } 1921 }
1943 } 1922 }
1944#ifdef MENUBAR 1923#ifdef MENUBAR
1945 else if (isMenuBarWindow(ev.window)) 1924 else if (isMenuBarWindow (ev.window))
1946 menubar_control (ev); 1925 menubar_control (ev);
1947#endif 1926#endif
1948} 1927}
1949 1928
1950 1929
… …
1964 Pixmap rootpixmap = None; 1943 Pixmap rootpixmap = None;
1965 XWindowAttributes wattr, wrootattr; 1944 XWindowAttributes wattr, wrootattr;
1966 1945
1967 pchanged = 0; 1946 pchanged = 0;
1968 1947
1969 if (!(Options & Opt_transparent)) 1948 if (! (Options & Opt_transparent))
1970 return pchanged; /* Don't try any more */ 1949 return pchanged; /* Don't try any more */
1971 1950
1972 XGetWindowAttributes(display->display, display->root, &wrootattr); 1951 XGetWindowAttributes (display->display, display->root, &wrootattr);
1973 rootdepth = wrootattr.depth; 1952 rootdepth = wrootattr.depth;
1974 1953
1975 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 1954 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1976 if (rootdepth != wattr.depth) 1955 if (rootdepth != wattr.depth)
1977 { 1956 {
1978 if (am_transparent) 1957 if (am_transparent)
1979 { 1958 {
1980 pchanged = 1; 1959 pchanged = 1;
1981 XSetWindowBackground(display->display, TermWin.vt, 1960 XSetWindowBackground (display->display, TermWin.vt,
1982 PixColors[Color_bg]); 1961 PixColors[Color_bg]);
1983 am_transparent = am_pixmap_trans = 0; 1962 am_transparent = am_pixmap_trans = 0;
1984 } 1963 }
1985 return pchanged; /* Don't try any more */ 1964 return pchanged; /* Don't try any more */
1986 } 1965 }
1987 1966
1988 /* Get all X ops out of the queue so that our information is up-to-date. */ 1967 /* Get all X ops out of the queue so that our information is up-to-date. */
1989 XSync(display->display, False); 1968 XSync (display->display, False);
1990 1969
1991 /* 1970 /*
1992 * Make the frame window set by the window manager have 1971 * Make the frame window set by the window manager have
1993 * the root background. Some window managers put multiple nested frame 1972 * the root background. Some window managers put multiple nested frame
1994 * windows for each client, so we have to take care about that. 1973 * windows for each client, so we have to take care about that.
1995 */ 1974 */
1996 i = (xa[XA_XROOTPMAPID] != 0 1975 i = (xa[XA_XROOTPMAPID] != 0
1997 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID], 1976 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1998 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1977 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1999 &nitems, &bytes_after, &prop) == Success)); 1978 &nitems, &bytes_after, &prop) == Success));
2000 if (!i || prop == NULL) 1979 if (!i || prop == NULL)
2001 have_pixmap = 0; 1980 have_pixmap = 0;
2002 else 1981 else
2003 { 1982 {
2004 have_pixmap = 1; 1983 have_pixmap = 1;
2005 rootpixmap = *((Pixmap *)prop); 1984 rootpixmap = * ((Pixmap *)prop);
2006 XFree(prop); 1985 XFree (prop);
2007 } 1986 }
2008 if (have_pixmap) 1987 if (have_pixmap)
2009 { 1988 {
2010 /* 1989 /*
2011 * Copy display->root pixmap transparency 1990 * Copy display->root pixmap transparency
… …
2015 Window cr; 1994 Window cr;
2016 XImage *image; 1995 XImage *image;
2017 GC gc; 1996 GC gc;
2018 XGCValues gcvalue; 1997 XGCValues gcvalue;
2019 1998
2020 XTranslateCoordinates(display->display, TermWin.parent[0], display->root, 1999 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2021 0, 0, &sx, &sy, &cr); 2000 0, 0, &sx, &sy, &cr);
2022 nw = (unsigned int)szHint.width; 2001 nw = (unsigned int)szHint.width;
2023 nh = (unsigned int)szHint.height; 2002 nh = (unsigned int)szHint.height;
2024 nx = ny = 0; 2003 nx = ny = 0;
2025 if (sx < 0) 2004 if (sx < 0)
… …
2032 { 2011 {
2033 nh += sy; 2012 nh += sy;
2034 ny = -sy; 2013 ny = -sy;
2035 sy = 0; 2014 sy = 0;
2036 } 2015 }
2037 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2016 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2017 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2039 allowedxerror = -1; 2018 allowedxerror = -1;
2040 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2019 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
2041 ZPixmap); 2020 ZPixmap);
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2021 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2022 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2023 allowedxerror = 0;
2045 if (image == NULL) 2024 if (image == NULL)
… …
2047 if (am_transparent && am_pixmap_trans) 2026 if (am_transparent && am_pixmap_trans)
2048 { 2027 {
2049 pchanged = 1; 2028 pchanged = 1;
2050 if (TermWin.pixmap != None) 2029 if (TermWin.pixmap != None)
2051 { 2030 {
2052 XFreePixmap(display->display, TermWin.pixmap); 2031 XFreePixmap (display->display, TermWin.pixmap);
2053 TermWin.pixmap = None; 2032 TermWin.pixmap = None;
2054 } 2033 }
2055 } 2034 }
2056 am_pixmap_trans = 0; 2035 am_pixmap_trans = 0;
2057 } 2036 }
2058 else 2037 else
2059 { 2038 {
2060 if (TermWin.pixmap != None) 2039 if (TermWin.pixmap != None)
2061 XFreePixmap(display->display, TermWin.pixmap); 2040 XFreePixmap (display->display, TermWin.pixmap);
2062 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt, 2041 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2063 (unsigned int)szHint.width, 2042 (unsigned int)szHint.width,
2064 (unsigned int)szHint.height, 2043 (unsigned int)szHint.height,
2065 (unsigned int)image->depth); 2044 (unsigned int)image->depth);
2066 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue); 2045 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2067 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0, 2046 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2068 nx, ny, (unsigned int)image->width, 2047 nx, ny, (unsigned int)image->width,
2069 (unsigned int)image->height); 2048 (unsigned int)image->height);
2070 XFreeGC(display->display, gc); 2049 XFreeGC (display->display, gc);
2071 XDestroyImage(image); 2050 XDestroyImage (image);
2072 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2051 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2073 TermWin.pixmap); 2052 TermWin.pixmap);
2074 if (!am_transparent || !am_pixmap_trans) 2053 if (!am_transparent || !am_pixmap_trans)
2075 pchanged = 1; 2054 pchanged = 1;
2076 am_transparent = am_pixmap_trans = 1; 2055 am_transparent = am_pixmap_trans = 1;
2077 } 2056 }
… …
2080 { 2059 {
2081 unsigned int n; 2060 unsigned int n;
2082 /* 2061 /*
2083 * InheritPixmap transparency 2062 * InheritPixmap transparency
2084 */ 2063 */
2085 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2064 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2086 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2065 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
2087 i++) 2066 i++)
2088 { 2067 {
2089 oldp = TermWin.parent[i]; 2068 oldp = TermWin.parent[i];
2090 XQueryTree(display->display, TermWin.parent[i - 1], &root, 2069 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2091 &TermWin.parent[i], &list, &n); 2070 &TermWin.parent[i], &list, &n);
2092 XFree(list); 2071 XFree (list);
2093 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2072 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2094 if (TermWin.parent[i] == display->root) 2073 if (TermWin.parent[i] == display->root)
2095 { 2074 {
2096 if (oldp != None) 2075 if (oldp != None)
2097 pchanged = 1; 2076 pchanged = 1;
2098 break; 2077 break;
… …
2103 n = 0; 2082 n = 0;
2104 if (pchanged) 2083 if (pchanged)
2105 { 2084 {
2106 for (; n < (unsigned int)i; n++) 2085 for (; n < (unsigned int)i; n++)
2107 { 2086 {
2108 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr); 2087 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2109 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2088 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2110 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2089 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2111 { 2090 {
2112 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2091 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2113 break; 2092 break;
2114 } 2093 }
2115 } 2094 }
2116 } 2095 }
2117 if (n > (int)(sizeof(TermWin.parent) 2096 if (n > (int) (sizeof (TermWin.parent)
2118 / sizeof(TermWin.parent[0]))) 2097 / sizeof (TermWin.parent[0])))
2119 { 2098 {
2120 D_X((stderr, "InheritPixmap Turning off")); 2099 D_X ((stderr, "InheritPixmap Turning off"));
2121 XSetWindowBackground(display->display, TermWin.parent[0], 2100 XSetWindowBackground (display->display, TermWin.parent[0],
2122 PixColors[Color_fg]); 2101 PixColors[Color_fg]);
2123 XSetWindowBackground(display->display, TermWin.vt, 2102 XSetWindowBackground (display->display, TermWin.vt,
2124 PixColors[Color_bg]); 2103 PixColors[Color_bg]);
2125 am_transparent = 0; 2104 am_transparent = 0;
2126 /* XXX: also turn off Opt_transparent? */ 2105 /* XXX: also turn off Opt_transparent? */
2127 } 2106 }
2128 else 2107 else
… …
2132# ifdef HAVE_NANOSLEEP 2111# ifdef HAVE_NANOSLEEP
2133 struct timespec rqt; 2112 struct timespec rqt;
2134 2113
2135 rqt.tv_sec = 1; 2114 rqt.tv_sec = 1;
2136 rqt.tv_nsec = 0; 2115 rqt.tv_nsec = 0;
2137 nanosleep(&rqt, NULL); 2116 nanosleep (&rqt, NULL);
2138# else 2117# else
2139 sleep(1); 2118 sleep (1);
2140# endif 2119# endif
2141 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2120 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2142 for (n = 0; n < (unsigned int)i; n++) 2121 for (n = 0; n < (unsigned int)i; n++)
2143 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n], 2122 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2144 ParentRelative); 2123 ParentRelative);
2145 XSetWindowBackgroundPixmap(display->display, TermWin.vt, 2124 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2146 ParentRelative); 2125 ParentRelative);
2147 am_transparent = 1; 2126 am_transparent = 1;
2148 } 2127 }
2149 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2128 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2150 TermWin.parent[i] = None; 2129 TermWin.parent[i] = None;
2151 } 2130 }
2152 return pchanged; 2131 return pchanged;
2153} 2132}
2154#endif 2133#endif
… …
2159/*----------------------------------------------------------------------*/ 2138/*----------------------------------------------------------------------*/
2160#ifdef PRINTPIPE 2139#ifdef PRINTPIPE
2161FILE * 2140FILE *
2162rxvt_term::popen_printer () 2141rxvt_term::popen_printer ()
2163{ 2142{
2164 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2143 FILE *stream = popen (rs[Rs_print_pipe], "w");
2165 2144
2166 if (stream == NULL) 2145 if (stream == NULL)
2167 rxvt_print_error("can't open printer pipe"); 2146 rxvt_print_error ("can't open printer pipe");
2168 return stream; 2147 return stream;
2169} 2148}
2170 2149
2171int 2150int
2172rxvt_term::pclose_printer (FILE *stream) 2151rxvt_term::pclose_printer (FILE *stream)
2173{ 2152{
2174 fflush (stream); 2153 fflush (stream);
2175 /* pclose() reported not to work on SunOS 4.1.3 */ 2154 /* pclose () reported not to work on SunOS 4.1.3 */
2176# if defined (__sun__) /* TODO: RESOLVE THIS */ 2155# if defined (__sun__) /* TODO: RESOLVE THIS */
2177 /* pclose works provided SIGCHLD handler uses waitpid */ 2156 /* pclose works provided SIGCHLD handler uses waitpid */
2178 return pclose (stream); /* return fclose (stream); */ 2157 return pclose (stream); /* return fclose (stream); */
2179# else 2158# else
2180 return pclose (stream); 2159 return pclose (stream);
… …
2203 unsigned char ch; 2182 unsigned char ch;
2204 unsigned int i, len; 2183 unsigned int i, len;
2205 2184
2206 if ((ch = cmd_getc ()) != C0_ESC) 2185 if ((ch = cmd_getc ()) != C0_ESC)
2207 { 2186 {
2208 if (putc(ch, fd) == EOF) 2187 if (putc (ch, fd) == EOF)
2209 break; /* done = 1 */ 2188 break; /* done = 1 */
2210 } 2189 }
2211 else 2190 else
2212 { 2191 {
2213 len = 0; 2192 len = 0;
… …
2225 if ((buf[len++] = cmd_getc ()) == 'i') 2204 if ((buf[len++] = cmd_getc ()) == 'i')
2226 break; /* done = 1 */ 2205 break; /* done = 1 */
2227 } 2206 }
2228 } 2207 }
2229 for (i = 0; i < len; i++) 2208 for (i = 0; i < len; i++)
2230 if (putc(buf[i], fd) == EOF) 2209 if (putc (buf[i], fd) == EOF)
2231 { 2210 {
2232 done = 1; 2211 done = 1;
2233 break; 2212 break;
2234 } 2213 }
2235 } 2214 }
… …
2255{ 2234{
2256 switch (ch) 2235 switch (ch)
2257 { 2236 {
2258 case C0_ENQ: /* terminal Status */ 2237 case C0_ENQ: /* terminal Status */
2259 if (rs[Rs_answerbackstring]) 2238 if (rs[Rs_answerbackstring])
2260 tt_write( 2239 tt_write (
2261 (const unsigned char *)rs[Rs_answerbackstring], 2240 (const unsigned char *)rs[Rs_answerbackstring],
2262 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2241 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2263 else 2242 else
2264 tt_write((unsigned char *)VT100_ANS, 2243 tt_write ((unsigned char *)VT100_ANS,
2265 (unsigned int)STRLEN(VT100_ANS)); 2244 (unsigned int)STRLEN (VT100_ANS));
2266 break; 2245 break;
2267 case C0_BEL: /* bell */ 2246 case C0_BEL: /* bell */
2268 scr_bell (); 2247 scr_bell ();
2269 break; 2248 break;
2270 case C0_BS: /* backspace */ 2249 case C0_BS: /* backspace */
… …
2332 row = cmd_getc () - ' '; 2311 row = cmd_getc () - ' ';
2333 col = cmd_getc () - ' '; 2312 col = cmd_getc () - ' ';
2334 scr_gotorc (row, col, 0); 2313 scr_gotorc (row, col, 0);
2335 break; 2314 break;
2336 case 'Z': /* identify the terminal type */ 2315 case 'Z': /* identify the terminal type */
2337 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2316 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2338 break; 2317 break;
2339 case '<': /* turn off VT52 mode */ 2318 case '<': /* turn off VT52 mode */
2340 PrivMode(0, PrivMode_vt52); 2319 PrivMode (0, PrivMode_vt52);
2341 break; 2320 break;
2342 case 'F': /* use special graphics character set */ 2321 case 'F': /* use special graphics character set */
2343 case 'G': /* use regular character set */ 2322 case 'G': /* use regular character set */
2344 /* unimplemented */ 2323 /* unimplemented */
2345 break; 2324 break;
… …
2404 scr_forwardindex (); 2383 scr_forwardindex ();
2405 break; 2384 break;
2406#endif 2385#endif
2407 case '=': 2386 case '=':
2408 case '>': 2387 case '>':
2409 PrivMode((ch == '='), PrivMode_aplKP); 2388 PrivMode ((ch == '='), PrivMode_aplKP);
2410 break; 2389 break;
2411 2390
2412 case C1_40: 2391 case C1_40:
2413 cmd_getc (); 2392 cmd_getc ();
2414 break; 2393 break;
… …
2450 process_dcs_seq (); 2429 process_dcs_seq ();
2451 break; 2430 break;
2452 2431
2453 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2432 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2454 case C1_SCI: /* ESC Z */ 2433 case C1_SCI: /* ESC Z */
2455 tt_write((const unsigned char *)ESCZ_ANSWER, 2434 tt_write ((const unsigned char *)ESCZ_ANSWER,
2456 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2435 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2457 break; /* steal obsolete ESC [ c */ 2436 break; /* steal obsolete ESC [ c */
2458 2437
2459 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2438 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2460 case C1_CSI: /* ESC [ */ 2439 case C1_CSI: /* ESC [ */
2461 process_csi_seq (); 2440 process_csi_seq ();
… …
2501 2480
2502#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2481#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2503 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2482 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2504 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2483 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2505#define get_byte_array_bit(array, bit) \ 2484#define get_byte_array_bit(array, bit) \
2506 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2485 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2507 2486
2508const unsigned char csi_defaults[] = 2487const unsigned char csi_defaults[] =
2509 { 2488 {
2510 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2489 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2511 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2490 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2512 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2491 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2513 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2492 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2514 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2493 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2515 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2494 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2516 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2495 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2517 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2496 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2518 }; 2497 };
2519/* *INDENT-ON* */ 2498/* *INDENT-ON* */
2520 2499
2521void 2500void
2522rxvt_term::process_csi_seq () 2501rxvt_term::process_csi_seq ()
… …
2537 ch = cmd_getc (); 2516 ch = cmd_getc ();
2538 } 2517 }
2539 /* read any numerical arguments */ 2518 /* read any numerical arguments */
2540 for (n = -1; ch < CSI_ICH; ) 2519 for (n = -1; ch < CSI_ICH; )
2541 { 2520 {
2542 if (isdigit(ch)) 2521 if (isdigit (ch))
2543 { 2522 {
2544 if (n < 0) 2523 if (n < 0)
2545 n = ch - '0'; 2524 n = ch - '0';
2546 else 2525 else
2547 n = n * 10 + ch - '0'; 2526 n = n * 10 + ch - '0';
… …
2573 2552
2574 if (nargs < ESC_ARGS) 2553 if (nargs < ESC_ARGS)
2575 arg[nargs++] = n; 2554 arg[nargs++] = n;
2576 2555
2577 i = ch - CSI_ICH; 2556 i = ch - CSI_ICH;
2578 ndef = get_byte_array_bit(csi_defaults, i); 2557 ndef = get_byte_array_bit (csi_defaults, i);
2579 for (p = 0; p < nargs; p++) 2558 for (p = 0; p < nargs; p++)
2580 if (arg[p] == -1) 2559 if (arg[p] == -1)
2581 arg[p] = ndef; 2560 arg[p] = ndef;
2582 2561
2583#ifdef DEBUG_CMD 2562#ifdef DEBUG_CMD
2584 fprintf(stderr, "CSI "); 2563 fprintf (stderr, "CSI ");
2585 for (p = 0; p < nargs; p++) 2564 for (p = 0; p < nargs; p++)
2586 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2565 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2587 fprintf(stderr, "%c\n", ch); 2566 fprintf (stderr, "%c\n", ch);
2588#endif 2567#endif
2589 2568
2590 /* 2569 /*
2591 * private mode handling 2570 * private mode handling
2592 */ 2571 */
… …
2594 { 2573 {
2595 switch (priv) 2574 switch (priv)
2596 { 2575 {
2597 case '>': 2576 case '>':
2598 if (ch == CSI_DA) /* secondary device attributes */ 2577 if (ch == CSI_DA) /* secondary device attributes */
2599 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2578 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2600 break; 2579 break;
2601 case '?': 2580 case '?':
2602 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2581 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2603 process_terminal_mode (ch, priv, nargs, arg); 2582 process_terminal_mode (ch, priv, nargs, arg);
2604 break; 2583 break;
… …
2607 } 2586 }
2608 2587
2609 switch (ch) 2588 switch (ch)
2610 { 2589 {
2611 /* 2590 /*
2612 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2591 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2613 */ 2592 */
2614#ifdef PRINTPIPE 2593#ifdef PRINTPIPE
2615 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2594 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2616 switch (arg[0]) 2595 switch (arg[0])
2617 { 2596 {
… …
2713 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2692 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2714 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2693 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2715 break; 2694 break;
2716 2695
2717 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2696 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2718 tt_write((const unsigned char *)VT100_ANS, 2697 tt_write ((const unsigned char *)VT100_ANS,
2719 (unsigned int)(sizeof(VT100_ANS) - 1)); 2698 (unsigned int) (sizeof (VT100_ANS) - 1));
2720 break; 2699 break;
2721 2700
2722 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2701 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2723 process_sgr_mode (nargs, arg); 2702 process_sgr_mode (nargs, arg);
2724 break; 2703 break;
2725 2704
2726 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2705 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2727 switch (arg[0]) 2706 switch (arg[0])
2728 { 2707 {
2729 case 5: /* DSR requested */ 2708 case 5: /* DSR requested */
2730 tt_printf("\033[0n"); 2709 tt_printf ("\033[0n");
2731 break; 2710 break;
2732 case 6: /* CPR requested */ 2711 case 6: /* CPR requested */
2733 scr_report_position (); 2712 scr_report_position ();
2734 break; 2713 break;
2735#if defined (ENABLE_DISPLAY_ANSWER) 2714#if defined (ENABLE_DISPLAY_ANSWER)
2736 case 7: /* unofficial extension */ 2715 case 7: /* unofficial extension */
2737 tt_printf("%-.250s\n", rs[Rs_display_name]); 2716 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2738 break; 2717 break;
2739#endif 2718#endif
2740 case 8: /* unofficial extension */ 2719 case 8: /* unofficial extension */
2741 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2720 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2742 break; 2721 break;
… …
2813 break; 2792 break;
2814#endif 2793#endif
2815 2794
2816 case CSI_78: /* DECREQTPARM */ 2795 case CSI_78: /* DECREQTPARM */
2817 if (arg[0] == 0 || arg[0] == 1) 2796 if (arg[0] == 0 || arg[0] == 1)
2818 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2797 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2819 /* FALLTHROUGH */ 2798 /* FALLTHROUGH */
2820 2799
2821 default: 2800 default:
2822 break; 2801 break;
2823 } 2802 }
… …
2842 { 2821 {
2843 /* 2822 /*
2844 * commands 2823 * commands
2845 */ 2824 */
2846 case 1: /* deiconify window */ 2825 case 1: /* deiconify window */
2847 XMapWindow(display->display, TermWin.parent[0]); 2826 XMapWindow (display->display, TermWin.parent[0]);
2848 break; 2827 break;
2849 case 2: /* iconify window */ 2828 case 2: /* iconify window */
2850 XIconifyWindow(display->display, TermWin.parent[0], 2829 XIconifyWindow (display->display, TermWin.parent[0],
2851 DefaultScreen(display->display)); 2830 DefaultScreen (display->display));
2852 break; 2831 break;
2853 case 3: /* set position (pixels) */ 2832 case 3: /* set position (pixels) */
2854 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]); 2833 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2855 break; 2834 break;
2856 case 4: /* set size (pixels) */ 2835 case 4: /* set size (pixels) */
2857 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2836 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2858 break; 2837 break;
2859 case 5: /* raise window */ 2838 case 5: /* raise window */
2860 XRaiseWindow(display->display, TermWin.parent[0]); 2839 XRaiseWindow (display->display, TermWin.parent[0]);
2861 break; 2840 break;
2862 case 6: /* lower window */ 2841 case 6: /* lower window */
2863 XLowerWindow(display->display, TermWin.parent[0]); 2842 XLowerWindow (display->display, TermWin.parent[0]);
2864 break; 2843 break;
2865 case 7: /* refresh window */ 2844 case 7: /* refresh window */
2866 scr_touch (true); 2845 scr_touch (true);
2867 break; 2846 break;
2868 case 8: /* set size (chars) */ 2847 case 8: /* set size (chars) */
2869 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2848 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2870 (unsigned int)(args[1] * TermWin.fheight)); 2849 (unsigned int) (args[1] * TermWin.fheight));
2871 break; 2850 break;
2872 default: 2851 default:
2873 if (args[0] >= 24) /* set height (chars) */ 2852 if (args[0] >= 24) /* set height (chars) */
2874 set_widthheight ((unsigned int)TermWin.width, 2853 set_widthheight ((unsigned int)TermWin.width,
2875 (unsigned int)(args[1] * TermWin.fheight)); 2854 (unsigned int) (args[1] * TermWin.fheight));
2876 break; 2855 break;
2877 /* 2856 /*
2878 * reports - some output format copied from XTerm 2857 * reports - some output format copied from XTerm
2879 */ 2858 */
2880 case 11: /* report window state */ 2859 case 11: /* report window state */
2881 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2860 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2861 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2883 break; 2862 break;
2884 case 13: /* report window position */ 2863 case 13: /* report window position */
2885 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2864 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2886 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root, 2865 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2887 -wattr.border_width, -wattr.border_width, 2866 -wattr.border_width, -wattr.border_width,
2888 &x, &y, &wdummy); 2867 &x, &y, &wdummy);
2889 tt_printf("\033[3;%d;%dt", x, y); 2868 tt_printf ("\033[3;%d;%dt", x, y);
2890 break; 2869 break;
2891 case 14: /* report window size (pixels) */ 2870 case 14: /* report window size (pixels) */
2892 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr); 2871 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2893 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2872 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2894 break; 2873 break;
2895 case 18: /* report window size (chars) */ 2874 case 18: /* report window size (chars) */
2896 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2875 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2897 break; 2876 break;
2898#if 0 /* XXX: currently disabled due to security concerns */ 2877#if 0 /* XXX: currently disabled due to security concerns */
2899 case 20: /* report icon label */ 2878 case 20: /* report icon label */
2900 XGetIconName(display->display, TermWin.parent[0], &s); 2879 XGetIconName (display->display, TermWin.parent[0], &s);
2901 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2880 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2902 break; 2881 break;
2903 case 21: /* report window title */ 2882 case 21: /* report window title */
2904 XFetchName(display->display, TermWin.parent[0], &s); 2883 XFetchName (display->display, TermWin.parent[0], &s);
2905 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2884 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2906 break; 2885 break;
2907#endif 2886#endif
2908 2887
2909 } 2888 }
2910} 2889}
2911#endif 2890#endif
2912 2891
2913/*----------------------------------------------------------------------*/ 2892/*----------------------------------------------------------------------*/
2914/* 2893/*
2915 * get input up until STRING TERMINATOR (or BEL) 2894 * get input up until STRING TERMINATOR (or BEL)
2916 * ends_how is terminator used. returned input must be free()d 2895 * ends_how is terminator used. returned input must be free ()d
2917 */ 2896 */
2918unsigned char * 2897unsigned char *
2919rxvt_term::get_to_st (unsigned char *ends_how) 2898rxvt_term::get_to_st (unsigned char *ends_how)
2920{ 2899{
2921 int seen_esc = 0; /* seen escape? */ 2900 int seen_esc = 0; /* seen escape? */
… …
2936 } 2915 }
2937 else if (ch == '\t') 2916 else if (ch == '\t')
2938 ch = ' '; /* translate '\t' to space */ 2917 ch = ' '; /* translate '\t' to space */
2939 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2918 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2940 return NULL; /* other control character - exit */ 2919 return NULL; /* other control character - exit */
2941 if (n < sizeof(string) - 1) 2920 if (n < sizeof (string) - 1)
2942 string[n++] = ch; 2921 string[n++] = ch;
2943 seen_esc = 0; 2922 seen_esc = 0;
2944 } 2923 }
2945 string[n++] = '\0'; 2924 string[n++] = '\0';
2946 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2925 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2947 return NULL; 2926 return NULL;
2948 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2927 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2949 STRNCPY(s, string, n); 2928 STRNCPY (s, string, n);
2950 return s; 2929 return s;
2951} 2930}
2952 2931
2953/*----------------------------------------------------------------------*/ 2932/*----------------------------------------------------------------------*/
2954/* 2933/*
… …
2961 /* 2940 /*
2962 * Not handled yet 2941 * Not handled yet
2963 */ 2942 */
2964 s = get_to_st (&eh); 2943 s = get_to_st (&eh);
2965 if (s) 2944 if (s)
2966 free(s); 2945 free (s);
2967 return; 2946 return;
2968} 2947}
2969 2948
2970/*----------------------------------------------------------------------*/ 2949/*----------------------------------------------------------------------*/
2971/* 2950/*
… …
2976{ 2955{
2977 unsigned char ch, eh, *s; 2956 unsigned char ch, eh, *s;
2978 int arg; 2957 int arg;
2979 2958
2980 ch = cmd_getc (); 2959 ch = cmd_getc ();
2981 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2960 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2982 arg = arg * 10 + (ch - '0'); 2961 arg = arg * 10 + (ch - '0');
2983 2962
2984 if (ch == ';') 2963 if (ch == ';')
2985 { 2964 {
2986 s = get_to_st (&eh); 2965 s = get_to_st (&eh);
2987 if (s) 2966 if (s)
2988 { 2967 {
2989 /* 2968 /*
2990 * rxvt_menubar_dispatch() violates the constness of the string, 2969 * rxvt_menubar_dispatch () violates the constness of the string,
2991 * so do it here 2970 * so do it here
2992 */ 2971 */
2993 if (arg == XTerm_Menu) 2972 if (arg == XTerm_Menu)
2994#if 0 /* XXX: currently disabled due to security concerns */ 2973#if 0 /* XXX: currently disabled due to security concerns */
2995 menubar_dispatch ((char *)s); 2974 menubar_dispatch ((char *)s);
2996#else 2975#else
2997 (void)0; 2976 (void)0;
2998#endif 2977#endif
2999 else 2978 else
3000 xterm_seq (arg, (char *)s, eh); 2979 xterm_seq (arg, (char *)s, eh);
3001 free(s); 2980 free (s);
3002 } 2981 }
3003 } 2982 }
3004} 2983}
3005/* 2984/*
3006 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2985 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
… …
3015 * 19 = change underlined character color 2994 * 19 = change underlined character color
3016 * 46 = change logfile (not implemented) 2995 * 46 = change logfile (not implemented)
3017 * 50 = change font 2996 * 50 = change font
3018 * 2997 *
3019 * rxvt extensions: 2998 * rxvt extensions:
2999 * 9 = change locale (NYI)
3020 * 10 = menu (may change in future) 3000 * 10 = menu (may change in future)
3021 * 20 = bg pixmap 3001 * 20 = bg pixmap
3022 * 39 = change default fg color 3002 * 39 = change default fg color
3023 * 49 = change default bg color 3003 * 49 = change default bg color
3024 * 55 = dump scrollback buffer and all of screen 3004 * 55 = dump scrollback buffer and all of screen
3025 */ 3005 */
3026void 3006void
3027rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3007rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
3028{ 3008{
3029 int changed = 0; 3009 int changed = 0;
3030 int color; 3010 int color;
3031 char *buf, *name; 3011 char *buf, *name;
3032 3012
3033 assert(str != NULL); 3013 assert (str != NULL);
3034 switch (op) 3014 switch (op)
3035 { 3015 {
3036 case XTerm_name: 3016 case XTerm_name:
3037 set_title (str); 3017 set_title (str);
3038 /* FALLTHROUGH */ 3018 /* FALLTHROUGH */
… …
3043 set_title (str); 3023 set_title (str);
3044 break; 3024 break;
3045 case XTerm_Color: 3025 case XTerm_Color:
3046 for (buf = (char *)str; buf && *buf;) 3026 for (buf = (char *)str; buf && *buf;)
3047 { 3027 {
3048 if ((name = STRCHR(buf, ';')) == NULL) 3028 if ((name = STRCHR (buf, ';')) == NULL)
3049 break; 3029 break;
3050 *name++ = '\0'; 3030 *name++ = '\0';
3051 color = atoi(buf); 3031 color = atoi (buf);
3052 if (color < 0 || color >= TOTAL_COLORS) 3032 if (color < 0 || color >= TOTAL_COLORS)
3053 break; 3033 break;
3054 if ((buf = STRCHR(name, ';')) != NULL) 3034 if ((buf = STRCHR (name, ';')) != NULL)
3055 *buf++ = '\0'; 3035 *buf++ = '\0';
3056 set_window_color (color + minCOLOR, name); 3036 set_window_color (color + minCOLOR, name);
3057 } 3037 }
3058 break; 3038 break;
3059#ifndef NO_CURSORCOLOR 3039#ifndef NO_CURSORCOLOR
… …
3076 break; 3056 break;
3077#endif 3057#endif
3078 3058
3079 case XTerm_Menu: 3059 case XTerm_Menu:
3080 /* 3060 /*
3081 * rxvt_menubar_dispatch() violates the constness of the string, 3061 * rxvt_menubar_dispatch () violates the constness of the string,
3082 * so DON'T do it here 3062 * so DON'T do it here
3083 */ 3063 */
3084 break; 3064 break;
3085 case XTerm_Pixmap: 3065 case XTerm_Pixmap:
3086 if (*str != ';') 3066 if (*str != ';')
… …
3089 scale_pixmap (""); /* reset to default scaling */ 3069 scale_pixmap (""); /* reset to default scaling */
3090 set_bgPixmap (str); /* change pixmap */ 3070 set_bgPixmap (str); /* change pixmap */
3091#endif 3071#endif
3092 scr_touch (true); 3072 scr_touch (true);
3093 } 3073 }
3094 while ((str = STRCHR(str, ';')) != NULL) 3074 while ((str = STRCHR (str, ';')) != NULL)
3095 { 3075 {
3096 str++; 3076 str++;
3097#if XPM_BACKGROUND 3077#if XPM_BACKGROUND
3098 changed += scale_pixmap (str); 3078 changed += scale_pixmap (str);
3099#endif 3079#endif
… …
3115 set_window_color (Color_bg, str); 3095 set_window_color (Color_bg, str);
3116 break; 3096 break;
3117 case XTerm_logfile: 3097 case XTerm_logfile:
3118 break; 3098 break;
3119 case XTerm_font: 3099 case XTerm_font:
3120 change_font (0, str); 3100 change_font (str);
3101 break;
3102 case XTerm_locale:
3103 if (str[0] == '?' && !str[1])
3104 tt_printf ("%-.250s\n", locale);
3105 else
3106 {
3107 set_locale (str);
3108 im_cb ();
3109
3110 // TODO: call selection_make with the right values set
3111 // to re-fresh the selection.
3112 if (display->selection_owner == this)
3113 display->set_selection_owner (0);
3114 }
3121 break; 3115 break;
3122#if 0 3116#if 0
3123 case XTerm_dumpscreen: /* no error notices */ 3117 case XTerm_dumpscreen: /* no error notices */
3124 { 3118 {
3125 int fd; 3119 int fd;
3126 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3120 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3127 { 3121 {
3128 scr_dump (fd); 3122 scr_dump (fd);
3129 close(fd); 3123 close (fd);
3130 } 3124 }
3131 } 3125 }
3132 break; 3126 break;
3133#endif 3127#endif
3134 3128
… …
3159 else 3153 else
3160 { 3154 {
3161 if (mode == 'r') 3155 if (mode == 'r')
3162 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3156 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3163 else 3157 else
3164 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3158 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3165 PrivMode(state, bit); 3159 PrivMode (state, bit);
3166 } 3160 }
3167 return state; 3161 return state;
3168} 3162}
3169 3163
3170/* we're not using priv _yet_ */ 3164/* we're not using priv _yet_ */
3171void 3165void
3172rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3166rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3173{ 3167{
3174 unsigned int i, j; 3168 unsigned int i, j;
3175 int state; 3169 int state;
3176 static const struct 3170 static const struct
3177 { 3171 {
… …
3220 for (i = 0; i < nargs; i++) 3214 for (i = 0; i < nargs; i++)
3221 { 3215 {
3222 state = -1; 3216 state = -1;
3223 3217
3224 /* basic handling */ 3218 /* basic handling */
3225 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3219 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3226 if (argtopriv[j].argval == arg[i]) 3220 if (argtopriv[j].argval == arg[i])
3227 { 3221 {
3228 state = privcases (mode, argtopriv[j].bit); 3222 state = privcases (mode, argtopriv[j].bit);
3229 break; 3223 break;
3230 } 3224 }
… …
3238 scr_cursor (RESTORE); 3232 scr_cursor (RESTORE);
3239 else if (mode == 1) 3233 else if (mode == 1)
3240 scr_cursor (SAVE); 3234 scr_cursor (SAVE);
3241 /* FALLTHROUGH */ 3235 /* FALLTHROUGH */
3242 default: 3236 default:
3243 continue; /* for(;i;) */ 3237 continue; /* for (;i;) */
3244 } 3238 }
3245 3239
3246 /* extra handling for values with valid 0 or 1 state */ 3240 /* extra handling for values with valid 0 or 1 state */
3247 switch (arg[i]) 3241 switch (arg[i])
3248 { 3242 {
… …
3250 case 2: /* VT52 mode */ 3244 case 2: /* VT52 mode */
3251 /* oddball mode. should be set regardless of set/reset 3245 /* oddball mode. should be set regardless of set/reset
3252 * parameter. Return from VT52 mode with an ESC < from 3246 * parameter. Return from VT52 mode with an ESC < from
3253 * within VT52 mode 3247 * within VT52 mode
3254 */ 3248 */
3255 PrivMode(1, PrivMode_vt52); 3249 PrivMode (1, PrivMode_vt52);
3256 break; 3250 break;
3257 case 3: /* 80/132 */ 3251 case 3: /* 80/132 */
3258 if (PrivateModes & PrivMode_132OK) 3252 if (PrivateModes & PrivMode_132OK)
3259 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3253 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3260 (unsigned int)TermWin.height); 3254 (unsigned int)TermWin.height);
3261 break; 3255 break;
3262 case 4: /* smooth scrolling */ 3256 case 4: /* smooth scrolling */
3263 if (state) 3257 if (state)
3264 Options &= ~Opt_jumpScroll; 3258 Options &= ~Opt_jumpScroll;
… …
3275 scr_autowrap (state); 3269 scr_autowrap (state);
3276 break; 3270 break;
3277 /* case 8: - auto repeat, can't do on a per window basis */ 3271 /* case 8: - auto repeat, can't do on a per window basis */
3278 case 9: /* X10 mouse reporting */ 3272 case 9: /* X10 mouse reporting */
3279 if (state) /* orthogonal */ 3273 if (state) /* orthogonal */
3280 PrivateModes &= ~(PrivMode_MouseX11); 3274 PrivateModes &= ~ (PrivMode_MouseX11);
3281 break; 3275 break;
3282#ifdef menuBar_esc 3276#ifdef menuBar_esc
3283 case menuBar_esc: 3277 case menuBar_esc:
3284#ifdef MENUBAR 3278#ifdef MENUBAR
3285 map_menuBar (state); 3279 map_menuBar (state);
… …
3305 break; 3299 break;
3306 /* case 66: - application key pad */ 3300 /* case 66: - application key pad */
3307 /* case 67: - backspace key */ 3301 /* case 67: - backspace key */
3308 case 1000: /* X11 mouse reporting */ 3302 case 1000: /* X11 mouse reporting */
3309 if (state) /* orthogonal */ 3303 if (state) /* orthogonal */
3310 PrivateModes &= ~(PrivMode_MouseX10); 3304 PrivateModes &= ~ (PrivMode_MouseX10);
3311 break; 3305 break;
3312#if 0 3306#if 0
3313 case 1001: 3307 case 1001:
3314 break; /* X11 mouse highlighting */ 3308 break; /* X11 mouse highlighting */
3315#endif 3309#endif
… …
3385 break; 3379 break;
3386 } 3380 }
3387 if (rendset != -1) 3381 if (rendset != -1)
3388 { 3382 {
3389 scr_rendition (rendset, rendstyle); 3383 scr_rendition (rendset, rendstyle);
3390 continue; /* for(;i;) */ 3384 continue; /* for (;i;) */
3391 } 3385 }
3392 3386
3393 switch (arg[i]) 3387 switch (arg[i])
3394 { 3388 {
3395 case 30: 3389 case 30:
… …
3398 case 33: 3392 case 33:
3399 case 34: 3393 case 34:
3400 case 35: 3394 case 35:
3401 case 36: 3395 case 36:
3402 case 37: 3396 case 37:
3403 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3397 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3404 Color_fg); 3398 Color_fg);
3405 break; 3399 break;
3406#ifdef TTY_256COLOR 3400#ifdef TTY_256COLOR
3407 case 38: 3401 case 38:
3408 if (nargs > i + 2 && arg[i + 1] == 5) 3402 if (nargs > i + 2 && arg[i + 1] == 5)
3409 { 3403 {
3410 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3404 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3411 Color_fg); 3405 Color_fg);
3412 i += 2; 3406 i += 2;
3413 } 3407 }
3414 break; 3408 break;
3415#endif 3409#endif
… …
3423 case 43: 3417 case 43:
3424 case 44: 3418 case 44:
3425 case 45: 3419 case 45:
3426 case 46: 3420 case 46:
3427 case 47: 3421 case 47:
3428 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3422 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3429 Color_bg); 3423 Color_bg);
3430 break; 3424 break;
3431#ifdef TTY_256COLOR 3425#ifdef TTY_256COLOR
3432 case 48: 3426 case 48:
3433 if (nargs > i + 2 && arg[i + 1] == 5) 3427 if (nargs > i + 2 && arg[i + 1] == 5)
3434 { 3428 {
3435 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3429 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3436 Color_bg); 3430 Color_bg);
3437 i += 2; 3431 i += 2;
3438 } 3432 }
3439 break; 3433 break;
3440#endif 3434#endif
… …
3449 case 93: 3443 case 93:
3450 case 94: 3444 case 94:
3451 case 95: 3445 case 95:
3452 case 96: 3446 case 96:
3453 case 97: 3447 case 97:
3454 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3448 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3455 Color_fg); 3449 Color_fg);
3456 break; 3450 break;
3457 case 100: 3451 case 100:
3458 case 101: /* set bright bg color */ 3452 case 101: /* set bright bg color */
3459 case 102: 3453 case 102:
3460 case 103: 3454 case 103:
3461 case 104: 3455 case 104:
3462 case 105: 3456 case 105:
3463 case 106: 3457 case 106:
3464 case 107: 3458 case 107:
3465 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3459 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3466 Color_bg); 3460 Color_bg);
3467 break; 3461 break;
3468#endif 3462#endif
3469 3463
3470 } 3464 }
… …
3476void 3470void
3477rxvt_term::process_graphics () 3471rxvt_term::process_graphics ()
3478{ 3472{
3479 unsigned char ch, cmd = cmd_getc (); 3473 unsigned char ch, cmd = cmd_getc ();
3480 3474
3481#ifndef RXVT_GRAPHICS
3482 if (cmd == 'Q') 3475 if (cmd == 'Q')
3483 { /* query graphics */ 3476 { /* query graphics */
3484 tt_printf("\033G0\n"); /* no graphics */ 3477 tt_printf ("\033G0\n"); /* no graphics */
3485 return; 3478 return;
3486 } 3479 }
3487 /* swallow other graphics sequences until terminating ':' */ 3480 /* swallow other graphics sequences until terminating ':' */
3488 do 3481 do
3489 ch = cmd_getc (); 3482 ch = cmd_getc ();
3490 while (ch != ':'); 3483 while (ch != ':');
3491#else
3492 unsigned int nargs;
3493 int args[NGRX_PTS];
3494 unsigned char *text = NULL;
3495
3496 if (cmd == 'Q')
3497 { /* query graphics */
3498 tt_printf("\033G1\n"); /* yes, graphics (color) */
3499 return;
3500 }
3501 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3502 {
3503 int neg;
3504
3505 ch = cmd_getc ();
3506 neg = (ch == '-');
3507 if (neg || ch == '+')
3508 ch = cmd_getc ();
3509
3510 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3511 args[nargs] = args[nargs] * 10 + (ch - '0');
3512 if (neg)
3513 args[nargs] = -args[nargs];
3514
3515 nargs++;
3516 args[nargs] = 0;
3517 if (ch != ';')
3518 break;
3519 }
3520
3521 if ((cmd == 'T') && (nargs >= 5))
3522 {
3523 int i, len = args[4];
3524
3525 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3526
3527 if (text != NULL)
3528 {
3529 for (i = 0; i < len; i++)
3530 text[i] = cmd_getc ();
3531 text[len] = '\0';
3532 }
3533 }
3534 Gr_do_graphics (cmd, nargs, args, text);
3535#endif
3536} 3484}
3537/*}}} */ 3485/*}}} */
3538 3486
3539/* ------------------------------------------------------------------------- */ 3487/* ------------------------------------------------------------------------- */
3540 3488
3541/* 3489/*
3542 * Send printf() formatted output to the command. 3490 * Send printf () formatted output to the command.
3543 * Only use for small amounts of data. 3491 * Only use for small amounts of data.
3544 */ 3492 */
3545void 3493void
3546rxvt_term::tt_printf (const char *fmt,...) 3494rxvt_term::tt_printf (const char *fmt,...)
3547{ 3495{

Diff Legend

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