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.7 by pcg, Tue Nov 25 17:34:47 2003 UTC vs.
Revision 1.56 by pcg, Tue Feb 24 00:02:44 2004 UTC

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

Diff Legend

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