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.17 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.36 by pcg, Sun Feb 1 01:34:41 2004 UTC

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

Diff Legend

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