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.10 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.35 by pcg, Sat Jan 31 03:27:45 2004 UTC

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

Diff Legend

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