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.28 by pcg, Fri Jan 16 22:11:09 2004 UTC vs.
Revision 1.34 by pcg, Sat Jan 31 00:20:21 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.28 2004/01/16 22:11:09 pcg Exp $ 4 * $Id: command.C,v 1.34 2004/01/31 00:20:21 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
53#include <wchar.h> 53#include <wchar.h>
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 56
57/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
58/* INTPROTO */
59void 58void
60rxvt_lookup_key(pR_ XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent *ev)
61{ 60{
62 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
63 unsigned int newlen; 62 unsigned int newlen;
64 KeySym keysym; 63 KeySym keysym;
65#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
… …
74 * 73 *
75 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
76 */ 75 */
77 shft = (ev->state & ShiftMask); 76 shft = (ev->state & ShiftMask);
78 ctrl = (ev->state & ControlMask); 77 ctrl = (ev->state & ControlMask);
79 meta = (ev->state & R->ModMetaMask); 78 meta = (ev->state & ModMetaMask);
80 79
81 if (R->numlock_state || (ev->state & R->ModNumLockMask)) 80 if (numlock_state || (ev->state & ModNumLockMask))
82 { 81 {
83 R->numlock_state = (ev->state & R->ModNumLockMask); 82 numlock_state = (ev->state & ModNumLockMask);
84 PrivMode((!R->numlock_state), PrivMode_aplKP); 83 PrivMode((!numlock_state), PrivMode_aplKP);
85 } 84 }
86 85
87 kbuf[0] = 0; 86 kbuf[0] = 0;
88 87
89#ifdef USE_XIM 88#ifdef USE_XIM
90 if (R->Input_Context) 89 if (Input_Context)
91 { 90 {
92 Status status_return; 91 Status status_return;
93 92
94#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8 && 0) 94 if (enc_utf8 && 0)
96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf,
97 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
98 else 97 else
99#endif 98#endif
100 { 99 {
101 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
102 101
103 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
104 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
105 if (R->rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
106 SET_LOCALE (R->rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
107 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
108 len = XwcLookupString (R->Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, ev, wkbuf,
109 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
110 if (R->rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
111 SET_LOCALE (R->locale); 110 SET_LOCALE (locale);
112 111
113 if (status_return == XLookupChars 112 if (status_return == XLookupChars
114 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
115 { 114 {
116 wkbuf[len] = 0; 115 wkbuf[len] = 0;
… …
126 || status_return == XLookupBoth; 125 || status_return == XLookupBoth;
127 } 126 }
128 else 127 else
129#endif 128#endif
130 { 129 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); 130 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 131 valid_keysym = !len;
133 } 132 }
134 133
135 if (valid_keysym) 134 if (valid_keysym)
136 { 135 {
… …
140 if (ctrl) 139 if (ctrl)
141# else 140# else
142 if (meta) 141 if (meta)
143# endif 142# endif
144 { 143 {
145 if (keysym == R->ks_bigfont) 144 if (keysym == ks_bigfont)
146 { 145 {
147 rxvt_change_font(aR_ 0, FONT_UP); 146 change_font (0, FONT_UP);
148 return; 147 return;
149 } 148 }
150 else if (keysym == R->ks_smallfont) 149 else if (keysym == ks_smallfont)
151 { 150 {
152 rxvt_change_font(aR_ 0, FONT_DN); 151 change_font (0, FONT_DN);
153 return; 152 return;
154 } 153 }
155 } 154 }
156#endif 155#endif
157 156
158 if (R->TermWin.saveLines) { 157 if (TermWin.saveLines) {
159#ifdef UNSHIFTED_SCROLLKEYS 158#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) { 159 if (!ctrl && !meta) {
161#else 160#else
162 if (IS_SCROLL_MOD) { 161 if (IS_SCROLL_MOD) {
163#endif 162#endif
164 int lnsppg; 163 int lnsppg;
165 164
166#ifdef PAGING_CONTEXT_LINES 165#ifdef PAGING_CONTEXT_LINES
167 lnsppg = R->TermWin.nrow - PAGING_CONTEXT_LINES; 166 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
168#else 167#else
169 lnsppg = R->TermWin.nrow * 4 / 5; 168 lnsppg = TermWin.nrow * 4 / 5;
170#endif 169#endif
171 if (keysym == XK_Prior) { 170 if (keysym == XK_Prior) {
172 rxvt_scr_page(aR_ UP, lnsppg); 171 scr_page (UP, lnsppg);
173 return; 172 return;
174 } else if (keysym == XK_Next) { 173 } else if (keysym == XK_Next) {
175 rxvt_scr_page(aR_ DN, lnsppg); 174 scr_page (DN, lnsppg);
176 return; 175 return;
177 } 176 }
178 } 177 }
179#ifdef SCROLL_ON_UPDOWN_KEYS 178#ifdef SCROLL_ON_UPDOWN_KEYS
180 if (IS_SCROLL_MOD) { 179 if (IS_SCROLL_MOD) {
181 if (keysym == XK_Up) { 180 if (keysym == XK_Up) {
182 rxvt_scr_page(aR_ UP, 1); 181 scr_page (UP, 1);
183 return; 182 return;
184 } else if (keysym == XK_Down) { 183 } else if (keysym == XK_Down) {
185 rxvt_scr_page(aR_ DN, 1); 184 scr_page (DN, 1);
186 return; 185 return;
187 } 186 }
188 } 187 }
189#endif 188#endif
190#ifdef SCROLL_ON_HOMEEND_KEYS 189#ifdef SCROLL_ON_HOMEEND_KEYS
191 if (IS_SCROLL_MOD) { 190 if (IS_SCROLL_MOD) {
192 if (keysym == XK_Home) { 191 if (keysym == XK_Home) {
193 rxvt_scr_move_to(aR_ 0, 1); 192 scr_move_to (0, 1);
194 return; 193 return;
195 } else if (keysym == XK_End) { 194 } else if (keysym == XK_End) {
196 rxvt_scr_move_to(aR_ 1, 0); 195 scr_move_to (1, 0);
197 return; 196 return;
198 } 197 }
199 } 198 }
200#endif 199#endif
201 } 200 }
… …
203 if (shft) { 202 if (shft) {
204 /* Shift + F1 - F10 generates F11 - F20 */ 203 /* Shift + F1 - F10 generates F11 - F20 */
205 if (keysym >= XK_F1 && keysym <= XK_F10) { 204 if (keysym >= XK_F1 && keysym <= XK_F10) {
206 keysym += (XK_F11 - XK_F1); 205 keysym += (XK_F11 - XK_F1);
207 shft = 0; /* turn off Shift */ 206 shft = 0; /* turn off Shift */
208 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) { 207 } else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) {
209 switch (keysym) { 208 switch (keysym) {
210 /* normal XTerm key bindings */ 209 /* normal XTerm key bindings */
211 case XK_Insert: /* Shift+Insert = paste mouse selection */ 210 case XK_Insert: /* Shift+Insert = paste mouse selection */
212 rxvt_selection_request(aR_ ev->time, 0, 0); 211 selection_request (ev->time, 0, 0);
213 return; 212 return;
214 /* rxvt extras */ 213 /* rxvt extras */
215 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 214 case XK_KP_Add: /* Shift+KP_Add = bigger font */
216 rxvt_change_font(aR_ 0, FONT_UP); 215 change_font (0, FONT_UP);
217 return; 216 return;
218 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 217 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
219 rxvt_change_font(aR_ 0, FONT_DN); 218 change_font (0, FONT_DN);
220 return; 219 return;
221 } 220 }
222 } 221 }
223 } 222 }
224#ifdef PRINTPIPE 223#ifdef PRINTPIPE
225 if (keysym == XK_Print) { 224 if (keysym == XK_Print) {
226 rxvt_scr_printscreen(aR_ ctrl | shft); 225 scr_printscreen (ctrl | shft);
227 return; 226 return;
228 } 227 }
229#endif 228#endif
230#ifdef GREEK_SUPPORT 229#ifdef GREEK_SUPPORT
231 if (keysym == R->ks_greekmodeswith) { 230 if (keysym == ks_greekmodeswith) {
232 R->greek_mode = !R->greek_mode; 231 greek_mode = !greek_mode;
233 if (R->greek_mode) { 232 if (greek_mode) {
234 rxvt_xterm_seq(aR_ XTerm_title, 233 xterm_seq (XTerm_title,
235 (greek_getmode() == GREEK_ELOT928 234 (greek_getmode() == GREEK_ELOT928
236 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 235 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
237 greek_reset(); 236 greek_reset();
238 } else 237 } else
239 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 238 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
240 return; 239 return;
241 } 240 }
242#endif 241#endif
243 242
244 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 243 if (keysym >= 0xFF00 && keysym <= 0xFFFF) {
245#ifdef KEYSYM_RESOURCE 244#ifdef KEYSYM_RESOURCE
246 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) { 245 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) {
247 unsigned int l; 246 unsigned int l;
248 const unsigned char *kbuf0; 247 const unsigned char *kbuf0;
249 const unsigned char ch = C0_ESC; 248 const unsigned char ch = C0_ESC;
250 249
251 kbuf0 = (R->Keysym_map[keysym & 0xFF]); 250 kbuf0 = (Keysym_map[keysym & 0xFF]);
252 l = (unsigned int)*kbuf0++; 251 l = (unsigned int)*kbuf0++;
253 252
254 /* escape prefix */ 253 /* escape prefix */
255 if (meta) 254 if (meta)
256# ifdef META8_OPTION 255# ifdef META8_OPTION
257 if (R->meta_char == C0_ESC) 256 if (meta_char == C0_ESC)
258# endif 257# endif
259 R->tt_write (&ch, 1); 258 tt_write (&ch, 1);
260 R->tt_write (kbuf0, l); 259 tt_write (kbuf0, l);
261 return; 260 return;
262 } else 261 } else
263#endif 262#endif
264 { 263 {
265 newlen = 1; 264 newlen = 1;
266 switch (keysym) { 265 switch (keysym) {
267#ifndef NO_BACKSPACE_KEY 266#ifndef NO_BACKSPACE_KEY
268 case XK_BackSpace: 267 case XK_BackSpace:
269 if (R->PrivateModes & PrivMode_HaveBackSpace) { 268 if (PrivateModes & PrivMode_HaveBackSpace) {
270 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace) 269 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace)
271 ^ !!ctrl) ? '\b' : '\177'; 270 ^ !!ctrl) ? '\b' : '\177';
272 kbuf[1] = '\0'; 271 kbuf[1] = '\0';
273 } else 272 } else
274 STRCPY(kbuf, R->key_backspace); 273 STRCPY(kbuf, key_backspace);
275# ifdef MULTICHAR_SET 274# ifdef MULTICHAR_SET
276 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 275 if ((Options & Opt_mc_hack) && screen.cur.col > 0) {
277 int col, row; 276 int col, row;
278 277
279 newlen = STRLEN(kbuf); 278 newlen = STRLEN(kbuf);
280 col = R->screen.cur.col - 1; 279 col = screen.cur.col - 1;
281 row = R->screen.cur.row + R->TermWin.saveLines; 280 row = screen.cur.row + TermWin.saveLines;
282 if (IS_MULTI2(R->screen.rend[row][col])) 281 if (IS_MULTI2(screen.rend[row][col]))
283 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 282 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
284 } 283 }
285# endif 284# endif
286 break; 285 break;
287#endif 286#endif
288#ifndef NO_DELETE_KEY 287#ifndef NO_DELETE_KEY
289 case XK_Delete: 288 case XK_Delete:
290 STRCPY(kbuf, R->key_delete); 289 STRCPY(kbuf, key_delete);
291# ifdef MULTICHAR_SET 290# ifdef MULTICHAR_SET
292 if (R->Options & Opt_mc_hack) { 291 if (Options & Opt_mc_hack) {
293 int col, row; 292 int col, row;
294 293
295 newlen = STRLEN(kbuf); 294 newlen = STRLEN(kbuf);
296 col = R->screen.cur.col; 295 col = screen.cur.col;
297 row = R->screen.cur.row + R->TermWin.saveLines; 296 row = screen.cur.row + TermWin.saveLines;
298 if (IS_MULTI1(R->screen.rend[row][col])) 297 if (IS_MULTI1(screen.rend[row][col]))
299 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 298 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
300 } 299 }
301# endif 300# endif
302 break; 301 break;
303#endif 302#endif
… …
321#ifdef XK_KP_Left 320#ifdef XK_KP_Left
322 case XK_KP_Up: /* \033Ox or standard */ 321 case XK_KP_Up: /* \033Ox or standard */
323 case XK_KP_Down: /* \033Or or standard */ 322 case XK_KP_Down: /* \033Or or standard */
324 case XK_KP_Right: /* \033Ov or standard */ 323 case XK_KP_Right: /* \033Ov or standard */
325 case XK_KP_Left: /* \033Ot or standard */ 324 case XK_KP_Left: /* \033Ot or standard */
326 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 325 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
327 STRCPY(kbuf, "\033OZ"); 326 STRCPY(kbuf, "\033OZ");
328 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 327 kbuf[2] = ("txvr"[keysym - XK_KP_Left]);
329 break; 328 break;
330 } else 329 } else
331 /* translate to std. cursor key */ 330 /* translate to std. cursor key */
… …
342 if (shft) 341 if (shft)
343 kbuf[2] = ("dacb"[keysym - XK_Left]); 342 kbuf[2] = ("dacb"[keysym - XK_Left]);
344 else if (ctrl) { 343 else if (ctrl) {
345 kbuf[1] = 'O'; 344 kbuf[1] = 'O';
346 kbuf[2] = ("dacb"[keysym - XK_Left]); 345 kbuf[2] = ("dacb"[keysym - XK_Left]);
347 } else if (R->PrivateModes & PrivMode_aplCUR) 346 } else if (PrivateModes & PrivMode_aplCUR)
348 kbuf[1] = 'O'; 347 kbuf[1] = 'O';
349#ifdef MULTICHAR_SET 348#ifdef MULTICHAR_SET
350 //TODO: ?? 349 //TODO: ??
351 if (R->Options & Opt_mc_hack) { 350 if (Options & Opt_mc_hack) {
352 int col, row, m; 351 int col, row, m;
353 352
354 col = R->screen.cur.col; 353 col = screen.cur.col;
355 row = R->screen.cur.row + R->TermWin.saveLines; 354 row = screen.cur.row + TermWin.saveLines;
356 m = 0; 355 m = 0;
357 if (keysym == XK_Right 356 if (keysym == XK_Right
358 && IS_MULTI1(R->screen.rend[row][col])) 357 && IS_MULTI1(screen.rend[row][col]))
359 m = 1; 358 m = 1;
360 else if (keysym == XK_Left) { 359 else if (keysym == XK_Left) {
361 if (col > 0) { 360 if (col > 0) {
362 if (IS_MULTI2(R->screen.rend[row][col - 1])) 361 if (IS_MULTI2(screen.rend[row][col - 1]))
363 m = 1; 362 m = 1;
364 } else if (R->screen.cur.row > 0) { 363 } else if (screen.cur.row > 0) {
365 col = R->screen.tlen[--row]; 364 col = screen.tlen[--row];
366 if (col == -1) 365 if (col == -1)
367 col = R->TermWin.ncol - 1; 366 col = TermWin.ncol - 1;
368 else 367 else
369 col--; 368 col--;
370 if (col > 0 369 if (col > 0
371 && IS_MULTI2(R->screen.rend[row][col])) 370 && IS_MULTI2(screen.rend[row][col]))
372 m = 1; 371 m = 1;
373 } 372 }
374 } 373 }
375 if (m) 374 if (m)
376 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 375 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
… …
380 379
381#ifndef UNSHIFTED_SCROLLKEYS 380#ifndef UNSHIFTED_SCROLLKEYS
382# ifdef XK_KP_Prior 381# ifdef XK_KP_Prior
383 case XK_KP_Prior: 382 case XK_KP_Prior:
384 /* allow shift to override */ 383 /* allow shift to override */
385 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 384 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
386 STRCPY(kbuf, "\033Oy"); 385 STRCPY(kbuf, "\033Oy");
387 break; 386 break;
388 } 387 }
389 /* FALLTHROUGH */ 388 /* FALLTHROUGH */
390# endif 389# endif
… …
392 STRCPY(kbuf, "\033[5~"); 391 STRCPY(kbuf, "\033[5~");
393 break; 392 break;
394# ifdef XK_KP_Next 393# ifdef XK_KP_Next
395 case XK_KP_Next: 394 case XK_KP_Next:
396 /* allow shift to override */ 395 /* allow shift to override */
397 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 396 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
398 STRCPY(kbuf, "\033Os"); 397 STRCPY(kbuf, "\033Os");
399 break; 398 break;
400 } 399 }
401 /* FALLTHROUGH */ 400 /* FALLTHROUGH */
402# endif 401# endif
… …
404 STRCPY(kbuf, "\033[6~"); 403 STRCPY(kbuf, "\033[6~");
405 break; 404 break;
406#endif 405#endif
407 case XK_KP_Enter: 406 case XK_KP_Enter:
408 /* allow shift to override */ 407 /* allow shift to override */
409 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 408 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
410 STRCPY(kbuf, "\033OM"); 409 STRCPY(kbuf, "\033OM");
411 } else { 410 } else {
412 kbuf[0] = '\r'; 411 kbuf[0] = '\r';
413 kbuf[1] = '\0'; 412 kbuf[1] = '\0';
414 } 413 }
… …
450 case XK_KP_6: /* "\033Ov" : "6" */ 449 case XK_KP_6: /* "\033Ov" : "6" */
451 case XK_KP_7: /* "\033Ow" : "7" */ 450 case XK_KP_7: /* "\033Ow" : "7" */
452 case XK_KP_8: /* "\033Ox" : "8" */ 451 case XK_KP_8: /* "\033Ox" : "8" */
453 case XK_KP_9: /* "\033Oy" : "9" */ 452 case XK_KP_9: /* "\033Oy" : "9" */
454 /* allow shift to override */ 453 /* allow shift to override */
455 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
456 STRCPY(kbuf, "\033Oj"); 455 STRCPY(kbuf, "\033Oj");
457 kbuf[2] += (keysym - XK_KP_Multiply); 456 kbuf[2] += (keysym - XK_KP_Multiply);
458 } else { 457 } else {
459 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 458 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
460 kbuf[1] = '\0'; 459 kbuf[1] = '\0';
… …
478 STRCPY(kbuf, "\033[4~"); 477 STRCPY(kbuf, "\033[4~");
479 break; 478 break;
480#ifdef XK_KP_End 479#ifdef XK_KP_End
481 case XK_KP_End: 480 case XK_KP_End:
482 /* allow shift to override */ 481 /* allow shift to override */
483 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 482 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
484 STRCPY(kbuf, "\033Oq"); 483 STRCPY(kbuf, "\033Oq");
485 break; 484 break;
486 } 485 }
487 /* FALLTHROUGH */ 486 /* FALLTHROUGH */
488#endif 487#endif
… …
490 STRCPY(kbuf, KS_END); 489 STRCPY(kbuf, KS_END);
491 break; 490 break;
492#ifdef XK_KP_Home 491#ifdef XK_KP_Home
493 case XK_KP_Home: 492 case XK_KP_Home:
494 /* allow shift to override */ 493 /* allow shift to override */
495 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 494 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) {
496 STRCPY(kbuf, "\033Ow"); 495 STRCPY(kbuf, "\033Ow");
497 break; 496 break;
498 } 497 }
499 /* FALLTHROUGH */ 498 /* FALLTHROUGH */
500#endif 499#endif
… …
566 } 565 }
567 /* 566 /*
568 * Pass meta for all function keys, if 'meta' option set 567 * Pass meta for all function keys, if 'meta' option set
569 */ 568 */
570#ifdef META8_OPTION 569#ifdef META8_OPTION
571 if (meta && (R->meta_char == 0x80) && len > 0) 570 if (meta && (meta_char == 0x80) && len > 0)
572 kbuf[len - 1] |= 0x80; 571 kbuf[len - 1] |= 0x80;
573#endif 572#endif
574 } else if (ctrl && keysym == XK_minus) { 573 } else if (ctrl && keysym == XK_minus) {
575 len = 1; 574 len = 1;
576 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 575 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
577 } else { 576 } else {
578#ifdef META8_OPTION 577#ifdef META8_OPTION
579 /* set 8-bit on */ 578 /* set 8-bit on */
580 if (meta && (R->meta_char == 0x80)) { 579 if (meta && (meta_char == 0x80)) {
581 unsigned char *ch; 580 unsigned char *ch;
582 581
583 for (ch = kbuf; ch < kbuf + len; ch++) 582 for (ch = kbuf; ch < kbuf + len; ch++)
584 *ch |= 0x80; 583 *ch |= 0x80;
585 meta = 0; 584 meta = 0;
586 } 585 }
587#endif 586#endif
588#ifdef GREEK_SUPPORT 587#ifdef GREEK_SUPPORT
589 if (R->greek_mode) 588 if (greek_mode)
590 len = greek_xlat(kbuf, len); 589 len = greek_xlat(kbuf, len);
591#endif 590#endif
592 /* nil */ ; 591 /* nil */ ;
593 } 592 }
594 } 593 }
595 594
596 if (len <= 0) 595 if (len <= 0)
597 return; /* not mapped */ 596 return; /* not mapped */
598 597
599 if (R->Options & Opt_scrollTtyKeypress) 598 if (Options & Opt_scrollTtyKeypress)
600 if (R->TermWin.view_start) { 599 if (TermWin.view_start) {
601 R->TermWin.view_start = 0; 600 TermWin.view_start = 0;
602 R->want_refresh = 1; 601 want_refresh = 1;
603 } 602 }
604 603
605/* 604/*
606 * these modifications only affect the static keybuffer 605 * these modifications only affect the static keybuffer
607 * pass Shift/Control indicators for function keys ending with `~' 606 * pass Shift/Control indicators for function keys ending with `~'
… …
617 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 616 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
618 617
619/* escape prefix */ 618/* escape prefix */
620 if (meta 619 if (meta
621#ifdef META8_OPTION 620#ifdef META8_OPTION
622 && (R->meta_char == C0_ESC) 621 && (meta_char == C0_ESC)
623#endif 622#endif
624 ) { 623 ) {
625 const unsigned char ch = C0_ESC; 624 const unsigned char ch = C0_ESC;
626 625
627 R->tt_write(&ch, 1); 626 tt_write(&ch, 1);
628 } 627 }
629#ifdef DEBUG_CMD 628#ifdef DEBUG_CMD
630 if (debug_key) { /* Display keyboard buffer contents */ 629 if (debug_key) { /* Display keyboard buffer contents */
631 char *p; 630 char *p;
632 int i; 631 int i;
… …
635 for (i = 0, p = kbuf; i < len; i++, p++) 634 for (i = 0, p = kbuf; i < len; i++, p++)
636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 635 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
637 fprintf(stderr, "'\n"); 636 fprintf(stderr, "'\n");
638 } 637 }
639#endif /* DEBUG_CMD */ 638#endif /* DEBUG_CMD */
640 R->tt_write (kbuf, (unsigned int)len); 639 tt_write (kbuf, (unsigned int)len);
641} 640}
642/*}}} */ 641/*}}} */
643 642
644#if (MENUBAR_MAX) 643#if (MENUBAR_MAX)
645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 644/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
646/* attempt to `write' count to the input buffer */ 645/* attempt to `write' count to the input buffer */
647/* EXTPROTO */
648unsigned int 646unsigned int
649rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 647rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
650{ 648{
651 unsigned int n, s; 649 unsigned int n, s;
652 unsigned char *cmdbuf_base = R->cmdbuf_base,
653 *cmdbuf_endp = R->cmdbuf_endp,
654 *cmdbuf_ptr = R->cmdbuf_ptr;
655 650
656 n = cmdbuf_ptr - cmdbuf_base; 651 n = cmdbuf_ptr - cmdbuf_base;
657 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 652 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
658 if (n > 0 && s < count) { 653 if (n > 0 && s < count) {
659 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 654 MEMMOVE(cmdbuf_base, cmdbuf_ptr,
… …
666 rxvt_print_error("data loss: cmd_write too large"); 661 rxvt_print_error("data loss: cmd_write too large");
667 count = s; 662 count = s;
668 } 663 }
669 for (; count--;) 664 for (; count--;)
670 *cmdbuf_endp++ = *str++; 665 *cmdbuf_endp++ = *str++;
671 R->cmdbuf_ptr = cmdbuf_ptr;
672 R->cmdbuf_endp = cmdbuf_endp;
673 return 0; 666 return 0;
674} 667}
675#endif /* MENUBAR_MAX */ 668#endif /* MENUBAR_MAX */
676 669
677void 670void
… …
688#endif 681#endif
689 682
690 if (want_refresh) 683 if (want_refresh)
691 { 684 {
692 scr_refresh (refresh_type); 685 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1); 686 scrollbar_show (1);
694#ifdef USE_XIM 687#ifdef USE_XIM
695 rxvt_IMSendSpot (this); 688 IMSendSpot ();
696#endif 689#endif
697 } 690 }
698 691
699 XFlush (Xdisplay); 692 XFlush (Xdisplay);
700} 693}
… …
716 XEvent xev; 709 XEvent xev;
717 710
718 XNextEvent (Xdisplay, &xev); 711 XNextEvent (Xdisplay, &xev);
719 712
720#if defined(CURSOR_BLINK) 713#if defined(CURSOR_BLINK)
721 if ((Options & Opt_cursorBlink) 714 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
722 && xev.type == KeyPress)
723 { 715 {
724 if (hidden_cursor) 716 if (hidden_cursor)
725 { 717 {
726 hidden_cursor = 0; 718 hidden_cursor = 0;
727 want_refresh = 1; 719 want_refresh = 1;
728 } 720 }
729 721
730 blink_ev.start (NOW + BLINK_INTERVAL); 722 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
731 } 723 }
732#endif 724#endif
733 725
734#if defined(POINTER_BLANK) 726#if defined(POINTER_BLANK)
735 if ((Options & Opt_pointerBlank) 727 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
736 && (pointerBlankDelay > 0))
737 { 728 {
738 if (xev.type == MotionNotify 729 if (xev.type == MotionNotify
739 || xev.type == ButtonPress 730 || xev.type == ButtonPress
740 || xev.type == ButtonRelease) 731 || xev.type == ButtonRelease)
741 if (hidden_pointer) 732 if (hidden_pointer)
… …
747#endif 738#endif
748 739
749#ifdef USE_XIM 740#ifdef USE_XIM
750 if (!XFilterEvent (&xev, xev.xany.window)) 741 if (!XFilterEvent (&xev, xev.xany.window))
751#endif 742#endif
752 rxvt_process_x_event (this, &xev); 743 process_x_event (&xev);
753 } 744 }
754 while (XPending (Xdisplay)); 745 while (XPending (Xdisplay));
755} 746}
756 747
757#ifdef CURSOR_BLINK 748#ifdef CURSOR_BLINK
758void 749void
759rxvt_term::blink_cb (time_watcher &w) 750rxvt_term::cursor_blink_cb (time_watcher &w)
760{ 751{
761 hidden_cursor = !hidden_cursor; 752 hidden_cursor = !hidden_cursor;
762 want_refresh = 1; 753 want_refresh = 1;
763 754
764 w.start (w.at + BLINK_INTERVAL); 755 w.start (w.at + BLINK_INTERVAL);
756}
757#endif
758
759#ifdef TEXT_BLINK
760void
761rxvt_term::text_blink_cb (time_watcher &w)
762{
763 if (scr_refresh_rend (RS_Blink, RS_Blink))
764 {
765 hidden_text = !hidden_text;
766 want_refresh = 1;
767 w.start (w.at + TEXT_BLINK_INTERVAL);
768 }
765} 769}
766#endif 770#endif
767 771
768void 772void
769rxvt_term::x_cb (io_watcher &w, short revents) 773rxvt_term::x_cb (io_watcher &w, short revents)
… …
870 break; 874 break;
871 } 875 }
872 } 876 }
873 } 877 }
874 878
875 rxvt_scr_add_lines (this, buf, nlines, str - buf); 879 scr_add_lines (buf, nlines, str - buf);
876 880
877 /* 881 /*
878 * If there have been a lot of new lines, then update the screen 882 * If there have been a lot of new lines, then update the screen
879 * What the heck I'll cheat and only refresh less than every page-full. 883 * What the heck I'll cheat and only refresh less than every page-full.
880 * the number of pages between refreshes is refresh_limit, which 884 * the number of pages between refreshes is refresh_limit, which
… …
895 else 899 else
896 { 900 {
897 switch (ch) 901 switch (ch)
898 { 902 {
899 default: 903 default:
900 rxvt_process_nonprinting (this, ch); 904 process_nonprinting (ch);
901 break; 905 break;
902 case C0_ESC: /* escape char */ 906 case C0_ESC: /* escape char */
903 rxvt_process_escape_seq (this); 907 process_escape_seq ();
904 break; 908 break;
905 /*case 0x9b: */ /* CSI */ 909 /*case 0x9b: */ /* CSI */
906 /* rxvt_process_csi_seq (this); */ 910 /* process_csi_seq (); */
907 } 911 }
908 912
909 ch = NOCHAR; 913 ch = NOCHAR;
910 } 914 }
911 } 915 }
… …
922 { 926 {
923 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 927 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
924 return *cmdbuf_ptr++; 928 return *cmdbuf_ptr++;
925 929
926 wchar_t wc; 930 wchar_t wc;
927 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 931 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
928 932
929 if (len == (size_t)-2) 933 if (len == (size_t)-2)
930 return NOCHAR; 934 return NOCHAR;
931 935
932 if (len == (size_t)-1) 936 if (len == (size_t)-1)
… …
943/* rxvt_cmd_getc() - Return next input character */ 947/* rxvt_cmd_getc() - Return next input character */
944/* 948/*
945 * Return the next input character after first passing any keyboard input 949 * Return the next input character after first passing any keyboard input
946 * to the command. 950 * to the command.
947 */ 951 */
948/* INTPROTO */
949uint32_t 952uint32_t
950rxvt_cmd_getc(pR) 953rxvt_term::cmd_getc ()
951{ 954{
952 for (;;) 955 for (;;)
953 { 956 {
954 uint32_t c = R->next_char (); 957 uint32_t c = next_char ();
955 if (c != NOCHAR) 958 if (c != NOCHAR)
956 return c; 959 return c;
957 960
958 // incomplete sequences should occur rarely, still, a better solution 961 // incomplete sequences should occur rarely, still, a better solution
959 // would be preferred. either setjmp/longjmp or better design. 962 // would be preferred. either setjmp/longjmp or better design.
960 fcntl (R->cmd_fd, F_SETFL, 0); 963 fcntl (cmd_fd, F_SETFL, 0);
961 R->pty_fill (); 964 pty_fill ();
962 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 965 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
963 } 966 }
964 967
965#if 0 968#if 0
966#define TIMEOUT_USEC 5000 969#define TIMEOUT_USEC 5000
967 fd_set readfds; 970 fd_set readfds;
… …
973#endif 976#endif
974 977
975 for (;;) { 978 for (;;) {
976 /* loop until we can return something */ 979 /* loop until we can return something */
977 980
978 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */ 981 if (v_bufstr < v_bufptr) /* output any pending chars */
979 R->tt_write(NULL, 0); 982 tt_write(NULL, 0);
980 983
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 984#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 if (R->mouse_slip_wheel_speed) { 985 if (mouse_slip_wheel_speed) {
983 quick_timeout = 1; 986 quick_timeout = 1;
984 if (!R->mouse_slip_wheel_delay-- 987 if (!mouse_slip_wheel_delay--
985 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN, 988 && scr_page (mouse_slip_wheel_speed > 0 ? UP : DN,
986 abs(R->mouse_slip_wheel_speed))) { 989 abs(mouse_slip_wheel_speed))) {
987 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 990 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
988 R->refresh_type |= SMOOTH_REFRESH; 991 refresh_type |= SMOOTH_REFRESH;
989 R->want_refresh = 1; 992 want_refresh = 1;
990 } 993 }
991 } 994 }
992#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */ 995#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
993#ifdef SELECTION_SCROLLING 996#ifdef SELECTION_SCROLLING
994 if (R->pending_scroll_selection) { 997 if (pending_scroll_selection) {
995 quick_timeout = 1; 998 quick_timeout = 1;
996 if (!R->scroll_selection_delay-- 999 if (!scroll_selection_delay--
997 && rxvt_scr_page(aR_ R->scroll_selection_dir, 1000 && scr_page (scroll_selection_dir,
998 R->scroll_selection_lines)) { 1001 scroll_selection_lines)) {
999 R->selection_extend (R->selection_save_x, 1002 selection_extend (selection_save_x,
1000 R->selection_save_y, R->selection_save_state); 1003 selection_save_y, selection_save_state);
1001 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1004 scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1002 R->refresh_type |= SMOOTH_REFRESH; 1005 refresh_type |= SMOOTH_REFRESH;
1003 R->want_refresh = 1; 1006 want_refresh = 1;
1004 } 1007 }
1005 } 1008 }
1006#endif 1009#endif
1007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1010#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1008 if (scrollbar_isUp() || scrollbar_isDn()) { 1011 if (scrollbar_isUp() || scrollbar_isDn()) {
1009 quick_timeout = 1; 1012 quick_timeout = 1;
1010 if (!R->scroll_arrow_delay-- 1013 if (!scroll_arrow_delay--
1011 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) { 1014 && scr_page (scrollbar_isUp() ? UP : DN, 1)) {
1012 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY; 1015 scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1013 R->refresh_type |= SMOOTH_REFRESH; 1016 refresh_type |= SMOOTH_REFRESH;
1014 R->want_refresh = 1; 1017 want_refresh = 1;
1015 } 1018 }
1016 } 1019 }
1017#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */ 1020#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1018 1021
1019#ifdef TRANSPARENT 1022#ifdef TRANSPARENT
1020 quick_timeout |= R->want_full_refresh; 1023 quick_timeout |= want_full_refresh;
1021#endif 1024#endif
1022#endif 1025#endif
1023} 1026}
1024 1027
1028#ifdef POINTER_BLANK
1025void 1029void
1026rxvt_term::pointer_unblank () 1030rxvt_term::pointer_unblank ()
1027{ 1031{
1028 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1032 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1029 recolour_cursor (); 1033 recolour_cursor ();
1030 1034
1031#ifdef POINTER_BLANK
1032 hidden_pointer = 0; 1035 hidden_pointer = 0;
1033 1036
1034 if (Options & Opt_pointerBlank) 1037 if (Options & Opt_pointerBlank)
1035 pointer_ev.start (NOW + pointerBlankDelay); 1038 pointer_ev.start (NOW + pointerBlankDelay);
1036#endif
1037} 1039}
1038 1040
1039#ifdef POINTER_BLANK
1040void 1041void
1041rxvt_term::pointer_blank () 1042rxvt_term::pointer_blank ()
1042{ 1043{
1043 if (!(Options & Opt_pointerBlank)) 1044 if (!(Options & Opt_pointerBlank))
1044 return; 1045 return;
… …
1057 1058
1058 pointer_blank (); 1059 pointer_blank ();
1059} 1060}
1060#endif 1061#endif
1061 1062
1062/* INTPROTO */
1063void 1063void
1064rxvt_mouse_report(pR_ const XButtonEvent *ev) 1064rxvt_term::mouse_report (const XButtonEvent *ev)
1065{ 1065{
1066 int button_number, key_state = 0; 1066 int button_number, key_state = 0;
1067 int x, y; 1067 int x, y;
1068 1068
1069 x = ev->x; 1069 x = ev->x;
1070 y = ev->y; 1070 y = ev->y;
1071 R->pixel_position (&x, &y); 1071 pixel_position (&x, &y);
1072 1072
1073 if (R->MEvent.button == AnyButton) { 1073 if (MEvent.button == AnyButton) {
1074 button_number = 3; 1074 button_number = 3;
1075 } else { 1075 } else {
1076 button_number = R->MEvent.button - Button1; 1076 button_number = MEvent.button - Button1;
1077 /* add 0x3D for wheel events, like xterm does */ 1077 /* add 0x3D for wheel events, like xterm does */
1078 if (button_number >= 3) 1078 if (button_number >= 3)
1079 button_number += (64 - 3); 1079 button_number += (64 - 3);
1080 } 1080 }
1081 1081
1082 if (R->PrivateModes & PrivMode_MouseX10) { 1082 if (PrivateModes & PrivMode_MouseX10) {
1083 /* 1083 /*
1084 * do not report ButtonRelease 1084 * do not report ButtonRelease
1085 * no state info allowed 1085 * no state info allowed
1086 */ 1086 */
1087 key_state = 0; 1087 key_state = 0;
… …
1093 * 8 = Meta 1093 * 8 = Meta
1094 * 16 = Control 1094 * 16 = Control
1095 * plus will add in our own Double-Click reporting 1095 * plus will add in our own Double-Click reporting
1096 * 32 = Double Click 1096 * 32 = Double Click
1097 */ 1097 */
1098 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1098 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1099 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1099 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1100 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1100 + ((MEvent.state & ControlMask) ? 16 : 0);
1101#ifdef MOUSE_REPORT_DOUBLECLICK 1101#ifdef MOUSE_REPORT_DOUBLECLICK
1102 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1102 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1103#endif 1103#endif
1104 } 1104 }
1105 1105
1106#ifdef DEBUG_MOUSEREPORT 1106#ifdef DEBUG_MOUSEREPORT
1107 fprintf(stderr, "Mouse ["); 1107 fprintf(stderr, "Mouse [");
… …
1116 fprintf(stderr, "]: <%d>, %d/%d\n", 1116 fprintf(stderr, "]: <%d>, %d/%d\n",
1117 button_number, 1117 button_number,
1118 x + 1, 1118 x + 1,
1119 y + 1); 1119 y + 1);
1120#else 1120#else
1121 R->tt_printf("\033[M%c%c%c", 1121 tt_printf("\033[M%c%c%c",
1122 (32 + button_number + key_state), 1122 (32 + button_number + key_state),
1123 (32 + x + 1), 1123 (32 + x + 1),
1124 (32 + y + 1)); 1124 (32 + y + 1));
1125#endif 1125#endif
1126} 1126}
1127 1127
1128#ifdef USING_W11LIB 1128#ifdef USING_W11LIB
1129/* EXTPROTO */
1130void 1129void
1131rxvt_W11_process_x_event(XEvent *ev) 1130rxvt_W11_process_x_event(XEvent *ev)
1132{ 1131{
1133 rxvt_t *r = rxvt_get_r(); 1132 rxvt_t *r = rxvt_get_r();
1134 1133
1135 rxvt_process_x_event(aR_ ev); 1134 process_x_event (ev);
1136} 1135}
1137#endif 1136#endif
1138 1137
1139/*{{{ process an X event */ 1138/*{{{ process an X event */
1140/* INTPROTO */
1141void 1139void
1142rxvt_process_x_event(pR_ XEvent *ev) 1140rxvt_term::process_x_event (XEvent *ev)
1143{ 1141{
1144 int i, want_timeout;
1145 Window unused_root, unused_child; 1142 Window unused_root, unused_child;
1146 int unused_root_x, unused_root_y; 1143 int unused_root_x, unused_root_y;
1147 unsigned int unused_mask; 1144 unsigned int unused_mask;
1148 1145
1149#ifdef DEBUG_X 1146#ifdef DEBUG_X
… …
1190#ifdef DEBUG_X 1187#ifdef DEBUG_X
1191 struct timeval tp; 1188 struct timeval tp;
1192 struct tm *ltt; 1189 struct tm *ltt;
1193 (void)gettimeofday(&tp, NULL); 1190 (void)gettimeofday(&tp, NULL);
1194 ltt = localtime(&(tp.tv_sec)); 1191 ltt = localtime(&(tp.tv_sec));
1195 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->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)); 1192 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == TermWin.parent[0] ? "parent" : (ev->xany.window == TermWin.vt ? "vt" : (ev->xany.window == scrollBar.win ? "scroll" : (ev->xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev->xany.window == TermWin.vt ? TermWin.vt : (ev->xany.window == scrollBar.win ? scrollBar.win : (ev->xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev->xany.send_event ? "S" : " ", ev->xany.serial));
1196#endif 1193#endif
1197 1194
1198 switch (ev->type) { 1195 switch (ev->type) {
1199 case KeyPress: 1196 case KeyPress:
1200 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1197 lookup_key ((XKeyEvent *)ev);
1201 break; 1198 break;
1202 1199
1203#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1200#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1204 case KeyRelease: 1201 case KeyRelease:
1205 { 1202 {
1206 if (!(ev->xkey.state & ControlMask)) 1203 if (!(ev->xkey.state & ControlMask))
1207 R->mouse_slip_wheel_speed = 0; 1204 mouse_slip_wheel_speed = 0;
1208 else { 1205 else {
1209 KeySym ks; 1206 KeySym ks;
1210 1207
1211 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1208 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0);
1212 if (ks == XK_Control_L || ks == XK_Control_R) 1209 if (ks == XK_Control_L || ks == XK_Control_R)
1213 R->mouse_slip_wheel_speed = 0; 1210 mouse_slip_wheel_speed = 0;
1214 } 1211 }
1215 break; 1212 break;
1216 } 1213 }
1217#endif 1214#endif
1218 1215
1219 case ButtonPress: 1216 case ButtonPress:
1220 rxvt_button_press(aR_ (XButtonEvent *)ev); 1217 button_press ((XButtonEvent *)ev);
1221 break; 1218 break;
1222 1219
1223 case ButtonRelease: 1220 case ButtonRelease:
1224 rxvt_button_release(aR_ (XButtonEvent *)ev); 1221 button_release ((XButtonEvent *)ev);
1225 break; 1222 break;
1226 1223
1227 case ClientMessage: 1224 case ClientMessage:
1228 if (ev->xclient.format == 32 1225 if (ev->xclient.format == 32
1229 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1226 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1230 R->destroy (); 1227 destroy ();
1231#ifdef OFFIX_DND 1228#ifdef OFFIX_DND
1232 /* OffiX Dnd (drag 'n' drop) protocol */ 1229 /* OffiX Dnd (drag 'n' drop) protocol */
1233 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1230 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL]
1234 && (ev->xclient.data.l[0] == DndFile 1231 && (ev->xclient.data.l[0] == DndFile
1235 || ev->xclient.data.l[0] == DndDir 1232 || ev->xclient.data.l[0] == DndDir
1236 || ev->xclient.data.l[0] == DndLink)) { 1233 || ev->xclient.data.l[0] == DndLink)) {
1237 /* Get Dnd data */ 1234 /* Get Dnd data */
1238 Atom ActualType; 1235 Atom ActualType;
1239 int ActualFormat; 1236 int ActualFormat;
1240 unsigned char *data; 1237 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1238 unsigned long Size, RemainingBytes;
1242 1239
1243 XGetWindowProperty(R->Xdisplay, Xroot, 1240 XGetWindowProperty(Xdisplay, Xroot,
1244 R->xa[XA_DNDSELECTION], 1241 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1242 0L, 1000000L,
1246 False, AnyPropertyType, 1243 False, AnyPropertyType,
1247 &ActualType, &ActualFormat, 1244 &ActualType, &ActualFormat,
1248 &Size, &RemainingBytes, 1245 &Size, &RemainingBytes,
1249 &data); 1246 &data);
1250 XChangeProperty(R->Xdisplay, Xroot, 1247 XChangeProperty(Xdisplay, Xroot,
1251 XA_CUT_BUFFER0, XA_STRING, 1248 XA_CUT_BUFFER0, XA_STRING,
1252 8, PropModeReplace, 1249 8, PropModeReplace,
1253 data, STRLEN(data)); 1250 data, STRLEN(data));
1254 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1251 selection_paste (Xroot, XA_CUT_BUFFER0, True);
1255 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1252 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime);
1256 } 1253 }
1257#endif /* OFFIX_DND */ 1254#endif /* OFFIX_DND */
1258 break; 1255 break;
1259 1256
1260 case MappingNotify: 1257 case MappingNotify:
… …
1273 */ 1270 */
1274 case VisibilityNotify: 1271 case VisibilityNotify:
1275 switch (ev->xvisibility.state) 1272 switch (ev->xvisibility.state)
1276 { 1273 {
1277 case VisibilityUnobscured: 1274 case VisibilityUnobscured:
1278 R->refresh_type = FAST_REFRESH; 1275 refresh_type = FAST_REFRESH;
1279 break; 1276 break;
1280 case VisibilityPartiallyObscured: 1277 case VisibilityPartiallyObscured:
1281 R->refresh_type = SLOW_REFRESH; 1278 refresh_type = SLOW_REFRESH;
1282 break; 1279 break;
1283 default: 1280 default:
1284 R->refresh_type = NO_REFRESH; 1281 refresh_type = NO_REFRESH;
1285 break; 1282 break;
1286 } 1283 }
1287 break; 1284 break;
1288 1285
1289 case FocusIn: 1286 case FocusIn:
1290 if (!R->TermWin.focus) { 1287 if (!TermWin.focus) {
1291 R->TermWin.focus = 1; 1288 TermWin.focus = 1;
1292 R->want_refresh = 1; 1289 want_refresh = 1;
1293#ifdef USE_XIM 1290#ifdef USE_XIM
1294 if (R->Input_Context != NULL) 1291 if (Input_Context != NULL)
1295 XSetICFocus(R->Input_Context); 1292 XSetICFocus(Input_Context);
1296#endif 1293#endif
1297#ifdef CURSOR_BLINK 1294#ifdef CURSOR_BLINK
1298 if (R->Options & Opt_cursorBlink) 1295 if (Options & Opt_cursorBlink)
1299 R->blink_ev.start (NOW + BLINK_INTERVAL); 1296 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1300#endif 1297#endif
1301 } 1298 }
1302 break; 1299 break;
1303 1300
1304 case FocusOut: 1301 case FocusOut:
1305 if (R->TermWin.focus) { 1302 if (TermWin.focus) {
1306 R->TermWin.focus = 0; 1303 TermWin.focus = 0;
1307 R->want_refresh = 1; 1304 want_refresh = 1;
1308#ifdef USE_XIM 1305#ifdef USE_XIM
1309 if (R->Input_Context != NULL) 1306 if (Input_Context != NULL)
1310 XUnsetICFocus(R->Input_Context); 1307 XUnsetICFocus(Input_Context);
1311#endif 1308#endif
1312#ifdef CURSOR_BLINK 1309#ifdef CURSOR_BLINK
1313 if (R->Options & Opt_cursorBlink) 1310 if (Options & Opt_cursorBlink)
1314 R->blink_ev.stop (); 1311 cursor_blink_ev.stop ();
1315 R->hidden_cursor = 0; 1312 hidden_cursor = 0;
1316#endif 1313#endif
1317 } 1314 }
1318 break; 1315 break;
1319 1316
1320 case ConfigureNotify: 1317 case ConfigureNotify:
1321 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1318 if (ev->xconfigure.window == TermWin.parent[0]) {
1322 int height, width; 1319 int height, width;
1323 1320
1324 do { /* Wrap lots of configures into one */ 1321 do { /* Wrap lots of configures into one */
1325 width = ev->xconfigure.width; 1322 width = ev->xconfigure.width;
1326 height = ev->xconfigure.height; 1323 height = ev->xconfigure.height;
1327 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1324 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1328 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1325 } while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window,
1329 ConfigureNotify, ev)); 1326 ConfigureNotify, ev));
1330 if (R->szHint.width != width || R->szHint.height != height) { 1327 if (szHint.width != width || szHint.height != height) {
1331 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1328 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1332 R->resize_all_windows (width, height, 1); 1329 resize_all_windows (width, height, 1);
1333 } 1330 }
1334#ifdef DEBUG_SIZE 1331#ifdef DEBUG_SIZE
1335 else { 1332 else {
1336 D_SIZE((stderr, "Size: Not resizing")); 1333 D_SIZE((stderr, "Size: Not resizing"));
1337 } 1334 }
1338#endif 1335#endif
1339#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1336#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1340 if (R->Options & Opt_transparent) { 1337 if (Options & Opt_transparent) {
1341 rxvt_check_our_parents(aR); 1338 check_our_parents ();
1342 if (R->am_transparent) 1339 if (am_transparent)
1343 R->want_full_refresh = 1; 1340 want_full_refresh = 1;
1344 } 1341 }
1345#endif 1342#endif
1346 } 1343 }
1347 break; 1344 break;
1348 1345
1349 case SelectionClear: 1346 case SelectionClear:
1350 rxvt_selection_clear(aR); 1347 selection_clear ();
1351 break; 1348 break;
1352 1349
1353 case SelectionNotify: 1350 case SelectionNotify:
1354 if (R->selection_wait == Sel_normal) 1351 if (selection_wait == Sel_normal)
1355 rxvt_selection_paste(aR_ ev->xselection.requestor, 1352 selection_paste (ev->xselection.requestor,
1356 ev->xselection.property, True); 1353 ev->xselection.property, True);
1357 break; 1354 break;
1358 1355
1359 case SelectionRequest: 1356 case SelectionRequest:
1360 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1357 selection_send (&(ev->xselectionrequest));
1361 break; 1358 break;
1362 1359
1363 case UnmapNotify: 1360 case UnmapNotify:
1364 R->TermWin.mapped = 0; 1361 TermWin.mapped = 0;
1362#ifdef TEXT_BLINK
1363 text_blink_ev.stop ();
1364#endif
1365 break; 1365 break;
1366 1366
1367 case MapNotify: 1367 case MapNotify:
1368 R->TermWin.mapped = 1; 1368 TermWin.mapped = 1;
1369#ifdef TEXT_BLINK
1370 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1371#endif
1369 break; 1372 break;
1370 1373
1371 case PropertyNotify: 1374 case PropertyNotify:
1372 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1375 if (ev->xproperty.atom == xa[XA_VT_SELECTION]) {
1373 if (ev->xproperty.state == PropertyNewValue) 1376 if (ev->xproperty.state == PropertyNewValue)
1374 rxvt_selection_property(aR_ ev->xproperty.window, 1377 selection_property (ev->xproperty.window,
1375 ev->xproperty.atom); 1378 ev->xproperty.atom);
1376 break; 1379 break;
1377 } 1380 }
1378#ifdef TRANSPARENT 1381#ifdef TRANSPARENT
1379 /* 1382 /*
1380 * if user used some Esetroot compatible prog to set the root bg, 1383 * if user used some Esetroot compatible prog to set the root bg,
1381 * use the property to determine the pixmap. We use it later on. 1384 * use the property to determine the pixmap. We use it later on.
1382 */ 1385 */
1383 if (R->xa[XA_XROOTPMAPID] == 0) 1386 if (xa[XA_XROOTPMAPID] == 0)
1384 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay, 1387 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1385 "_XROOTPMAP_ID", False); 1388 "_XROOTPMAP_ID", False);
1386 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID]) 1389 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1387 break; 1390 break;
1388 /* FALLTHROUGH */ 1391 /* FALLTHROUGH */
1389 case ReparentNotify: 1392 case ReparentNotify:
1390 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1393 if ((Options & Opt_transparent) && check_our_parents ()) {
1391 if (R->am_transparent) 1394 if (am_transparent)
1392 R->want_full_refresh = 1; 1395 want_full_refresh = 1;
1393 } 1396 }
1394#endif /* TRANSPARENT */ 1397#endif /* TRANSPARENT */
1395 break; 1398 break;
1396 1399
1397 case GraphicsExpose: 1400 case GraphicsExpose:
1398 case Expose: 1401 case Expose:
1399 if (ev->xany.window == R->TermWin.vt) { 1402 if (ev->xany.window == TermWin.vt) {
1400#ifdef NO_SLOW_LINK_SUPPORT 1403#ifdef NO_SLOW_LINK_SUPPORT
1401 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1404 scr_expose (ev->xexpose.x, ev->xexpose.y,
1402 ev->xexpose.width, ev->xexpose.height, False); 1405 ev->xexpose.width, ev->xexpose.height, False);
1403#else 1406#else
1404 // don't understand this, so commented it out 1407 // don't understand this, so commented it out
1405 R->scr_expose (ev->xexpose.x, ev->xexpose.y, 1408 scr_expose (ev->xexpose.x, ev->xexpose.y,
1406 ev->xexpose.width, ev->xexpose.height, False); 1409 ev->xexpose.width, ev->xexpose.height, False);
1407 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1410 //scr_expose (ev->xexpose.x, 0,
1408 // ev->xexpose.width, R->TermWin.height, False); 1411 // ev->xexpose.width, TermWin.height, False);
1409#endif 1412#endif
1410 R->want_refresh = 1; 1413 want_refresh = 1;
1411 } else { 1414 } else {
1412 XEvent unused_xevent; 1415 XEvent unused_xevent;
1413 1416
1414 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1417 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window,
1415 Expose, 1418 Expose,
1416 &unused_xevent)) ; 1419 &unused_xevent)) ;
1417 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1420 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window,
1418 GraphicsExpose, 1421 GraphicsExpose,
1419 &unused_xevent)) ; 1422 &unused_xevent)) ;
1420 if (isScrollbarWindow(ev->xany.window)) { 1423 if (isScrollbarWindow(ev->xany.window)) {
1421 R->scrollBar.setIdle(); 1424 scrollBar.setIdle();
1422 rxvt_scrollbar_show(aR_ 0); 1425 scrollbar_show (0);
1423 } 1426 }
1424#ifdef MENUBAR 1427#ifdef MENUBAR
1425 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1428 if (menubar_visible () && isMenuBarWindow(ev->xany.window))
1426 rxvt_menubar_expose(aR); 1429 menubar_expose ();
1427#endif 1430#endif
1428#ifdef RXVT_GRAPHICS 1431#ifdef RXVT_GRAPHICS
1429 rxvt_Gr_expose(aR_ ev->xany.window); 1432 Gr_expose (ev->xany.window);
1430#endif 1433#endif
1431 } 1434 }
1432 break; 1435 break;
1433 1436
1434 case MotionNotify: 1437 case MotionNotify:
1435#ifdef POINTER_BLANK 1438#ifdef POINTER_BLANK
1436 if (R->hidden_pointer) 1439 if (hidden_pointer)
1437 R->pointer_unblank (); 1440 pointer_unblank ();
1438#endif 1441#endif
1439#if MENUBAR 1442#if MENUBAR
1440 if (isMenuBarWindow(ev->xany.window)) { 1443 if (isMenuBarWindow(ev->xany.window)) {
1441 rxvt_menubar_control(aR_ &(ev->xbutton)); 1444 menubar_control (&(ev->xbutton));
1442 break; 1445 break;
1443 } 1446 }
1444#endif 1447#endif
1445 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1448 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate))
1446 break; 1449 break;
1447 1450
1448 if (ev->xany.window == R->TermWin.vt) { 1451 if (ev->xany.window == TermWin.vt) {
1449 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1452 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) {
1450 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1453 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt,
1451 MotionNotify, ev)) ; 1454 MotionNotify, ev)) ;
1452 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1455 XQueryPointer(Xdisplay, TermWin.vt,
1453 &unused_root, &unused_child, 1456 &unused_root, &unused_child,
1454 &unused_root_x, &unused_root_y, 1457 &unused_root_x, &unused_root_y,
1455 &(ev->xbutton.x), &(ev->xbutton.y), 1458 &(ev->xbutton.x), &(ev->xbutton.y),
1456 &unused_mask); 1459 &unused_mask);
1457#ifdef MOUSE_THRESHOLD 1460#ifdef MOUSE_THRESHOLD
1458 /* deal with a `jumpy' mouse */ 1461 /* deal with a `jumpy' mouse */
1459 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1462 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) {
1460#endif 1463#endif
1461 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1464 selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1462 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1465 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1463#ifdef SELECTION_SCROLLING 1466#ifdef SELECTION_SCROLLING
1464 if (ev->xbutton.y<R->TermWin.int_bwidth || 1467 if (ev->xbutton.y < TermWin.int_bwidth
1465 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1468 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) {
1466 int dist; 1469 int dist;
1467 1470
1468 R->pending_scroll_selection=1; 1471 pending_scroll_selection=1;
1469 1472
1470 /* don't clobber the current delay if we are 1473 /* don't clobber the current delay if we are
1471 * already in the middle of scrolling. 1474 * already in the middle of scrolling.
1472 */ 1475 */
1473 if (R->scroll_selection_delay<=0) 1476 if (scroll_selection_delay<=0)
1474 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1477 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1475 1478
1476 /* save the event params so we can highlight 1479 /* save the event params so we can highlight
1477 * the selection in the pending-scroll loop 1480 * the selection in the pending-scroll loop
1478 */ 1481 */
1479 R->selection_save_x=ev->xbutton.x; 1482 selection_save_x=ev->xbutton.x;
1480 R->selection_save_y=ev->xbutton.y; 1483 selection_save_y=ev->xbutton.y;
1481 R->selection_save_state= 1484 selection_save_state=
1482 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1485 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1483 1486
1484 /* calc number of lines to scroll */ 1487 /* calc number of lines to scroll */
1485 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1488 if (ev->xbutton.y<TermWin.int_bwidth) {
1486 R->scroll_selection_dir = UP; 1489 scroll_selection_dir = UP;
1487 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1490 dist = TermWin.int_bwidth - ev->xbutton.y;
1488 } 1491 }
1489 else { 1492 else {
1490 R->scroll_selection_dir = DN; 1493 scroll_selection_dir = DN;
1491 dist = ev->xbutton.y - 1494 dist = ev->xbutton.y -
1492 (R->TermWin.int_bwidth + R->TermWin.height); 1495 (TermWin.int_bwidth + TermWin.height);
1493 } 1496 }
1494 R->scroll_selection_lines=(Pixel2Height(dist)/ 1497 scroll_selection_lines=(Pixel2Height(dist)/
1495 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1498 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1496 MIN_IT(R->scroll_selection_lines, 1499 MIN_IT(scroll_selection_lines,
1497 SELECTION_SCROLL_MAX_LINES); 1500 SELECTION_SCROLL_MAX_LINES);
1498 } 1501 }
1499 else { 1502 else {
1500 /* we are within the text window, so we 1503 /* we are within the text window, so we
1501 * shouldn't be scrolling 1504 * shouldn't be scrolling
1502 */ 1505 */
1503 R->pending_scroll_selection = 0; 1506 pending_scroll_selection = 0;
1504 } 1507 }
1505#endif 1508#endif
1506#ifdef MOUSE_THRESHOLD 1509#ifdef MOUSE_THRESHOLD
1507 } 1510 }
1508#endif 1511#endif
1509 } 1512 }
1510 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) { 1513 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1511 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win, 1514 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win,
1512 MotionNotify, ev)) ; 1515 MotionNotify, ev)) ;
1513 XQueryPointer(R->Xdisplay, R->scrollBar.win, 1516 XQueryPointer(Xdisplay, scrollBar.win,
1514 &unused_root, &unused_child, 1517 &unused_root, &unused_child,
1515 &unused_root_x, &unused_root_y, 1518 &unused_root_x, &unused_root_y,
1516 &(ev->xbutton.x), &(ev->xbutton.y), 1519 &(ev->xbutton.x), &(ev->xbutton.y),
1517 &unused_mask); 1520 &unused_mask);
1518 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1521 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO,
1519 scrollbar_size()); 1522 scrollbar_size());
1520 R->scr_refresh (R->refresh_type); 1523 scr_refresh (refresh_type);
1521 R->refresh_limit = 0; 1524 refresh_limit = 0;
1522 rxvt_scrollbar_show(aR_ 1); 1525 scrollbar_show (1);
1523 } 1526 }
1524 break; 1527 break;
1525 } 1528 }
1526} 1529}
1527 1530
1528/* INTPROTO */
1529void 1531void
1530rxvt_button_press(pR_ XButtonEvent *ev) 1532rxvt_term::button_press (XButtonEvent *ev)
1531{ 1533{
1532 int reportmode = 0, clickintime; 1534 int reportmode = 0, clickintime;
1533 1535
1534 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1536 bypass_keystate = ev->state & (ModMetaMask | ShiftMask);
1535 if (!R->bypass_keystate) 1537 if (!bypass_keystate)
1536 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1538 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1537/* 1539/*
1538 * VT window processing of button press 1540 * VT window processing of button press
1539 */ 1541 */
1540 if (ev->window == R->TermWin.vt) 1542 if (ev->window == TermWin.vt)
1541 { 1543 {
1542#if RXVT_GRAPHICS 1544#if RXVT_GRAPHICS
1543 if (ev->subwindow != None) 1545 if (ev->subwindow != None)
1544 rxvt_Gr_ButtonPress (ev->x, ev->y); 1546 rxvt_Gr_ButtonPress (ev->x, ev->y);
1545 else 1547 else
1546#endif 1548#endif
1547 { 1549 {
1548 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1550 clickintime = ev->time - MEvent.time < MULTICLICK_TIME;
1549 if (reportmode) 1551 if (reportmode)
1550 { 1552 {
1551 /* mouse report from vt window */ 1553 /* mouse report from vt window */
1552 /* save the xbutton state (for ButtonRelease) */ 1554 /* save the xbutton state (for ButtonRelease) */
1553 R->MEvent.state = ev->state; 1555 MEvent.state = ev->state;
1554#ifdef MOUSE_REPORT_DOUBLECLICK 1556#ifdef MOUSE_REPORT_DOUBLECLICK
1555 if (ev->button == R->MEvent.button && clickintime) 1557 if (ev->button == MEvent.button && clickintime)
1556 { 1558 {
1557 /* same button, within alloted time */ 1559 /* same button, within alloted time */
1558 R->MEvent.clicks++; 1560 MEvent.clicks++;
1559 if (R->MEvent.clicks > 1) 1561 if (MEvent.clicks > 1)
1560 { 1562 {
1561 /* only report double clicks */ 1563 /* only report double clicks */
1562 R->MEvent.clicks = 2; 1564 MEvent.clicks = 2;
1563 rxvt_mouse_report(aR_ ev); 1565 mouse_report (ev);
1564 1566
1565 /* don't report the release */ 1567 /* don't report the release */
1566 R->MEvent.clicks = 0; 1568 MEvent.clicks = 0;
1567 R->MEvent.button = AnyButton; 1569 MEvent.button = AnyButton;
1568 } 1570 }
1569 } 1571 }
1570 else 1572 else
1571 { 1573 {
1572 /* different button, or time expired */ 1574 /* different button, or time expired */
1573 R->MEvent.clicks = 1; 1575 MEvent.clicks = 1;
1574 R->MEvent.button = ev->button; 1576 MEvent.button = ev->button;
1575 rxvt_mouse_report(aR_ ev); 1577 mouse_report (ev);
1576 } 1578 }
1577#else 1579#else
1578 R->MEvent.button = ev->button; 1580 MEvent.button = ev->button;
1579 rxvt_mouse_report(aR_ ev); 1581 mouse_report (ev);
1580#endif /* MOUSE_REPORT_DOUBLECLICK */ 1582#endif /* MOUSE_REPORT_DOUBLECLICK */
1581 } 1583 }
1582 else 1584 else
1583 { 1585 {
1584 if (ev->button != R->MEvent.button) 1586 if (ev->button != MEvent.button)
1585 R->MEvent.clicks = 0; 1587 MEvent.clicks = 0;
1586 switch (ev->button) 1588 switch (ev->button)
1587 { 1589 {
1588 case Button1: 1590 case Button1:
1589 /* allow shift+left click to extend selection */ 1591 /* allow shift+left click to extend selection */
1590 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report)) 1592 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report))
1591 { 1593 {
1592 if (R->MEvent.button == Button1 && clickintime) 1594 if (MEvent.button == Button1 && clickintime)
1593 R->selection_rotate (ev->x, ev->y); 1595 selection_rotate (ev->x, ev->y);
1594 else 1596 else
1595 R->selection_extend (ev->x, ev->y, 1); 1597 selection_extend (ev->x, ev->y, 1);
1596 } 1598 }
1597 else 1599 else
1598 { 1600 {
1599 if (R->MEvent.button == Button1 && clickintime) 1601 if (MEvent.button == Button1 && clickintime)
1600 R->MEvent.clicks++; 1602 MEvent.clicks++;
1601 else 1603 else
1602 R->MEvent.clicks = 1; 1604 MEvent.clicks = 1;
1603 1605
1604 R->selection_click (R->MEvent.clicks, ev->x, ev->y); 1606 selection_click (MEvent.clicks, ev->x, ev->y);
1605 } 1607 }
1606 1608
1607 R->MEvent.button = Button1; 1609 MEvent.button = Button1;
1608 break; 1610 break;
1609 1611
1610 case Button3: 1612 case Button3:
1611 if (R->MEvent.button == Button3 && clickintime) 1613 if (MEvent.button == Button3 && clickintime)
1612 R->selection_rotate (ev->x, ev->y); 1614 selection_rotate (ev->x, ev->y);
1613 else 1615 else
1614 R->selection_extend (ev->x, ev->y, 1); 1616 selection_extend (ev->x, ev->y, 1);
1615 R->MEvent.button = Button3; 1617 MEvent.button = Button3;
1616 break; 1618 break;
1617 } 1619 }
1618 } 1620 }
1619 R->MEvent.time = ev->time; 1621 MEvent.time = ev->time;
1620 return; 1622 return;
1621 } 1623 }
1622 } 1624 }
1623 1625
1624/* 1626/*
1625 * Scrollbar window processing of button press 1627 * Scrollbar window processing of button press
1626 */ 1628 */
1627 if (isScrollbarWindow(ev->window)) 1629 if (isScrollbarWindow(ev->window))
1628 { 1630 {
1629 R->scrollBar.setIdle (); 1631 scrollBar.setIdle ();
1630 /* 1632 /*
1631 * Rxvt-style scrollbar: 1633 * Rxvt-style scrollbar:
1632 * move up if mouse is above slider 1634 * move up if mouse is above slider
1633 * move dn if mouse is below slider 1635 * move dn if mouse is below slider
1634 * 1636 *
… …
1642 /* 1644 /*
1643 * Mouse report disabled scrollbar: 1645 * Mouse report disabled scrollbar:
1644 * arrow buttons - send up/down 1646 * arrow buttons - send up/down
1645 * click on scrollbar - send pageup/down 1647 * click on scrollbar - send pageup/down
1646 */ 1648 */
1647 if ((R->scrollBar.style == R_SB_NEXT 1649 if ((scrollBar.style == R_SB_NEXT
1648 && scrollbarnext_upButton(ev->y)) 1650 && scrollbarnext_upButton(ev->y))
1649 || (R->scrollBar.style == R_SB_RXVT 1651 || (scrollBar.style == R_SB_RXVT
1650 && scrollbarrxvt_upButton(ev->y))) 1652 && scrollbarrxvt_upButton(ev->y)))
1651 R->tt_printf("\033[A"); 1653 tt_printf("\033[A");
1652 else if ((R->scrollBar.style == R_SB_NEXT 1654 else if ((scrollBar.style == R_SB_NEXT
1653 && scrollbarnext_dnButton(ev->y)) 1655 && scrollbarnext_dnButton(ev->y))
1654 || (R->scrollBar.style == R_SB_RXVT 1656 || (scrollBar.style == R_SB_RXVT
1655 && scrollbarrxvt_dnButton(ev->y))) 1657 && scrollbarrxvt_dnButton(ev->y)))
1656 R->tt_printf("\033[B"); 1658 tt_printf("\033[B");
1657 else 1659 else
1658 switch (ev->button) { 1660 switch (ev->button) {
1659 case Button2: 1661 case Button2:
1660 R->tt_printf("\014"); 1662 tt_printf("\014");
1661 break; 1663 break;
1662 case Button1: 1664 case Button1:
1663 R->tt_printf("\033[6~"); 1665 tt_printf("\033[6~");
1664 break; 1666 break;
1665 case Button3: 1667 case Button3:
1666 R->tt_printf("\033[5~"); 1668 tt_printf("\033[5~");
1667 break; 1669 break;
1668 } 1670 }
1669 } 1671 }
1670 else 1672 else
1671#endif /* NO_SCROLLBAR_REPORT */ 1673#endif /* NO_SCROLLBAR_REPORT */
1672 { 1674 {
1673 char upordown = 0; 1675 char upordown = 0;
1674 1676
1675 if (R->scrollBar.style == R_SB_NEXT) { 1677 if (scrollBar.style == R_SB_NEXT) {
1676 if (scrollbarnext_upButton(ev->y)) 1678 if (scrollbarnext_upButton(ev->y))
1677 upordown = -1; /* up */ 1679 upordown = -1; /* up */
1678 else if (scrollbarnext_dnButton(ev->y)) 1680 else if (scrollbarnext_dnButton(ev->y))
1679 upordown = 1; /* down */ 1681 upordown = 1; /* down */
1680 } else if (R->scrollBar.style == R_SB_RXVT) { 1682 } else if (scrollBar.style == R_SB_RXVT) {
1681 if (scrollbarrxvt_upButton(ev->y)) 1683 if (scrollbarrxvt_upButton(ev->y))
1682 upordown = -1; /* up */ 1684 upordown = -1; /* up */
1683 else if (scrollbarrxvt_dnButton(ev->y)) 1685 else if (scrollbarrxvt_dnButton(ev->y))
1684 upordown = 1; /* down */ 1686 upordown = 1; /* down */
1685 } 1687 }
1686 if (upordown) { 1688 if (upordown) {
1687#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1689#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1688 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1690 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1689#endif 1691#endif
1690 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) { 1692 if (scr_page (upordown < 0 ? UP : DN, 1)) {
1691 if (upordown < 0) 1693 if (upordown < 0)
1692 R->scrollBar.setUp (); 1694 scrollBar.setUp ();
1693 else 1695 else
1694 R->scrollBar.setDn (); 1696 scrollBar.setDn ();
1695 } 1697 }
1696 } else 1698 } else
1697 switch (ev->button) { 1699 switch (ev->button) {
1698 case Button2: 1700 case Button2:
1699 switch (R->scrollbar_align) { 1701 switch (scrollbar_align) {
1700 case R_SB_ALIGN_TOP: 1702 case R_SB_ALIGN_TOP:
1701 R->csrO = 0; 1703 csrO = 0;
1702 break; 1704 break;
1703 case R_SB_ALIGN_CENTRE: 1705 case R_SB_ALIGN_CENTRE:
1704 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2; 1706 csrO = (scrollBar.bot - scrollBar.top) / 2;
1705 break; 1707 break;
1706 case R_SB_ALIGN_BOTTOM: 1708 case R_SB_ALIGN_BOTTOM:
1707 R->csrO = R->scrollBar.bot - R->scrollBar.top; 1709 csrO = scrollBar.bot - scrollBar.top;
1708 break; 1710 break;
1709 } 1711 }
1710 if (R->scrollBar.style == R_SB_XTERM 1712 if (scrollBar.style == R_SB_XTERM
1711 || scrollbar_above_slider(ev->y) 1713 || scrollbar_above_slider(ev->y)
1712 || scrollbar_below_slider(ev->y)) 1714 || scrollbar_below_slider(ev->y))
1713 rxvt_scr_move_to(aR_
1714 scrollbar_position(ev->y) - R->csrO, 1715 scr_move_to ( scrollbar_position(ev->y) - csrO,
1715 scrollbar_size()); 1716 scrollbar_size());
1716 R->scrollBar.setMotion (); 1717 scrollBar.setMotion ();
1717 break; 1718 break;
1718 1719
1719 case Button1: 1720 case Button1:
1720 if (R->scrollbar_align == R_SB_ALIGN_CENTRE) 1721 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1721 R->csrO = ev->y - R->scrollBar.top; 1722 csrO = ev->y - scrollBar.top;
1722 /* FALLTHROUGH */ 1723 /* FALLTHROUGH */
1723 1724
1724 case Button3: 1725 case Button3:
1725 if (R->scrollBar.style != R_SB_XTERM) { 1726 if (scrollBar.style != R_SB_XTERM) {
1726 if (scrollbar_above_slider(ev->y)) 1727 if (scrollbar_above_slider(ev->y))
1727# ifdef RXVT_SCROLL_FULL 1728# ifdef RXVT_SCROLL_FULL
1728 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1); 1729 scr_page (UP, TermWin.nrow - 1);
1729# else 1730# else
1730 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4); 1731 scr_page (UP, TermWin.nrow / 4);
1731# endif 1732# endif
1732 else if (scrollbar_below_slider(ev->y)) 1733 else if (scrollbar_below_slider(ev->y))
1733# ifdef RXVT_SCROLL_FULL 1734# ifdef RXVT_SCROLL_FULL
1734 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1); 1735 scr_page (DN, TermWin.nrow - 1);
1735# else 1736# else
1736 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4); 1737 scr_page (DN, TermWin.nrow / 4);
1737# endif 1738# endif
1738 else 1739 else
1739 R->scrollBar.setMotion (); 1740 scrollBar.setMotion ();
1740 } else { 1741 } else {
1741 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP), 1742 scr_page ((ev->button == Button1 ? DN : UP),
1742 (R->TermWin.nrow 1743 (TermWin.nrow
1743 * scrollbar_position(ev->y) 1744 * scrollbar_position(ev->y)
1744 / scrollbar_size())); 1745 / scrollbar_size()));
1745 } 1746 }
1746 break; 1747 break;
1747 } 1748 }
… …
1751#if MENUBAR 1752#if MENUBAR
1752 /* 1753 /*
1753 * Menubar window processing of button press 1754 * Menubar window processing of button press
1754 */ 1755 */
1755 if (isMenuBarWindow(ev->window)) 1756 if (isMenuBarWindow(ev->window))
1756 rxvt_menubar_control(aR_ ev); 1757 menubar_control (ev);
1757#endif 1758#endif
1758} 1759}
1759 1760
1760/* INTPROTO */
1761void 1761void
1762rxvt_button_release(pR_ XButtonEvent *ev) 1762rxvt_term::button_release (XButtonEvent *ev)
1763{ 1763{
1764 int reportmode = 0; 1764 int reportmode = 0;
1765 1765
1766 R->csrO = 0; /* reset csr Offset */ 1766 csrO = 0; /* reset csr Offset */
1767 if (!R->bypass_keystate) 1767 if (!bypass_keystate)
1768 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1768 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1769 1769
1770 if (scrollbar_isUpDn()) { 1770 if (scrollbar_isUpDn()) {
1771 R->scrollBar.setIdle (); 1771 scrollBar.setIdle ();
1772 rxvt_scrollbar_show(aR_ 0); 1772 scrollbar_show (0);
1773#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1773#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1774 R->refresh_type &= ~SMOOTH_REFRESH; 1774 refresh_type &= ~SMOOTH_REFRESH;
1775#endif 1775#endif
1776 } 1776 }
1777#ifdef SELECTION_SCROLLING 1777#ifdef SELECTION_SCROLLING
1778 R->pending_scroll_selection=0; 1778 pending_scroll_selection=0;
1779#endif 1779#endif
1780 if (ev->window == R->TermWin.vt) 1780 if (ev->window == TermWin.vt)
1781 { 1781 {
1782#ifdef RXVT_GRAPHICS 1782#ifdef RXVT_GRAPHICS
1783 if (ev->subwindow != None) 1783 if (ev->subwindow != None)
1784 rxvt_Gr_ButtonRelease(ev->x, ev->y); 1784 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1785 else 1785 else
… …
1791 /* don't report release of wheel "buttons" */ 1791 /* don't report release of wheel "buttons" */
1792 if (ev->button >= 4) 1792 if (ev->button >= 4)
1793 return; 1793 return;
1794#ifdef MOUSE_REPORT_DOUBLECLICK 1794#ifdef MOUSE_REPORT_DOUBLECLICK
1795 /* only report the release of 'slow' single clicks */ 1795 /* only report the release of 'slow' single clicks */
1796 if (R->MEvent.button != AnyButton 1796 if (MEvent.button != AnyButton
1797 && (ev->button != R->MEvent.button 1797 && (ev->button != MEvent.button
1798 || (ev->time - R->MEvent.time 1798 || (ev->time - MEvent.time
1799 > MULTICLICK_TIME / 2))) 1799 > MULTICLICK_TIME / 2)))
1800 { 1800 {
1801 R->MEvent.clicks = 0; 1801 MEvent.clicks = 0;
1802 R->MEvent.button = AnyButton; 1802 MEvent.button = AnyButton;
1803 rxvt_mouse_report(aR_ ev); 1803 mouse_report (ev);
1804 } 1804 }
1805#else /* MOUSE_REPORT_DOUBLECLICK */ 1805#else /* MOUSE_REPORT_DOUBLECLICK */
1806 R->MEvent.button = AnyButton; 1806 MEvent.button = AnyButton;
1807 rxvt_mouse_report(aR_ ev); 1807 mouse_report (ev);
1808#endif /* MOUSE_REPORT_DOUBLECLICK */ 1808#endif /* MOUSE_REPORT_DOUBLECLICK */
1809 return; 1809 return;
1810 } 1810 }
1811 /* 1811 /*
1812 * dumb hack to compensate for the failure of click-and-drag 1812 * dumb hack to compensate for the failure of click-and-drag
1813 * when overriding mouse reporting 1813 * when overriding mouse reporting
1814 */ 1814 */
1815 if (R->PrivateModes & PrivMode_mouse_report 1815 if (PrivateModes & PrivMode_mouse_report
1816 && R->bypass_keystate 1816 && bypass_keystate
1817 && ev->button == Button1 && R->MEvent.clicks <= 1) 1817 && ev->button == Button1 && MEvent.clicks <= 1)
1818 R->selection_extend (ev->x, ev->y, 0); 1818 selection_extend (ev->x, ev->y, 0);
1819 1819
1820 switch (ev->button) { 1820 switch (ev->button) {
1821 case Button1: 1821 case Button1:
1822 case Button3: 1822 case Button3:
1823 rxvt_selection_make(aR_ ev->time); 1823 selection_make (ev->time);
1824 break; 1824 break;
1825 case Button2: 1825 case Button2:
1826 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1826 selection_request (ev->time, ev->x, ev->y);
1827 break; 1827 break;
1828#ifdef MOUSE_WHEEL 1828#ifdef MOUSE_WHEEL
1829 case Button4: 1829 case Button4:
1830 case Button5: 1830 case Button5:
1831 { 1831 {
… …
1833 page_dirn v; 1833 page_dirn v;
1834 1834
1835 v = (ev->button == Button4) ? UP : DN; 1835 v = (ev->button == Button4) ? UP : DN;
1836 if (ev->state & ShiftMask) 1836 if (ev->state & ShiftMask)
1837 i = 1; 1837 i = 1;
1838 else if ((R->Options & Opt_mouseWheelScrollPage)) 1838 else if ((Options & Opt_mouseWheelScrollPage))
1839 i = R->TermWin.nrow - 1; 1839 i = TermWin.nrow - 1;
1840 else 1840 else
1841 i = 5; 1841 i = 5;
1842# ifdef MOUSE_SLIP_WHEELING 1842# ifdef MOUSE_SLIP_WHEELING
1843 if (ev->state & ControlMask) 1843 if (ev->state & ControlMask)
1844 { 1844 {
1845 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1845 mouse_slip_wheel_speed += (v ? -1 : 1);
1846 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1846 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1847 } 1847 }
1848# endif 1848# endif
1849# ifdef JUMP_MOUSE_WHEEL 1849# ifdef JUMP_MOUSE_WHEEL
1850 rxvt_scr_page(aR_ v, i); 1850 scr_page (v, i);
1851 R->scr_refresh (SMOOTH_REFRESH); 1851 scr_refresh (SMOOTH_REFRESH);
1852 rxvt_scrollbar_show(aR_ 1); 1852 scrollbar_show (1);
1853# else 1853# else
1854 while (i--) 1854 while (i--)
1855 { 1855 {
1856 rxvt_scr_page(aR_ v, 1); 1856 scr_page (v, 1);
1857 R->scr_refresh (SMOOTH_REFRESH); 1857 scr_refresh (SMOOTH_REFRESH);
1858 rxvt_scrollbar_show(aR_ 1); 1858 scrollbar_show (1);
1859 } 1859 }
1860# endif 1860# endif
1861 } 1861 }
1862 break; 1862 break;
1863#endif 1863#endif
1864 } 1864 }
1865 } 1865 }
1866 } 1866 }
1867#ifdef MENUBAR 1867#ifdef MENUBAR
1868 else if (isMenuBarWindow(ev->window)) 1868 else if (isMenuBarWindow(ev->window))
1869 rxvt_menubar_control(aR_ ev); 1869 menubar_control (ev);
1870#endif 1870#endif
1871} 1871}
1872 1872
1873 1873
1874#ifdef TRANSPARENT 1874#ifdef TRANSPARENT
1875/* 1875/*
1876 * Check our parents are still who we think they are. 1876 * Check our parents are still who we think they are.
1877 * Do transparency updates if required 1877 * Do transparency updates if required
1878 */ 1878 */
1879/* EXTPROTO */
1880int 1879int
1881rxvt_check_our_parents(pR) 1880rxvt_term::check_our_parents ()
1882{ 1881{
1883 int i, pchanged, aformat, have_pixmap, rootdepth; 1882 int i, pchanged, aformat, have_pixmap, rootdepth;
1884 unsigned long nitems, bytes_after; 1883 unsigned long nitems, bytes_after;
1885 Atom atype; 1884 Atom atype;
1886 unsigned char *prop = NULL; 1885 unsigned char *prop = NULL;
… …
1888 Pixmap rootpixmap = None; 1887 Pixmap rootpixmap = None;
1889 XWindowAttributes wattr, wrootattr; 1888 XWindowAttributes wattr, wrootattr;
1890 1889
1891 pchanged = 0; 1890 pchanged = 0;
1892 1891
1893 if (!(R->Options & Opt_transparent)) 1892 if (!(Options & Opt_transparent))
1894 return pchanged; /* Don't try any more */ 1893 return pchanged; /* Don't try any more */
1895 1894
1896 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1895 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr);
1897 rootdepth = wrootattr.depth; 1896 rootdepth = wrootattr.depth;
1898 1897
1899 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1898 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr);
1900 if (rootdepth != wattr.depth) { 1899 if (rootdepth != wattr.depth) {
1901 if (R->am_transparent) { 1900 if (am_transparent) {
1902 pchanged = 1; 1901 pchanged = 1;
1903 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1902 XSetWindowBackground(Xdisplay, TermWin.vt,
1904 R->PixColors[Color_bg]); 1903 PixColors[Color_bg]);
1905 R->am_transparent = R->am_pixmap_trans = 0; 1904 am_transparent = am_pixmap_trans = 0;
1906 } 1905 }
1907 return pchanged; /* Don't try any more */ 1906 return pchanged; /* Don't try any more */
1908 } 1907 }
1909 1908
1910/* Get all X ops out of the queue so that our information is up-to-date. */ 1909/* Get all X ops out of the queue so that our information is up-to-date. */
1911 XSync(R->Xdisplay, False); 1910 XSync(Xdisplay, False);
1912 1911
1913/* 1912/*
1914 * Make the frame window set by the window manager have 1913 * Make the frame window set by the window manager have
1915 * the root background. Some window managers put multiple nested frame 1914 * the root background. Some window managers put multiple nested frame
1916 * windows for each client, so we have to take care about that. 1915 * windows for each client, so we have to take care about that.
1917 */ 1916 */
1918 i = (R->xa[XA_XROOTPMAPID] != 0 1917 i = (xa[XA_XROOTPMAPID] != 0
1919 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1918 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID],
1920 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1919 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1921 &nitems, &bytes_after, &prop) == Success)); 1920 &nitems, &bytes_after, &prop) == Success));
1922 if (!i || prop == NULL) 1921 if (!i || prop == NULL)
1923 have_pixmap = 0; 1922 have_pixmap = 0;
1924 else { 1923 else {
… …
1935 Window cr; 1934 Window cr;
1936 XImage *image; 1935 XImage *image;
1937 GC gc; 1936 GC gc;
1938 XGCValues gcvalue; 1937 XGCValues gcvalue;
1939 1938
1940 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1939 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot,
1941 0, 0, &sx, &sy, &cr); 1940 0, 0, &sx, &sy, &cr);
1942 nw = (unsigned int)R->szHint.width; 1941 nw = (unsigned int)szHint.width;
1943 nh = (unsigned int)R->szHint.height; 1942 nh = (unsigned int)szHint.height;
1944 nx = ny = 0; 1943 nx = ny = 0;
1945 if (sx < 0) { 1944 if (sx < 0) {
1946 nw += sx; 1945 nw += sx;
1947 nx = -sx; 1946 nx = -sx;
1948 sx = 0; 1947 sx = 0;
… …
1952 ny = -sy; 1951 ny = -sy;
1953 sy = 0; 1952 sy = 0;
1954 } 1953 }
1955 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 1954 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
1956 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 1955 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
1957 R->allowedxerror = -1; 1956 allowedxerror = -1;
1958 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 1957 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes,
1959 ZPixmap); 1958 ZPixmap);
1960 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 1959 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1961 /* XXX: may need a delay here? */ 1960 /* XXX: may need a delay here? */
1962 R->allowedxerror = 0; 1961 allowedxerror = 0;
1963 if (image == NULL) { 1962 if (image == NULL) {
1964 if (R->am_transparent && R->am_pixmap_trans) { 1963 if (am_transparent && am_pixmap_trans) {
1965 pchanged = 1; 1964 pchanged = 1;
1966 if (R->TermWin.pixmap != None) { 1965 if (TermWin.pixmap != None) {
1967 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1966 XFreePixmap(Xdisplay, TermWin.pixmap);
1968 R->TermWin.pixmap = None; 1967 TermWin.pixmap = None;
1969 } 1968 }
1970 } 1969 }
1971 R->am_pixmap_trans = 0; 1970 am_pixmap_trans = 0;
1972 } else { 1971 } else {
1973 if (R->TermWin.pixmap != None) 1972 if (TermWin.pixmap != None)
1974 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 1973 XFreePixmap(Xdisplay, TermWin.pixmap);
1975 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 1974 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt,
1976 (unsigned int)R->szHint.width, 1975 (unsigned int)szHint.width,
1977 (unsigned int)R->szHint.height, 1976 (unsigned int)szHint.height,
1978 (unsigned int)image->depth); 1977 (unsigned int)image->depth);
1979 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue); 1978 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue);
1980 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0, 1979 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0,
1981 nx, ny, (unsigned int)image->width, 1980 nx, ny, (unsigned int)image->width,
1982 (unsigned int)image->height); 1981 (unsigned int)image->height);
1983 XFreeGC(R->Xdisplay, gc); 1982 XFreeGC(Xdisplay, gc);
1984 XDestroyImage(image); 1983 XDestroyImage(image);
1985 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 1984 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt,
1986 R->TermWin.pixmap); 1985 TermWin.pixmap);
1987 if (!R->am_transparent || !R->am_pixmap_trans) 1986 if (!am_transparent || !am_pixmap_trans)
1988 pchanged = 1; 1987 pchanged = 1;
1989 R->am_transparent = R->am_pixmap_trans = 1; 1988 am_transparent = am_pixmap_trans = 1;
1990 } 1989 }
1991 } 1990 }
1992 if (!R->am_pixmap_trans) { 1991 if (!am_pixmap_trans) {
1993 unsigned int n; 1992 unsigned int n;
1994/* 1993/*
1995 * InheritPixmap transparency 1994 * InheritPixmap transparency
1996 */ 1995 */
1997 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 1996 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot));
1998 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 1997 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window));
1999 i++) { 1998 i++) {
2000 oldp = R->TermWin.parent[i]; 1999 oldp = TermWin.parent[i];
2001 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2000 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root,
2002 &R->TermWin.parent[i], &list, &n); 2001 &TermWin.parent[i], &list, &n);
2003 XFree(list); 2002 XFree(list);
2004 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2003 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2005 if (R->TermWin.parent[i] == Xroot) { 2004 if (TermWin.parent[i] == Xroot) {
2006 if (oldp != None) 2005 if (oldp != None)
2007 pchanged = 1; 2006 pchanged = 1;
2008 break; 2007 break;
2009 } 2008 }
2010 if (oldp != R->TermWin.parent[i]) 2009 if (oldp != TermWin.parent[i])
2011 pchanged = 1; 2010 pchanged = 1;
2012 } 2011 }
2013 n = 0; 2012 n = 0;
2014 if (pchanged) { 2013 if (pchanged) {
2015 for (; n < (unsigned int)i; n++) { 2014 for (; n < (unsigned int)i; n++) {
2016 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2015 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr);
2017 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2016 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2018 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2017 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
2019 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2018 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1;
2020 break; 2019 break;
2021 } 2020 }
2022 } 2021 }
2023 } 2022 }
2024 if (n > (int)(sizeof(R->TermWin.parent) 2023 if (n > (int)(sizeof(TermWin.parent)
2025 / sizeof(R->TermWin.parent[0]))) { 2024 / sizeof(TermWin.parent[0]))) {
2026 D_X((stderr, "InheritPixmap Turning off")); 2025 D_X((stderr, "InheritPixmap Turning off"));
2027 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2026 XSetWindowBackground(Xdisplay, TermWin.parent[0],
2028 R->PixColors[Color_fg]); 2027 PixColors[Color_fg]);
2029 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2028 XSetWindowBackground(Xdisplay, TermWin.vt,
2030 R->PixColors[Color_bg]); 2029 PixColors[Color_bg]);
2031 R->am_transparent = 0; 2030 am_transparent = 0;
2032 /* XXX: also turn off Opt_transparent? */ 2031 /* XXX: also turn off Opt_transparent? */
2033 } else { 2032 } else {
2034 /* wait (an arbitrary period) for the WM to do its thing 2033 /* wait (an arbitrary period) for the WM to do its thing
2035 * needed for fvwm2.2.2 (and before?) */ 2034 * needed for fvwm2.2.2 (and before?) */
2036# ifdef HAVE_NANOSLEEP 2035# ifdef HAVE_NANOSLEEP
… …
2042# else 2041# else
2043 sleep(1); 2042 sleep(1);
2044# endif 2043# endif
2045 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2044 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2046 for (n = 0; n < (unsigned int)i; n++) 2045 for (n = 0; n < (unsigned int)i; n++)
2047 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2046 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n],
2048 ParentRelative); 2047 ParentRelative);
2049 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2048 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt,
2050 ParentRelative); 2049 ParentRelative);
2051 R->am_transparent = 1; 2050 am_transparent = 1;
2052 } 2051 }
2053 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2052 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++)
2054 R->TermWin.parent[i] = None; 2053 TermWin.parent[i] = None;
2055 } 2054 }
2056 return pchanged; 2055 return pchanged;
2057} 2056}
2058#endif 2057#endif
2059 2058
2060/*}}} */ 2059/*}}} */
2061 2060
2062/*{{{ print pipe */ 2061/*{{{ print pipe */
2063/*----------------------------------------------------------------------*/ 2062/*----------------------------------------------------------------------*/
2064#ifdef PRINTPIPE 2063#ifdef PRINTPIPE
2065/* EXTPROTO */ 2064FILE *
2066FILE *
2067rxvt_popen_printer(pR) 2065rxvt_term::popen_printer ()
2068{ 2066{
2069 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2067 FILE *stream = popen(rs[Rs_print_pipe], "w");
2070 2068
2071 if (stream == NULL) 2069 if (stream == NULL)
2072 rxvt_print_error("can't open printer pipe"); 2070 rxvt_print_error("can't open printer pipe");
2073 return stream; 2071 return stream;
2074} 2072}
2075 2073
2076/* EXTPROTO */
2077int 2074int
2078rxvt_pclose_printer (FILE *stream) 2075rxvt_term::pclose_printer (FILE *stream)
2079{ 2076{
2080 fflush (stream); 2077 fflush (stream);
2081/* pclose() reported not to work on SunOS 4.1.3 */ 2078/* pclose() reported not to work on SunOS 4.1.3 */
2082# if defined (__sun__) /* TODO: RESOLVE THIS */ 2079# if defined (__sun__) /* TODO: RESOLVE THIS */
2083/* pclose works provided SIGCHLD handler uses waitpid */ 2080/* pclose works provided SIGCHLD handler uses waitpid */
… …
2088} 2085}
2089 2086
2090/* 2087/*
2091 * simulate attached vt100 printer 2088 * simulate attached vt100 printer
2092 */ 2089 */
2093/* INTPROTO */
2094void 2090void
2095rxvt_process_print_pipe(pR) 2091rxvt_term::process_print_pipe ()
2096{ 2092{
2097 int done; 2093 int done;
2098 FILE *fd; 2094 FILE *fd;
2099 2095
2100 if ((fd = rxvt_popen_printer(aR)) == NULL) 2096 if ((fd = popen_printer ()) == NULL)
2101 return; 2097 return;
2102 2098
2103/* 2099/*
2104 * Send all input to the printer until either ESC[4i or ESC[?4i 2100 * Send all input to the printer until either ESC[4i or ESC[?4i
2105 * is received. 2101 * is received.
… …
2107 for (done = 0; !done;) { 2103 for (done = 0; !done;) {
2108 unsigned char buf[8]; 2104 unsigned char buf[8];
2109 unsigned char ch; 2105 unsigned char ch;
2110 unsigned int i, len; 2106 unsigned int i, len;
2111 2107
2112 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2108 if ((ch = cmd_getc ()) != C0_ESC) {
2113 if (putc(ch, fd) == EOF) 2109 if (putc(ch, fd) == EOF)
2114 break; /* done = 1 */ 2110 break; /* done = 1 */
2115 } else { 2111 } else {
2116 len = 0; 2112 len = 0;
2117 buf[len++] = ch; 2113 buf[len++] = ch;
2118 2114
2119 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2115 if ((buf[len++] = cmd_getc ()) == '[') {
2120 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2116 if ((ch = cmd_getc ()) == '?') {
2121 buf[len++] = '?'; 2117 buf[len++] = '?';
2122 ch = rxvt_cmd_getc(aR); 2118 ch = cmd_getc ();
2123 } 2119 }
2124 if ((buf[len++] = ch) == '4') { 2120 if ((buf[len++] = ch) == '4') {
2125 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2121 if ((buf[len++] = cmd_getc ()) == 'i')
2126 break; /* done = 1 */ 2122 break; /* done = 1 */
2127 } 2123 }
2128 } 2124 }
2129 for (i = 0; i < len; i++) 2125 for (i = 0; i < len; i++)
2130 if (putc(buf[i], fd) == EOF) { 2126 if (putc(buf[i], fd) == EOF) {
2131 done = 1; 2127 done = 1;
2132 break; 2128 break;
2133 } 2129 }
2134 } 2130 }
2135 } 2131 }
2136 rxvt_pclose_printer(fd); 2132 pclose_printer (fd);
2137} 2133}
2138#endif /* PRINTPIPE */ 2134#endif /* PRINTPIPE */
2139/*}}} */ 2135/*}}} */
2140 2136
2141/* *INDENT-OFF* */ 2137/* *INDENT-OFF* */
… …
2147 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2143 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2148}; 2144};
2149/* *INDENT-ON* */ 2145/* *INDENT-ON* */
2150 2146
2151/*{{{ process non-printing single characters */ 2147/*{{{ process non-printing single characters */
2152/* INTPROTO */
2153void 2148void
2154rxvt_process_nonprinting(pR_ unsigned char ch) 2149rxvt_term::process_nonprinting (unsigned char ch)
2155{ 2150{
2156 switch (ch) { 2151 switch (ch) {
2157 case C0_ENQ: /* terminal Status */ 2152 case C0_ENQ: /* terminal Status */
2158 if (R->rs[Rs_answerbackstring]) 2153 if (rs[Rs_answerbackstring])
2159 R->tt_write( 2154 tt_write(
2160 (const unsigned char *)R->rs[Rs_answerbackstring], 2155 (const unsigned char *)rs[Rs_answerbackstring],
2161 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2156 (unsigned int)STRLEN(rs[Rs_answerbackstring]));
2162 else 2157 else
2163 R->tt_write((unsigned char *)VT100_ANS, 2158 tt_write((unsigned char *)VT100_ANS,
2164 (unsigned int)STRLEN(VT100_ANS)); 2159 (unsigned int)STRLEN(VT100_ANS));
2165 break; 2160 break;
2166 case C0_BEL: /* bell */ 2161 case C0_BEL: /* bell */
2167 rxvt_scr_bell(aR); 2162 scr_bell ();
2168 break; 2163 break;
2169 case C0_BS: /* backspace */ 2164 case C0_BS: /* backspace */
2170 rxvt_scr_backspace(aR); 2165 scr_backspace ();
2171 break; 2166 break;
2172 case C0_HT: /* tab */ 2167 case C0_HT: /* tab */
2173 rxvt_scr_tab(aR_ 1); 2168 scr_tab (1);
2174 break; 2169 break;
2175 case C0_CR: /* carriage return */ 2170 case C0_CR: /* carriage return */
2176 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2171 scr_gotorc (0, 0, R_RELATIVE);
2177 break; 2172 break;
2178 case C0_VT: /* vertical tab, form feed */ 2173 case C0_VT: /* vertical tab, form feed */
2179 case C0_FF: 2174 case C0_FF:
2180 case C0_LF: /* line feed */ 2175 case C0_LF: /* line feed */
2181 rxvt_scr_index(aR_ UP); 2176 scr_index (UP);
2182 break; 2177 break;
2183 case C0_SO: /* shift out - acs */ 2178 case C0_SO: /* shift out - acs */
2184 rxvt_scr_charset_choose(aR_ 1); 2179 scr_charset_choose (1);
2185 break; 2180 break;
2186 case C0_SI: /* shift in - acs */ 2181 case C0_SI: /* shift in - acs */
2187 rxvt_scr_charset_choose(aR_ 0); 2182 scr_charset_choose (0);
2188 break; 2183 break;
2189 } 2184 }
2190} 2185}
2191/*}}} */ 2186/*}}} */
2192 2187
2193 2188
2194/*{{{ process VT52 escape sequences */ 2189/*{{{ process VT52 escape sequences */
2195/* INTPROTO */
2196void 2190void
2197rxvt_process_escape_vt52(pR_ unsigned char ch) 2191rxvt_term::process_escape_vt52 (unsigned char ch)
2198{ 2192{
2199 int row, col; 2193 int row, col;
2200 2194
2201 switch (ch) { 2195 switch (ch) {
2202 case 'A': /* cursor up */ 2196 case 'A': /* cursor up */
2203 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2197 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2204 break; 2198 break;
2205 case 'B': /* cursor down */ 2199 case 'B': /* cursor down */
2206 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2200 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2207 break; 2201 break;
2208 case 'C': /* cursor right */ 2202 case 'C': /* cursor right */
2209 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2203 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2210 break; 2204 break;
2211 case 'D': /* cursor left */ 2205 case 'D': /* cursor left */
2212 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2206 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2213 break; 2207 break;
2214 case 'H': /* cursor home */ 2208 case 'H': /* cursor home */
2215 rxvt_scr_gotorc(aR_ 0, 0, 0); 2209 scr_gotorc (0, 0, 0);
2216 break; 2210 break;
2217 case 'I': /* cursor up and scroll down if needed */ 2211 case 'I': /* cursor up and scroll down if needed */
2218 rxvt_scr_index(aR_ DN); 2212 scr_index (DN);
2219 break; 2213 break;
2220 case 'J': /* erase to end of screen */ 2214 case 'J': /* erase to end of screen */
2221 R->scr_erase_screen (0); 2215 scr_erase_screen (0);
2222 break; 2216 break;
2223 case 'K': /* erase to end of line */ 2217 case 'K': /* erase to end of line */
2224 rxvt_scr_erase_line(aR_ 0); 2218 scr_erase_line (0);
2225 break; 2219 break;
2226 case 'Y': /* move to specified row and col */ 2220 case 'Y': /* move to specified row and col */
2227 /* full command is 'ESC Y row col' where row and col 2221 /* full command is 'ESC Y row col' where row and col
2228 * are encoded by adding 32 and sending the ascii 2222 * are encoded by adding 32 and sending the ascii
2229 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2223 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2230 * etc. */ 2224 * etc. */
2231 row = rxvt_cmd_getc(aR) - ' '; 2225 row = cmd_getc () - ' ';
2232 col = rxvt_cmd_getc(aR) - ' '; 2226 col = cmd_getc () - ' ';
2233 rxvt_scr_gotorc(aR_ row, col, 0); 2227 scr_gotorc (row, col, 0);
2234 break; 2228 break;
2235 case 'Z': /* identify the terminal type */ 2229 case 'Z': /* identify the terminal type */
2236 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2230 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2237 break; 2231 break;
2238 case '<': /* turn off VT52 mode */ 2232 case '<': /* turn off VT52 mode */
2239 PrivMode(0, PrivMode_vt52); 2233 PrivMode(0, PrivMode_vt52);
2240 break; 2234 break;
2241 case 'F': /* use special graphics character set */ 2235 case 'F': /* use special graphics character set */
… …
2250} 2244}
2251/*}}} */ 2245/*}}} */
2252 2246
2253 2247
2254/*{{{ process escape sequences */ 2248/*{{{ process escape sequences */
2255/* INTPROTO */
2256void 2249void
2257rxvt_process_escape_seq(pR) 2250rxvt_term::process_escape_seq ()
2258{ 2251{
2259 unsigned char ch = rxvt_cmd_getc(aR); 2252 unsigned char ch = cmd_getc ();
2260 2253
2261 if (R->PrivateModes & PrivMode_vt52) { 2254 if (PrivateModes & PrivMode_vt52) {
2262 rxvt_process_escape_vt52(aR_ ch); 2255 process_escape_vt52 (ch);
2263 return; 2256 return;
2264 } 2257 }
2265 2258
2266 switch (ch) { 2259 switch (ch) {
2267 /* case 1: do_tek_mode (); break; */ 2260 /* case 1: do_tek_mode (); break; */
2268 case '#': 2261 case '#':
2269 if (rxvt_cmd_getc(aR) == '8') 2262 if (cmd_getc () == '8')
2270 rxvt_scr_E(aR); 2263 scr_E ();
2271 break; 2264 break;
2272 case '(': 2265 case '(':
2273 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2266 scr_charset_set (0, (unsigned int)cmd_getc ());
2274 break; 2267 break;
2275 case ')': 2268 case ')':
2276 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2269 scr_charset_set (1, (unsigned int)cmd_getc ());
2277 break; 2270 break;
2278 case '*': 2271 case '*':
2279 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2272 scr_charset_set (2, (unsigned int)cmd_getc ());
2280 break; 2273 break;
2281 case '+': 2274 case '+':
2282 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2275 scr_charset_set (3, (unsigned int)cmd_getc ());
2283 break; 2276 break;
2284#ifdef MULTICHAR_SET 2277#ifdef MULTICHAR_SET
2285 case '$': 2278 case '$':
2286 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR)); 2279 scr_charset_set (-2, (unsigned int)cmd_getc ());
2287 break; 2280 break;
2288#endif 2281#endif
2289#ifndef NO_FRILLS 2282#ifndef NO_FRILLS
2290 case '6': 2283 case '6':
2291 rxvt_scr_backindex(aR); 2284 scr_backindex ();
2292 break; 2285 break;
2293#endif 2286#endif
2294 case '7': 2287 case '7':
2295 rxvt_scr_cursor(aR_ SAVE); 2288 scr_cursor (SAVE);
2296 break; 2289 break;
2297 case '8': 2290 case '8':
2298 rxvt_scr_cursor(aR_ RESTORE); 2291 scr_cursor (RESTORE);
2299 break; 2292 break;
2300#ifndef NO_FRILLS 2293#ifndef NO_FRILLS
2301 case '9': 2294 case '9':
2302 rxvt_scr_forwardindex(aR); 2295 scr_forwardindex ();
2303 break; 2296 break;
2304#endif 2297#endif
2305 case '=': 2298 case '=':
2306 case '>': 2299 case '>':
2307 PrivMode((ch == '='), PrivMode_aplKP); 2300 PrivMode((ch == '='), PrivMode_aplKP);
2308 break; 2301 break;
2309 2302
2310 case C1_40: 2303 case C1_40:
2311 rxvt_cmd_getc(aR); 2304 cmd_getc ();
2312 break; 2305 break;
2313 case C1_44: 2306 case C1_44:
2314 rxvt_scr_index(aR_ UP); 2307 scr_index (UP);
2315 break; 2308 break;
2316 2309
2317 /* 8.3.87: NEXT LINE */ 2310 /* 8.3.87: NEXT LINE */
2318 case C1_NEL: /* ESC E */ 2311 case C1_NEL: /* ESC E */
2319 { 2312 {
2320 uint32_t nlcr[] = { '\n', '\r' }; 2313 uint32_t nlcr[] = { '\n', '\r' };
2321 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2314 scr_add_lines (nlcr, 1, 2);
2322 } 2315 }
2323 break; 2316 break;
2324 2317
2325 /* kidnapped escape sequence: Should be 8.3.48 */ 2318 /* kidnapped escape sequence: Should be 8.3.48 */
2326 case C1_ESA: /* ESC G */ 2319 case C1_ESA: /* ESC G */
2327 rxvt_process_graphics(aR); 2320 process_graphics ();
2328 break; 2321 break;
2329 2322
2330 /* 8.3.63: CHARACTER TABULATION SET */ 2323 /* 8.3.63: CHARACTER TABULATION SET */
2331 case C1_HTS: /* ESC H */ 2324 case C1_HTS: /* ESC H */
2332 rxvt_scr_set_tab(aR_ 1); 2325 scr_set_tab (1);
2333 break; 2326 break;
2334 2327
2335 /* 8.3.105: REVERSE LINE FEED */ 2328 /* 8.3.105: REVERSE LINE FEED */
2336 case C1_RI: /* ESC M */ 2329 case C1_RI: /* ESC M */
2337 rxvt_scr_index(aR_ DN); 2330 scr_index (DN);
2338 break; 2331 break;
2339 2332
2340 /* 8.3.142: SINGLE-SHIFT TWO */ 2333 /* 8.3.142: SINGLE-SHIFT TWO */
2341 /*case C1_SS2: scr_single_shift (2); break; */ 2334 /*case C1_SS2: scr_single_shift (2); break; */
2342 2335
2343 /* 8.3.143: SINGLE-SHIFT THREE */ 2336 /* 8.3.143: SINGLE-SHIFT THREE */
2344 /*case C1_SS3: scr_single_shift (3); break; */ 2337 /*case C1_SS3: scr_single_shift (3); break; */
2345 2338
2346 /* 8.3.27: DEVICE CONTROL STRING */ 2339 /* 8.3.27: DEVICE CONTROL STRING */
2347 case C1_DCS: /* ESC P */ 2340 case C1_DCS: /* ESC P */
2348 rxvt_process_dcs_seq(aR); 2341 process_dcs_seq ();
2349 break; 2342 break;
2350 2343
2351 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2344 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2352 case C1_SCI: /* ESC Z */ 2345 case C1_SCI: /* ESC Z */
2353 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2346 tt_write((const unsigned char *)ESCZ_ANSWER,
2354 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2347 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2355 break; /* steal obsolete ESC [ c */ 2348 break; /* steal obsolete ESC [ c */
2356 2349
2357 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2350 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2358 case C1_CSI: /* ESC [ */ 2351 case C1_CSI: /* ESC [ */
2359 rxvt_process_csi_seq(aR); 2352 process_csi_seq ();
2360 break; 2353 break;
2361 2354
2362 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2355 /* 8.3.90: OPERATING SYSTEM COMMAND */
2363 case C1_OSC: /* ESC ] */ 2356 case C1_OSC: /* ESC ] */
2364 rxvt_process_osc_seq(aR); 2357 process_osc_seq ();
2365 break; 2358 break;
2366 2359
2367 /* 8.3.106: RESET TO INITIAL STATE */ 2360 /* 8.3.106: RESET TO INITIAL STATE */
2368 case 'c': 2361 case 'c':
2369 rxvt_scr_poweron(aR); 2362 scr_poweron ();
2370 rxvt_scrollbar_show(aR_ 1); 2363 scrollbar_show (1);
2371 break; 2364 break;
2372 2365
2373 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2366 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2374 case 'n': 2367 case 'n':
2375 rxvt_scr_charset_choose(aR_ 2); 2368 scr_charset_choose (2);
2376 break; 2369 break;
2377 2370
2378 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2371 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2379 case 'o': 2372 case 'o':
2380 rxvt_scr_charset_choose(aR_ 3); 2373 scr_charset_choose (3);
2381 break; 2374 break;
2382 } 2375 }
2383} 2376}
2384/*}}} */ 2377/*}}} */
2385 2378
… …
2413 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2406 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2414 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2407 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2415}; 2408};
2416/* *INDENT-ON* */ 2409/* *INDENT-ON* */
2417 2410
2418/* INTPROTO */
2419void 2411void
2420rxvt_process_csi_seq(pR) 2412rxvt_term::process_csi_seq ()
2421{ 2413{
2422 unsigned char ch, priv, i; 2414 unsigned char ch, priv, i;
2423 unsigned int nargs, p; 2415 unsigned int nargs, p;
2424 int n, ndef; 2416 int n, ndef;
2425 int arg[ESC_ARGS]; 2417 int arg[ESC_ARGS];
2426 2418
2427 for (nargs = ESC_ARGS; nargs > 0;) 2419 for (nargs = ESC_ARGS; nargs > 0;)
2428 arg[--nargs] = 0; 2420 arg[--nargs] = 0;
2429 2421
2430 priv = 0; 2422 priv = 0;
2431 ch = rxvt_cmd_getc(aR); 2423 ch = cmd_getc ();
2432 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */ 2424 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2433 priv = ch; 2425 priv = ch;
2434 ch = rxvt_cmd_getc(aR); 2426 ch = cmd_getc ();
2435 } 2427 }
2436/* read any numerical arguments */ 2428/* read any numerical arguments */
2437 for (n = -1; ch < CSI_ICH; ) { 2429 for (n = -1; ch < CSI_ICH; ) {
2438 if (isdigit(ch)) { 2430 if (isdigit(ch)) {
2439 if (n < 0) 2431 if (n < 0)
… …
2443 } else if (ch == ';') { 2435 } else if (ch == ';') {
2444 if (nargs < ESC_ARGS) 2436 if (nargs < ESC_ARGS)
2445 arg[nargs++] = n; 2437 arg[nargs++] = n;
2446 n = -1; 2438 n = -1;
2447 } else if (ch == '\b') { 2439 } else if (ch == '\b') {
2448 rxvt_scr_backspace(aR); 2440 scr_backspace ();
2449 } else if (ch == C0_ESC) { 2441 } else if (ch == C0_ESC) {
2450 rxvt_process_escape_seq(aR); 2442 process_escape_seq ();
2451 return; 2443 return;
2452 } else if (ch < ' ') { 2444 } else if (ch < ' ') {
2453 rxvt_process_nonprinting(aR_ ch); 2445 process_nonprinting (ch);
2454 } 2446 }
2455 ch = rxvt_cmd_getc(aR); 2447 ch = cmd_getc ();
2456 } 2448 }
2457 2449
2458 if (ch > CSI_7F) 2450 if (ch > CSI_7F)
2459 return; 2451 return;
2460 2452
… …
2479 */ 2471 */
2480 if (priv) { 2472 if (priv) {
2481 switch (priv) { 2473 switch (priv) {
2482 case '>': 2474 case '>':
2483 if (ch == CSI_DA) /* secondary device attributes */ 2475 if (ch == CSI_DA) /* secondary device attributes */
2484 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2476 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2485 break; 2477 break;
2486 case '?': 2478 case '?':
2487 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2479 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2488 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2480 process_terminal_mode (ch, priv, nargs, arg);
2489 break; 2481 break;
2490 } 2482 }
2491 return; 2483 return;
2492 } 2484 }
2493 2485
… …
2497 */ 2489 */
2498#ifdef PRINTPIPE 2490#ifdef PRINTPIPE
2499 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2491 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2500 switch (arg[0]) { 2492 switch (arg[0]) {
2501 case 0: /* initiate transfer to primary aux device */ 2493 case 0: /* initiate transfer to primary aux device */
2502 rxvt_scr_printscreen(aR_ 0); 2494 scr_printscreen (0);
2503 break; 2495 break;
2504 case 5: /* start relay to primary aux device */ 2496 case 5: /* start relay to primary aux device */
2505 rxvt_process_print_pipe(aR); 2497 process_print_pipe ();
2506 break; 2498 break;
2507 } 2499 }
2508 break; 2500 break;
2509#endif 2501#endif
2510 2502
… …
2512 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2504 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2513 arg[0] = -arg[0]; 2505 arg[0] = -arg[0];
2514 /* FALLTHROUGH */ 2506 /* FALLTHROUGH */
2515 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2507 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2516 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2508 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2517 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2509 scr_gotorc (arg[0], 0, RELATIVE);
2518 break; 2510 break;
2519 2511
2520 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2512 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2521 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2513 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2522#ifdef ISO6429 2514#ifdef ISO6429
… …
2526#endif 2518#endif
2527 /* FALLTHROUGH */ 2519 /* FALLTHROUGH */
2528 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2520 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2529 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2521 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2530#ifdef ISO6429 2522#ifdef ISO6429
2531 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2523 scr_gotorc (0, arg[0], RELATIVE);
2532#else /* emulate common DEC VTs */ 2524#else /* emulate common DEC VTs */
2533 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2525 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2534#endif 2526#endif
2535 break; 2527 break;
2536 2528
2537 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2529 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2538 arg[0] = -arg[0]; 2530 arg[0] = -arg[0];
2539 /* FALLTHROUGH */ 2531 /* FALLTHROUGH */
2540 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2532 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2541 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2533 scr_gotorc (arg[0], 0, R_RELATIVE);
2542 break; 2534 break;
2543 2535
2544 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2536 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2545 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2537 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2546 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2538 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2547 break; 2539 break;
2548 2540
2549 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2541 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2550 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2542 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2551 break; 2543 break;
2552 2544
2553 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2545 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2554 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2546 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2555 rxvt_scr_gotorc(aR_ arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2547 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2556 break; 2548 break;
2557 2549
2558 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2550 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2559 arg[0] = -arg[0]; 2551 arg[0] = -arg[0];
2560 /* FALLTHROUGH */ 2552 /* FALLTHROUGH */
2561 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2553 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2562 rxvt_scr_tab(aR_ arg[0]); 2554 scr_tab (arg[0]);
2563 break; 2555 break;
2564 2556
2565 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2557 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2566 R->scr_erase_screen (arg[0]); 2558 scr_erase_screen (arg[0]);
2567 break; 2559 break;
2568 2560
2569 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2561 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2570 rxvt_scr_erase_line(aR_ arg[0]); 2562 scr_erase_line (arg[0]);
2571 break; 2563 break;
2572 2564
2573 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2565 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2574 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2566 scr_insdel_chars (arg[0], INSERT);
2575 break; 2567 break;
2576 2568
2577 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2569 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2578 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2570 scr_insdel_lines (arg[0], INSERT);
2579 break; 2571 break;
2580 2572
2581 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2573 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2582 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2574 scr_insdel_lines (arg[0], DELETE);
2583 break; 2575 break;
2584 2576
2585 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2577 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2586 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2578 scr_insdel_chars (arg[0], ERASE);
2587 break; 2579 break;
2588 2580
2589 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2581 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2590 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2582 scr_insdel_chars (arg[0], DELETE);
2591 break; 2583 break;
2592 2584
2593 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2585 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2594 arg[0] = -arg[0]; 2586 arg[0] = -arg[0];
2595 /* FALLTHROUGH */ 2587 /* FALLTHROUGH */
2596 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2588 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2597 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2589 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2598 break; 2590 break;
2599 2591
2600 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2592 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2601 R->tt_write((const unsigned char *)VT100_ANS, 2593 tt_write((const unsigned char *)VT100_ANS,
2602 (unsigned int)(sizeof(VT100_ANS) - 1)); 2594 (unsigned int)(sizeof(VT100_ANS) - 1));
2603 break; 2595 break;
2604 2596
2605 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2597 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2606 rxvt_process_sgr_mode(aR_ nargs, arg); 2598 process_sgr_mode (nargs, arg);
2607 break; 2599 break;
2608 2600
2609 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2601 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2610 switch (arg[0]) { 2602 switch (arg[0]) {
2611 case 5: /* DSR requested */ 2603 case 5: /* DSR requested */
2612 R->tt_printf("\033[0n"); 2604 tt_printf("\033[0n");
2613 break; 2605 break;
2614 case 6: /* CPR requested */ 2606 case 6: /* CPR requested */
2615 rxvt_scr_report_position(aR); 2607 scr_report_position ();
2616 break; 2608 break;
2617#if defined (ENABLE_DISPLAY_ANSWER) 2609#if defined (ENABLE_DISPLAY_ANSWER)
2618 case 7: /* unofficial extension */ 2610 case 7: /* unofficial extension */
2619 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2611 tt_printf("%-.250s\n", rs[Rs_display_name]);
2620 break; 2612 break;
2621#endif 2613#endif
2622 case 8: /* unofficial extension */ 2614 case 8: /* unofficial extension */
2623 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2615 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2624 break; 2616 break;
2625 } 2617 }
2626 break; 2618 break;
2627 2619
2628 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2620 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2629 switch (arg[0]) { 2621 switch (arg[0]) {
2630 case 0: /* char tab stop cleared at active position */ 2622 case 0: /* char tab stop cleared at active position */
2631 rxvt_scr_set_tab(aR_ 0); 2623 scr_set_tab (0);
2632 break; 2624 break;
2633 /* case 1: */ /* line tab stop cleared in active line */ 2625 /* case 1: */ /* line tab stop cleared in active line */
2634 /* case 2: */ /* char tab stops cleared in active line */ 2626 /* case 2: */ /* char tab stops cleared in active line */
2635 case 3: /* all char tab stops are cleared */ 2627 case 3: /* all char tab stops are cleared */
2636 /* case 4: */ /* all line tab stops are cleared */ 2628 /* case 4: */ /* all line tab stops are cleared */
2637 case 5: /* all tab stops are cleared */ 2629 case 5: /* all tab stops are cleared */
2638 rxvt_scr_set_tab(aR_ -1); 2630 scr_set_tab (-1);
2639 break; 2631 break;
2640 } 2632 }
2641 break; 2633 break;
2642 2634
2643 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2635 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2644 switch (arg[0]) { 2636 switch (arg[0]) {
2645 case 0: /* char tab stop set at active position */ 2637 case 0: /* char tab stop set at active position */
2646 rxvt_scr_set_tab(aR_ 1); 2638 scr_set_tab (1);
2647 break; /* = ESC H */ 2639 break; /* = ESC H */
2648 /* case 1: */ /* line tab stop set at active line */ 2640 /* case 1: */ /* line tab stop set at active line */
2649 case 2: /* char tab stop cleared at active position */ 2641 case 2: /* char tab stop cleared at active position */
2650 rxvt_scr_set_tab(aR_ 0); 2642 scr_set_tab (0);
2651 break; /* = ESC [ 0 g */ 2643 break; /* = ESC [ 0 g */
2652 /* case 3: */ /* line tab stop cleared at active line */ 2644 /* case 3: */ /* line tab stop cleared at active line */
2653 /* case 4: */ /* char tab stops cleared at active line */ 2645 /* case 4: */ /* char tab stops cleared at active line */
2654 case 5: /* all char tab stops are cleared */ 2646 case 5: /* all char tab stops are cleared */
2655 rxvt_scr_set_tab(aR_ -1); 2647 scr_set_tab (-1);
2656 break; /* = ESC [ 3 g */ 2648 break; /* = ESC [ 3 g */
2657 /* case 6: */ /* all line tab stops are cleared */ 2649 /* case 6: */ /* all line tab stops are cleared */
2658 } 2650 }
2659 break; 2651 break;
2660 2652
2661 case CSI_RM: /* 8.3.107: RESET MODE */ 2653 case CSI_RM: /* 8.3.107: RESET MODE */
2662 if (arg[0] == 4) 2654 if (arg[0] == 4)
2663 rxvt_scr_insert_mode(aR_ 0); 2655 scr_insert_mode (0);
2664 break; 2656 break;
2665 2657
2666 case CSI_SM: /* 8.3.126: SET MODE */ 2658 case CSI_SM: /* 8.3.126: SET MODE */
2667 if (arg[0] == 4) 2659 if (arg[0] == 4)
2668 rxvt_scr_insert_mode(aR_ 1); 2660 scr_insert_mode (1);
2669 break; 2661 break;
2670 2662
2671/* 2663/*
2672 * PRIVATE USE beyond this point. All CSI_7? sequences here 2664 * PRIVATE USE beyond this point. All CSI_7? sequences here
2673 */ 2665 */
2674 case CSI_72: /* DECSTBM: set top and bottom margins */ 2666 case CSI_72: /* DECSTBM: set top and bottom margins */
2675 if (nargs == 1) 2667 if (nargs == 1)
2676 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2668 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2677 else if (nargs == 0 || arg[0] >= arg[1]) 2669 else if (nargs == 0 || arg[0] >= arg[1])
2678 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2670 scr_scroll_region (0, MAX_ROWS - 1);
2679 else 2671 else
2680 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2672 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2681 break; 2673 break;
2682 2674
2683 case CSI_73: 2675 case CSI_73:
2684 rxvt_scr_cursor(aR_ SAVE); 2676 scr_cursor (SAVE);
2685 break; 2677 break;
2686 case CSI_75: 2678 case CSI_75:
2687 rxvt_scr_cursor(aR_ RESTORE); 2679 scr_cursor (RESTORE);
2688 break; 2680 break;
2689 2681
2690#ifndef NO_FRILLS 2682#ifndef NO_FRILLS
2691 case CSI_74: 2683 case CSI_74:
2692 rxvt_process_window_ops(aR_ arg, nargs); 2684 process_window_ops (arg, nargs);
2693 break; 2685 break;
2694#endif 2686#endif
2695 2687
2696 case CSI_78: /* DECREQTPARM */ 2688 case CSI_78: /* DECREQTPARM */
2697 if (arg[0] == 0 || arg[0] == 1) 2689 if (arg[0] == 0 || arg[0] == 1)
2698 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2690 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2699 /* FALLTHROUGH */ 2691 /* FALLTHROUGH */
2700 2692
2701 default: 2693 default:
2702 break; 2694 break;
2703 } 2695 }
2704} 2696}
2705/*}}} */ 2697/*}}} */
2706 2698
2707#ifndef NO_FRILLS 2699#ifndef NO_FRILLS
2708/* ARGSUSED */ 2700/* ARGSUSED */
2709/* INTPROTO */
2710void 2701void
2711rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2702rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2712{ 2703{
2713 int x, y; 2704 int x, y;
2714#if 0 2705#if 0
2715 char *s; 2706 char *s;
2716#endif 2707#endif
… …
2722 switch (args[0]) { 2713 switch (args[0]) {
2723 /* 2714 /*
2724 * commands 2715 * commands
2725 */ 2716 */
2726 case 1: /* deiconify window */ 2717 case 1: /* deiconify window */
2727 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2718 XMapWindow(Xdisplay, TermWin.parent[0]);
2728 break; 2719 break;
2729 case 2: /* iconify window */ 2720 case 2: /* iconify window */
2730 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2721 XIconifyWindow(Xdisplay, TermWin.parent[0],
2731 DefaultScreen(R->Xdisplay)); 2722 DefaultScreen(Xdisplay));
2732 break; 2723 break;
2733 case 3: /* set position (pixels) */ 2724 case 3: /* set position (pixels) */
2734 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2725 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]);
2735 break; 2726 break;
2736 case 4: /* set size (pixels) */ 2727 case 4: /* set size (pixels) */
2737 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2728 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2738 break; 2729 break;
2739 case 5: /* raise window */ 2730 case 5: /* raise window */
2740 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2731 XRaiseWindow(Xdisplay, TermWin.parent[0]);
2741 break; 2732 break;
2742 case 6: /* lower window */ 2733 case 6: /* lower window */
2743 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2734 XLowerWindow(Xdisplay, TermWin.parent[0]);
2744 break; 2735 break;
2745 case 7: /* refresh window */ 2736 case 7: /* refresh window */
2746 R->scr_touch (true); 2737 scr_touch (true);
2747 break; 2738 break;
2748 case 8: /* set size (chars) */ 2739 case 8: /* set size (chars) */
2749 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2740 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth),
2750 (unsigned int)(args[1] * R->TermWin.fheight)); 2741 (unsigned int)(args[1] * TermWin.fheight));
2751 break; 2742 break;
2752 default: 2743 default:
2753 if (args[0] >= 24) /* set height (chars) */ 2744 if (args[0] >= 24) /* set height (chars) */
2754 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2745 set_widthheight ((unsigned int)TermWin.width,
2755 (unsigned int)(args[1] * R->TermWin.fheight)); 2746 (unsigned int)(args[1] * TermWin.fheight));
2756 break; 2747 break;
2757 /* 2748 /*
2758 * reports - some output format copied from XTerm 2749 * reports - some output format copied from XTerm
2759 */ 2750 */
2760 case 11: /* report window state */ 2751 case 11: /* report window state */
2761 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2752 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr);
2762 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2753 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2763 break; 2754 break;
2764 case 13: /* report window position */ 2755 case 13: /* report window position */
2765 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2756 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr);
2766 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2757 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root,
2767 -wattr.border_width, -wattr.border_width, 2758 -wattr.border_width, -wattr.border_width,
2768 &x, &y, &wdummy); 2759 &x, &y, &wdummy);
2769 R->tt_printf("\033[3;%d;%dt", x, y); 2760 tt_printf("\033[3;%d;%dt", x, y);
2770 break; 2761 break;
2771 case 14: /* report window size (pixels) */ 2762 case 14: /* report window size (pixels) */
2772 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2763 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr);
2773 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2764 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2774 break; 2765 break;
2775 case 18: /* report window size (chars) */ 2766 case 18: /* report window size (chars) */
2776 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2767 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2777 break; 2768 break;
2778#if 0 /* XXX: currently disabled due to security concerns */ 2769#if 0 /* XXX: currently disabled due to security concerns */
2779 case 20: /* report icon label */ 2770 case 20: /* report icon label */
2780 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2771 XGetIconName(Xdisplay, TermWin.parent[0], &s);
2781 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2772 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2782 break; 2773 break;
2783 case 21: /* report window title */ 2774 case 21: /* report window title */
2784 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2775 XFetchName(Xdisplay, TermWin.parent[0], &s);
2785 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2776 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2786 break; 2777 break;
2787#endif 2778#endif
2788 } 2779 }
2789} 2780}
2790#endif 2781#endif
… …
2792/*----------------------------------------------------------------------*/ 2783/*----------------------------------------------------------------------*/
2793/* 2784/*
2794 * get input up until STRING TERMINATOR (or BEL) 2785 * get input up until STRING TERMINATOR (or BEL)
2795 * ends_how is terminator used. returned input must be free()d 2786 * ends_how is terminator used. returned input must be free()d
2796 */ 2787 */
2797/* INTPROTO */
2798unsigned char * 2788unsigned char *
2799rxvt_get_to_st(pR_ unsigned char *ends_how) 2789rxvt_term::get_to_st (unsigned char *ends_how)
2800{ 2790{
2801 int seen_esc = 0; /* seen escape? */ 2791 int seen_esc = 0; /* seen escape? */
2802 unsigned int n = 0; 2792 unsigned int n = 0;
2803 unsigned char *s; 2793 unsigned char *s;
2804 unsigned char ch, string[STRING_MAX]; 2794 unsigned char ch, string[STRING_MAX];
2805 2795
2806 for (; (ch = rxvt_cmd_getc(aR));) { 2796 for (; (ch = cmd_getc ());) {
2807 if (ch == C0_BEL 2797 if (ch == C0_BEL
2808 || ch == CHAR_ST 2798 || ch == CHAR_ST
2809 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2799 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2810 break; 2800 break;
2811 if (ch == C0_ESC) { 2801 if (ch == C0_ESC) {
… …
2829 2819
2830/*----------------------------------------------------------------------*/ 2820/*----------------------------------------------------------------------*/
2831/* 2821/*
2832 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2822 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2833 */ 2823 */
2834/* INTPROTO */
2835void 2824void
2836rxvt_process_dcs_seq(pR) 2825rxvt_term::process_dcs_seq ()
2837{ 2826{
2838 unsigned char eh, *s; 2827 unsigned char eh, *s;
2839/* 2828/*
2840 * Not handled yet 2829 * Not handled yet
2841 */ 2830 */
2842 s = rxvt_get_to_st(aR_ &eh); 2831 s = get_to_st (&eh);
2843 if (s) 2832 if (s)
2844 free(s); 2833 free(s);
2845 return; 2834 return;
2846} 2835}
2847 2836
2848/*----------------------------------------------------------------------*/ 2837/*----------------------------------------------------------------------*/
2849/* 2838/*
2850 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2839 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2851 */ 2840 */
2852/* INTPROTO */
2853void 2841void
2854rxvt_process_osc_seq(pR) 2842rxvt_term::process_osc_seq ()
2855{ 2843{
2856 unsigned char ch, eh, *s; 2844 unsigned char ch, eh, *s;
2857 int arg; 2845 int arg;
2858 2846
2859 ch = rxvt_cmd_getc(aR); 2847 ch = cmd_getc ();
2860 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2848 for (arg = 0; isdigit(ch); ch = cmd_getc ())
2861 arg = arg * 10 + (ch - '0'); 2849 arg = arg * 10 + (ch - '0');
2862 2850
2863 if (ch == ';') { 2851 if (ch == ';') {
2864 s = rxvt_get_to_st(aR_ &eh); 2852 s = get_to_st (&eh);
2865 if (s) { 2853 if (s) {
2866 /* 2854 /*
2867 * rxvt_menubar_dispatch() violates the constness of the string, 2855 * rxvt_menubar_dispatch() violates the constness of the string,
2868 * so do it here 2856 * so do it here
2869 */ 2857 */
2870 if (arg == XTerm_Menu) 2858 if (arg == XTerm_Menu)
2871#if 0 /* XXX: currently disabled due to security concerns */ 2859#if 0 /* XXX: currently disabled due to security concerns */
2872 rxvt_menubar_dispatch(aR_ (char *)s); 2860 menubar_dispatch ((char *)s);
2873#else 2861#else
2874 0; 2862 (void)0;
2875#endif 2863#endif
2876 else 2864 else
2877 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 2865 xterm_seq (arg, (char *)s, eh);
2878 free(s); 2866 free(s);
2879 } 2867 }
2880 } 2868 }
2881} 2869}
2882/* 2870/*
… …
2898 * 20 = bg pixmap 2886 * 20 = bg pixmap
2899 * 39 = change default fg color 2887 * 39 = change default fg color
2900 * 49 = change default bg color 2888 * 49 = change default bg color
2901 * 55 = dump scrollback buffer and all of screen 2889 * 55 = dump scrollback buffer and all of screen
2902 */ 2890 */
2903/* EXTPROTO */
2904void 2891void
2905rxvt_xterm_seq(pR_ int op, const char *str, unsigned char resp __attribute__((unused))) 2892rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused)))
2906{ 2893{
2907 int changed = 0; 2894 int changed = 0;
2908 int color; 2895 int color;
2909 char *buf, *name; 2896 char *buf, *name;
2910 2897
2911 assert(str != NULL); 2898 assert(str != NULL);
2912 switch (op) { 2899 switch (op) {
2913 case XTerm_name: 2900 case XTerm_name:
2914 rxvt_set_title(aR_ str); 2901 set_title (str);
2915 /* FALLTHROUGH */ 2902 /* FALLTHROUGH */
2916 case XTerm_iconName: 2903 case XTerm_iconName:
2917 rxvt_set_iconName(aR_ str); 2904 set_iconName (str);
2918 break; 2905 break;
2919 case XTerm_title: 2906 case XTerm_title:
2920 rxvt_set_title(aR_ str); 2907 set_title (str);
2921 break; 2908 break;
2922 case XTerm_Color: 2909 case XTerm_Color:
2923 for (buf = (char *)str; buf && *buf;) { 2910 for (buf = (char *)str; buf && *buf;) {
2924 if ((name = STRCHR(buf, ';')) == NULL) 2911 if ((name = STRCHR(buf, ';')) == NULL)
2925 break; 2912 break;
… …
2927 color = atoi(buf); 2914 color = atoi(buf);
2928 if (color < 0 || color >= TOTAL_COLORS) 2915 if (color < 0 || color >= TOTAL_COLORS)
2929 break; 2916 break;
2930 if ((buf = STRCHR(name, ';')) != NULL) 2917 if ((buf = STRCHR(name, ';')) != NULL)
2931 *buf++ = '\0'; 2918 *buf++ = '\0';
2932 rxvt_set_window_color(aR_ color + minCOLOR, name); 2919 set_window_color (color + minCOLOR, name);
2933 } 2920 }
2934 break; 2921 break;
2935#ifndef NO_CURSORCOLOR 2922#ifndef NO_CURSORCOLOR
2936 case XTerm_Color_cursor: 2923 case XTerm_Color_cursor:
2937 rxvt_set_window_color(aR_ Color_cursor, str); 2924 set_window_color (Color_cursor, str);
2938 break; 2925 break;
2939#endif 2926#endif
2940 case XTerm_Color_pointer: 2927 case XTerm_Color_pointer:
2941 rxvt_set_window_color(aR_ Color_pointer, str); 2928 set_window_color (Color_pointer, str);
2942 break; 2929 break;
2943#ifndef NO_BOLD_UNDERLINE_REVERSE 2930#ifndef NO_BOLD_UNDERLINE_REVERSE
2944 case XTerm_Color_BD: 2931 case XTerm_Color_BD:
2945 rxvt_set_window_color(aR_ Color_BD, str); 2932 set_window_color (Color_BD, str);
2946 break; 2933 break;
2947 case XTerm_Color_UL: 2934 case XTerm_Color_UL:
2948 rxvt_set_window_color(aR_ Color_UL, str); 2935 set_window_color (Color_UL, str);
2949 break; 2936 break;
2950 case XTerm_Color_RV: 2937 case XTerm_Color_RV:
2951 rxvt_set_window_color(aR_ Color_RV, str); 2938 set_window_color (Color_RV, str);
2952 break; 2939 break;
2953#endif 2940#endif
2954 2941
2955 case XTerm_Menu: 2942 case XTerm_Menu:
2956 /* 2943 /*
… …
2959 */ 2946 */
2960 break; 2947 break;
2961 case XTerm_Pixmap: 2948 case XTerm_Pixmap:
2962 if (*str != ';') { 2949 if (*str != ';') {
2963#if XPM_BACKGROUND 2950#if XPM_BACKGROUND
2964 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2951 scale_pixmap (""); /* reset to default scaling */
2965 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2952 set_bgPixmap (str); /* change pixmap */
2966#endif 2953#endif
2967 R->scr_touch (true); 2954 scr_touch (true);
2968 } 2955 }
2969 while ((str = STRCHR(str, ';')) != NULL) { 2956 while ((str = STRCHR(str, ';')) != NULL) {
2970 str++; 2957 str++;
2971#if XPM_BACKGROUND 2958#if XPM_BACKGROUND
2972 changed += rxvt_scale_pixmap(aR_ str); 2959 changed += scale_pixmap (str);
2973#endif 2960#endif
2974 } 2961 }
2975 if (changed) { 2962 if (changed) {
2976#ifdef XPM_BACKGROUND 2963#ifdef XPM_BACKGROUND
2977 rxvt_resize_pixmap(aR); 2964 resize_pixmap ();
2978#endif 2965#endif
2979 R->scr_touch (true); 2966 scr_touch (true);
2980 } 2967 }
2981 break; 2968 break;
2982 2969
2983 case XTerm_restoreFG: 2970 case XTerm_restoreFG:
2984 rxvt_set_window_color(aR_ Color_fg, str); 2971 set_window_color (Color_fg, str);
2985 break; 2972 break;
2986 case XTerm_restoreBG: 2973 case XTerm_restoreBG:
2987 rxvt_set_window_color(aR_ Color_bg, str); 2974 set_window_color (Color_bg, str);
2988 break; 2975 break;
2989 case XTerm_logfile: 2976 case XTerm_logfile:
2990 break; 2977 break;
2991 case XTerm_font: 2978 case XTerm_font:
2992 rxvt_change_font(aR_ 0, str); 2979 change_font (0, str);
2993 break; 2980 break;
2994#if 0 2981#if 0
2995 case XTerm_dumpscreen: /* no error notices */ 2982 case XTerm_dumpscreen: /* no error notices */
2996 { 2983 {
2997 int fd; 2984 int fd;
2998 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 2985 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) {
2999 rxvt_scr_dump(aR_ fd); 2986 scr_dump (fd);
3000 close(fd); 2987 close(fd);
3001 } 2988 }
3002 } 2989 }
3003 break; 2990 break;
3004#endif 2991#endif
… …
3014 * 's' = save 3001 * 's' = save
3015 * 'r' = restore 3002 * 'r' = restore
3016 * 't' = toggle 3003 * 't' = toggle
3017 * so no need for fancy checking 3004 * so no need for fancy checking
3018 */ 3005 */
3019/* INTPROTO */
3020int 3006int
3021rxvt_privcases(pR_ int mode, unsigned long bit) 3007rxvt_term::privcases (int mode, unsigned long bit)
3022{ 3008{
3023 int state; 3009 int state;
3024 3010
3025 if (mode == 's') { 3011 if (mode == 's') {
3026 R->SavedModes |= (R->PrivateModes & bit); 3012 SavedModes |= (PrivateModes & bit);
3027 return -1; 3013 return -1;
3028 } else { 3014 } else {
3029 if (mode == 'r') 3015 if (mode == 'r')
3030 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3016 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3031 else 3017 else
3032 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3018 state = (mode == 't') ? !(PrivateModes & bit) : mode;
3033 PrivMode(state, bit); 3019 PrivMode(state, bit);
3034 } 3020 }
3035 return state; 3021 return state;
3036} 3022}
3037 3023
3038/* we're not using priv _yet_ */ 3024/* we're not using priv _yet_ */
3039/* INTPROTO */
3040void 3025void
3041rxvt_process_terminal_mode(pR_ int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3026rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg)
3042{ 3027{
3043 unsigned int i, j; 3028 unsigned int i, j;
3044 int state; 3029 int state;
3045 static const struct { 3030 static const struct {
3046 const int argval; 3031 const int argval;
… …
3070#endif 3055#endif
3071 { 1000, PrivMode_MouseX11 }, 3056 { 1000, PrivMode_MouseX11 },
3072 { 1010, PrivMode_TtyOutputInh }, 3057 { 1010, PrivMode_TtyOutputInh },
3073 { 1011, PrivMode_Keypress }, 3058 { 1011, PrivMode_Keypress },
3074 { 1047, PrivMode_Screen }, 3059 { 1047, PrivMode_Screen },
3060 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3075 }; 3061 };
3076 3062
3077 if (nargs == 0) 3063 if (nargs == 0)
3078 return; 3064 return;
3079 3065
… …
3087 state = -1; 3073 state = -1;
3088 3074
3089 /* basic handling */ 3075 /* basic handling */
3090 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3076 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++)
3091 if (argtopriv[j].argval == arg[i]) { 3077 if (argtopriv[j].argval == arg[i]) {
3092 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3078 state = privcases (mode, argtopriv[j].bit);
3093 break; 3079 break;
3094 } 3080 }
3095 3081
3096 /* extra handling for values with state unkept */ 3082 /* extra handling for values with state unkept */
3097 if (state == -1) 3083 if (state == -1)
3098 switch (arg[i]) { 3084 switch (arg[i]) {
3099 case 1048: /* alternative cursor save */ 3085 case 1048: /* alternative cursor save */
3100 if (mode == 0) 3086 if (mode == 0)
3101 rxvt_scr_cursor(aR_ RESTORE); 3087 scr_cursor (RESTORE);
3102 else if (mode == 1) 3088 else if (mode == 1)
3103 rxvt_scr_cursor(aR_ SAVE); 3089 scr_cursor (SAVE);
3104 /* FALLTHROUGH */ 3090 /* FALLTHROUGH */
3105 default: 3091 default:
3106 continue; /* for(;i;) */ 3092 continue; /* for(;i;) */
3107 } 3093 }
3108 3094
… …
3115 * within VT52 mode 3101 * within VT52 mode
3116 */ 3102 */
3117 PrivMode(1, PrivMode_vt52); 3103 PrivMode(1, PrivMode_vt52);
3118 break; 3104 break;
3119 case 3: /* 80/132 */ 3105 case 3: /* 80/132 */
3120 if (R->PrivateModes & PrivMode_132OK) 3106 if (PrivateModes & PrivMode_132OK)
3121 rxvt_set_widthheight(aR_
3122 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3107 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth),
3123 (unsigned int)R->TermWin.height); 3108 (unsigned int)TermWin.height);
3124 break; 3109 break;
3125 case 4: /* smooth scrolling */ 3110 case 4: /* smooth scrolling */
3126 if (state) 3111 if (state)
3127 R->Options &= ~Opt_jumpScroll; 3112 Options &= ~Opt_jumpScroll;
3128 else 3113 else
3129 R->Options |= Opt_jumpScroll; 3114 Options |= Opt_jumpScroll;
3130 break; 3115 break;
3131 case 5: /* reverse video */ 3116 case 5: /* reverse video */
3132 rxvt_scr_rvideo_mode(aR_ state); 3117 scr_rvideo_mode (state);
3133 break; 3118 break;
3134 case 6: /* relative/absolute origins */ 3119 case 6: /* relative/absolute origins */
3135 rxvt_scr_relative_origin(aR_ state); 3120 scr_relative_origin (state);
3136 break; 3121 break;
3137 case 7: /* autowrap */ 3122 case 7: /* autowrap */
3138 rxvt_scr_autowrap(aR_ state); 3123 scr_autowrap (state);
3139 break; 3124 break;
3140 /* case 8: - auto repeat, can't do on a per window basis */ 3125 /* case 8: - auto repeat, can't do on a per window basis */
3141 case 9: /* X10 mouse reporting */ 3126 case 9: /* X10 mouse reporting */
3142 if (state) /* orthogonal */ 3127 if (state) /* orthogonal */
3143 R->PrivateModes &= ~(PrivMode_MouseX11); 3128 PrivateModes &= ~(PrivMode_MouseX11);
3144 break; 3129 break;
3145#ifdef menuBar_esc 3130#ifdef menuBar_esc
3146 case menuBar_esc: 3131 case menuBar_esc:
3147#ifdef MENUBAR 3132#ifdef MENUBAR
3148 rxvt_map_menuBar(aR_ state); 3133 map_menuBar (state);
3149#endif 3134#endif
3150 break; 3135 break;
3151#endif 3136#endif
3152#ifdef scrollBar_esc 3137#ifdef scrollBar_esc
3153 case scrollBar_esc: 3138 case scrollBar_esc:
3154 if (rxvt_scrollbar_mapping(aR_ state)) { 3139 if (scrollbar_mapping (state)) {
3155 R->resize_all_windows (0, 0, 0); 3140 resize_all_windows (0, 0, 0);
3156 R->scr_touch (true); 3141 scr_touch (true);
3157 } 3142 }
3158 break; 3143 break;
3159#endif 3144#endif
3160 case 25: /* visible/invisible cursor */ 3145 case 25: /* visible/invisible cursor */
3161 rxvt_scr_cursor_visible(aR_ state); 3146 scr_cursor_visible (state);
3162 break; 3147 break;
3163 /* case 35: - shift keys */ 3148 /* case 35: - shift keys */
3164 /* case 40: - 80 <--> 132 mode */ 3149 /* case 40: - 80 <--> 132 mode */
3165 case 47: /* secondary screen */ 3150 case 47: /* secondary screen */
3166 rxvt_scr_change_screen(aR_ state); 3151 scr_change_screen (state);
3167 break; 3152 break;
3168 /* case 66: - application key pad */ 3153 /* case 66: - application key pad */
3169 /* case 67: - backspace key */ 3154 /* case 67: - backspace key */
3170 case 1000: /* X11 mouse reporting */ 3155 case 1000: /* X11 mouse reporting */
3171 if (state) /* orthogonal */ 3156 if (state) /* orthogonal */
3172 R->PrivateModes &= ~(PrivMode_MouseX10); 3157 PrivateModes &= ~(PrivMode_MouseX10);
3173 break; 3158 break;
3174#if 0 3159#if 0
3175 case 1001: 3160 case 1001:
3176 break; /* X11 mouse highlighting */ 3161 break; /* X11 mouse highlighting */
3177#endif 3162#endif
3178 case 1010: /* scroll to bottom on TTY output inhibit */ 3163 case 1010: /* scroll to bottom on TTY output inhibit */
3179 if (state) 3164 if (state)
3180 R->Options &= ~Opt_scrollTtyOutput; 3165 Options &= ~Opt_scrollTtyOutput;
3181 else 3166 else
3182 R->Options |= Opt_scrollTtyOutput; 3167 Options |= Opt_scrollTtyOutput;
3183 break; 3168 break;
3184 case 1011: /* scroll to bottom on key press */ 3169 case 1011: /* scroll to bottom on key press */
3185 if (state) 3170 if (state)
3186 R->Options |= Opt_scrollTtyKeypress; 3171 Options |= Opt_scrollTtyKeypress;
3187 else 3172 else
3188 R->Options &= ~Opt_scrollTtyKeypress; 3173 Options &= ~Opt_scrollTtyKeypress;
3189 break; 3174 break;
3190 case 1047: /* secondary screen w/ clearing */ 3175 case 1047: /* secondary screen w/ clearing */
3176 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3191 if (R->current_screen != PRIMARY) 3177 if (current_screen != PRIMARY)
3192 R->scr_erase_screen (2); 3178 scr_erase_screen (2);
3193 rxvt_scr_change_screen(aR_ state); 3179 scr_change_screen (state);
3194 /* FALLTHROUGH */ 3180 /* FALLTHROUGH */
3195 default: 3181 default:
3196 break; 3182 break;
3197 } 3183 }
3198 } 3184 }
3199} 3185}
3200/*}}} */ 3186/*}}} */
3201 3187
3202/*{{{ process sgr sequences */ 3188/*{{{ process sgr sequences */
3203/* INTPROTO */
3204void 3189void
3205rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3190rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3206{ 3191{
3207 unsigned int i; 3192 unsigned int i;
3208 short rendset; 3193 short rendset;
3209 int rendstyle; 3194 int rendstyle;
3210 3195
3211 if (nargs == 0) { 3196 if (nargs == 0) {
3212 rxvt_scr_rendition(aR_ 0, ~RS_None); 3197 scr_rendition (0, ~RS_None);
3213 return; 3198 return;
3214 } 3199 }
3215 for (i = 0; i < nargs; i++) { 3200 for (i = 0; i < nargs; i++) {
3216 rendset = -1; 3201 rendset = -1;
3217 switch (arg[i]) { 3202 switch (arg[i]) {
… …
3242 case 27: 3227 case 27:
3243 rendset = 0, rendstyle = RS_RVid; 3228 rendset = 0, rendstyle = RS_RVid;
3244 break; 3229 break;
3245 } 3230 }
3246 if (rendset != -1) { 3231 if (rendset != -1) {
3247 rxvt_scr_rendition(aR_ rendset, rendstyle); 3232 scr_rendition (rendset, rendstyle);
3248 continue; /* for(;i;) */ 3233 continue; /* for(;i;) */
3249 } 3234 }
3250 3235
3251 switch (arg[i]) { 3236 switch (arg[i]) {
3252 case 30: 3237 case 30:
… …
3255 case 33: 3240 case 33:
3256 case 34: 3241 case 34:
3257 case 35: 3242 case 35:
3258 case 36: 3243 case 36:
3259 case 37: 3244 case 37:
3260 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3245 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)),
3261 Color_fg); 3246 Color_fg);
3262 break; 3247 break;
3263#ifdef TTY_256COLOR 3248#ifdef TTY_256COLOR
3264 case 38: 3249 case 38:
3265 if (nargs > i + 2 && arg[i + 1] == 5) { 3250 if (nargs > i + 2 && arg[i + 1] == 5) {
3266 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3251 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3267 Color_fg); 3252 Color_fg);
3268 i += 2; 3253 i += 2;
3269 } 3254 }
3270 break; 3255 break;
3271#endif 3256#endif
3272 case 39: /* default fg */ 3257 case 39: /* default fg */
3273 rxvt_scr_color(aR_ Color_fg, Color_fg); 3258 scr_color (Color_fg, Color_fg);
3274 break; 3259 break;
3275 3260
3276 case 40: 3261 case 40:
3277 case 41: /* set bg color */ 3262 case 41: /* set bg color */
3278 case 42: 3263 case 42:
3279 case 43: 3264 case 43:
3280 case 44: 3265 case 44:
3281 case 45: 3266 case 45:
3282 case 46: 3267 case 46:
3283 case 47: 3268 case 47:
3284 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3269 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)),
3285 Color_bg); 3270 Color_bg);
3286 break; 3271 break;
3287#ifdef TTY_256COLOR 3272#ifdef TTY_256COLOR
3288 case 48: 3273 case 48:
3289 if (nargs > i + 2 && arg[i + 1] == 5) { 3274 if (nargs > i + 2 && arg[i + 1] == 5) {
3290 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3275 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3291 Color_bg); 3276 Color_bg);
3292 i += 2; 3277 i += 2;
3293 } 3278 }
3294 break; 3279 break;
3295#endif 3280#endif
3296 case 49: /* default bg */ 3281 case 49: /* default bg */
3297 rxvt_scr_color(aR_ Color_bg, Color_bg); 3282 scr_color (Color_bg, Color_bg);
3298 break; 3283 break;
3299 3284
3300#ifndef NO_BRIGHTCOLOR 3285#ifndef NO_BRIGHTCOLOR
3301 case 90: 3286 case 90:
3302 case 91: /* set bright fg color */ 3287 case 91: /* set bright fg color */
… …
3304 case 93: 3289 case 93:
3305 case 94: 3290 case 94:
3306 case 95: 3291 case 95:
3307 case 96: 3292 case 96:
3308 case 97: 3293 case 97:
3309 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3294 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)),
3310 Color_fg); 3295 Color_fg);
3311 break; 3296 break;
3312 case 100: 3297 case 100:
3313 case 101: /* set bright bg color */ 3298 case 101: /* set bright bg color */
3314 case 102: 3299 case 102:
3315 case 103: 3300 case 103:
3316 case 104: 3301 case 104:
3317 case 105: 3302 case 105:
3318 case 106: 3303 case 106:
3319 case 107: 3304 case 107:
3320 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3305 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)),
3321 Color_bg); 3306 Color_bg);
3322 break; 3307 break;
3323#endif 3308#endif
3324 } 3309 }
3325 } 3310 }
3326} 3311}
3327/*}}} */ 3312/*}}} */
3328 3313
3329/*{{{ process Rob Nation's own graphics mode sequences */ 3314/*{{{ process Rob Nation's own graphics mode sequences */
3330/* INTPROTO */
3331void 3315void
3332rxvt_process_graphics(pR) 3316rxvt_term::process_graphics ()
3333{ 3317{
3334 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3318 unsigned char ch, cmd = cmd_getc ();
3335 3319
3336#ifndef RXVT_GRAPHICS 3320#ifndef RXVT_GRAPHICS
3337 if (cmd == 'Q') { /* query graphics */ 3321 if (cmd == 'Q') { /* query graphics */
3338 R->tt_printf("\033G0\n"); /* no graphics */ 3322 tt_printf("\033G0\n"); /* no graphics */
3339 return; 3323 return;
3340 } 3324 }
3341/* swallow other graphics sequences until terminating ':' */ 3325/* swallow other graphics sequences until terminating ':' */
3342 do 3326 do
3343 ch = rxvt_cmd_getc(aR); 3327 ch = cmd_getc ();
3344 while (ch != ':'); 3328 while (ch != ':');
3345#else 3329#else
3346 unsigned int nargs; 3330 unsigned int nargs;
3347 int args[NGRX_PTS]; 3331 int args[NGRX_PTS];
3348 unsigned char *text = NULL; 3332 unsigned char *text = NULL;
3349 3333
3350 if (cmd == 'Q') { /* query graphics */ 3334 if (cmd == 'Q') { /* query graphics */
3351 R->tt_printf("\033G1\n"); /* yes, graphics (color) */ 3335 tt_printf("\033G1\n"); /* yes, graphics (color) */
3352 return; 3336 return;
3353 } 3337 }
3354 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3338 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3355 int neg; 3339 int neg;
3356 3340
3357 ch = rxvt_cmd_getc(aR); 3341 ch = cmd_getc ();
3358 neg = (ch == '-'); 3342 neg = (ch == '-');
3359 if (neg || ch == '+') 3343 if (neg || ch == '+')
3360 ch = rxvt_cmd_getc(aR); 3344 ch = cmd_getc ();
3361 3345
3362 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 3346 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3363 args[nargs] = args[nargs] * 10 + (ch - '0'); 3347 args[nargs] = args[nargs] * 10 + (ch - '0');
3364 if (neg) 3348 if (neg)
3365 args[nargs] = -args[nargs]; 3349 args[nargs] = -args[nargs];
3366 3350
3367 nargs++; 3351 nargs++;
… …
3375 3359
3376 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); 3360 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3377 3361
3378 if (text != NULL) { 3362 if (text != NULL) {
3379 for (i = 0; i < len; i++) 3363 for (i = 0; i < len; i++)
3380 text[i] = rxvt_cmd_getc(aR); 3364 text[i] = cmd_getc ();
3381 text[len] = '\0'; 3365 text[len] = '\0';
3382 } 3366 }
3383 } 3367 }
3384 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text); 3368 Gr_do_graphics (cmd, nargs, args, text);
3385#endif 3369#endif
3386} 3370}
3387/*}}} */ 3371/*}}} */
3388 3372
3389/* ------------------------------------------------------------------------- */ 3373/* ------------------------------------------------------------------------- */
… …
3415 3399
3416 if (len) 3400 if (len)
3417 { 3401 {
3418 if (v_buflen == 0) 3402 if (v_buflen == 0)
3419 { 3403 {
3420 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 3404 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3405
3421 if (written == len) 3406 if ((unsigned int)written == len)
3422 return; 3407 return;
3423 3408
3424 data += written; 3409 data += written;
3425 len -= written; 3410 len -= written;
3426 } 3411 }

Diff Legend

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