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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.38 by pcg, Mon Feb 9 07:11:49 2004 UTC

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

Diff Legend

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