ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.10 by pcg, Wed Dec 3 23:19:44 2003 UTC vs.
Revision 1.51 by pcg, Sat Mar 6 00:05:01 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.10 2003/12/03 23:19:44 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>
… …
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
61class rxvt_composite_vec rxvt_composite;
62
63text_t rxvt_composite_vec::compose (uint32_t c1, uint32_t c2)
64{
65 compose_char *cc;
66
67 // break compose chains, as stupid readline really likes to duplicate
68 // composing characters for some reason near the end of a line.
69 cc = (*this)[c1];
70 while (cc)
71 {
72 if (cc->c2 == c2) return c1;
73 cc = (*this)[cc->c1];
74 }
75
76 // check to see wether this combination already exists otherwise
77 for (cc = v.end (); cc-- > v.begin (); )
78 {
79 if (cc->c1 == c1 && cc->c2 == c2)
80 return COMPOSE_LO + (cc - v.begin ());
81 }
82
83 // allocate a new combination
84 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
85 {
86 static int seen;
87
88 if (!seen++)
89 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
90
91 return REPLACEMENT_CHAR;
92 }
93
94 v.push_back (compose_char (c1, c2));
95
96 return v.size () - 1 + COMPOSE_LO;
97}
98
99int rxvt_composite_vec::expand (uint32_t c, wchar_t *r)
100{
101 compose_char *cc = (*this)[c];
102
103 if (!cc)
104 {
105 if (r) *r = c;
106 return 1;
107 }
108
109 int len = expand (cc->c1, r);
110
111 if (r) r += len;
112
113 if (cc->c2 != NOCHAR)
114 {
115 len++;
116 if (r) *r++ = cc->c2;
117 }
118
119 return len;
120
121}
122
123extern struct rxvt_composite_vec rxvt_composite;
47void * 124void *
48rxvt_term::operator new (size_t s) 125rxvt_term::operator new (size_t s)
49{ 126{
50 void *p = malloc (s); 127 void *p = malloc (s);
51 128
… …
58{ 135{
59 free (p); 136 free (p);
60} 137}
61 138
62rxvt_term::rxvt_term () 139rxvt_term::rxvt_term ()
140 :
141 rootwin_ev (this, &rxvt_term::rootwin_cb),
142 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 143 vt_ev (this, &rxvt_term::x_cb),
144#ifdef HAVE_SCROLLBARS
145 scrollbar_ev (this, &rxvt_term::x_cb),
146#endif
147#ifdef MENUBAR
148 menubar_ev (this, &rxvt_term::x_cb),
149#endif
64#ifdef CURSOR_BLINK 150#ifdef CURSOR_BLINK
151 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
152#endif
153#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 154 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 155#endif
67#ifdef POINTER_BLANK 156#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 157 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 158#endif
159#ifdef USE_XIM
70 x_ev (this, &rxvt_term::x_cb), 160 im_ev (this, &rxvt_term::im_cb),
161#endif
162 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb), 163 destroy_ev (this, &rxvt_term::destroy_cb),
164 pty_ev (this, &rxvt_term::pty_cb),
72 check_ev (this, &rxvt_term::check_cb) 165 incr_ev (this, &rxvt_term::incr_cb)
73{ 166{
74 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 167 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
75} 168}
76 169
77rxvt_term::~rxvt_term () 170rxvt_term::~rxvt_term ()
78{ 171{
79 rxvt_scr_release (this);
80
81#ifndef NO_SETOWNER_TTYDEV
82 rxvt_privileged_ttydev (this, RESTORE);
83#endif
84#ifdef UTMP_SUPPORT
85 rxvt_privileged_utmp (this, RESTORE);
86#endif
87#ifdef USE_XIM
88 if (Input_Context != NULL)
89 {
90 XDestroyIC (Input_Context);
91 Input_Context = NULL;
92 }
93#endif
94
95 if (cmd_fd >= 0) 172 if (cmd_fd >= 0)
96 close (cmd_fd); 173 close (cmd_fd);
97 174
98 if (Xfd >= 0) 175#ifndef NO_SETOWNER_TTYDEV
99 XCloseDisplay (Xdisplay); 176 privileged_ttydev (RESTORE);
177#endif
178#ifdef UTMP_SUPPORT
179 privileged_utmp (RESTORE);
180#endif
181
182 delete TermWin.fontset;
183
184 if (display)
185 {
186#if defined(MENUBAR) && (MENUBAR_MAX > 1)
187 delete menuBar.drawable;
188 //if (menuBar.win)
189 // XDestroyWindow (display->display, menuBar.win);
190#endif
191 delete TermWin.drawable;
192 // destroy all windows
193 if (TermWin.parent[0])
194 XDestroyWindow (display->display, TermWin.parent[0]);
195 }
196
197 // TODO: free pixcolours, colours should become part of rxvt_display
100 198
101 delete PixColors; 199 delete PixColors;
200
201 displays.put (display);
202
203 scr_release ();
204
205 free (env_windowid);
206 free (env_display);
207 free (env_term);
208 free (env_colorfgbg);
209 free (locale);
210 free (codeset);
211
212 delete envv;
213 delete argv;
102} 214}
103 215
104void 216void
105rxvt_term::destroy () 217rxvt_term::destroy ()
106{ 218{
219 if (display)
220 {
221 rootwin_ev.stop (display);
222 termwin_ev.stop (display);
223 vt_ev.stop (display);
224#ifdef USE_XIM
225 im_destroy ();
226 im_ev.stop (display);
227#endif
228#ifdef HAVE_SCROLLBARS
229 scrollbar_ev.stop (display);
230#endif
231#ifdef MENUBAR
232 menubar_ev.stop (display);
233#endif
234 }
235
107 check_ev.stop (); 236 check_ev.stop ();
108 pty_ev.stop (); 237 pty_ev.stop ();
109 x_ev.stop ();
110#ifdef CURSOR_BLINK 238#ifdef CURSOR_BLINK
239 cursor_blink_ev.stop ();
240#endif
241#ifdef TEXT_BLINK
111 blink_ev.stop (); 242 text_blink_ev.stop ();
112#endif 243#endif
113#ifdef POINTER_BLANK 244#ifdef POINTER_BLANK
114 pointer_ev.stop (); 245 pointer_ev.stop ();
115#endif 246#endif
116 247
… …
124 255
125 delete this; 256 delete this;
126} 257}
127 258
128/*----------------------------------------------------------------------*/ 259/*----------------------------------------------------------------------*/
129/* rxvt_init() */ 260/* rxvt_init () */
130/* LIBPROTO */ 261/* LIBPROTO */
131rxvt_t 262rxvt_t
132rxvt_init (int argc, const char *const *argv) 263rxvt_init (int argc, const char *const *argv)
133{ 264{
134 SET_R (new rxvt_term); 265 SET_R (new rxvt_term);
135 dR;
136 266
137 if (!R->init_vars () || !R->init (argc, argv)) 267 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
138 { 268 {
139 delete R; 269 delete GET_R;
140 return NULL; 270 SET_R (0);
141 } 271 }
142 272
143 return R; 273 return GET_R;
144} 274}
145 275
146/* EXTPROTO */ 276static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
277
147void 278void
148rxvt_init_signals () 279rxvt_init_signals ()
149{ 280{
150/* install exit handler for cleanup */ 281 /* install exit handler for cleanup */
151#if 0 282#if 0
152#ifdef HAVE_ATEXIT 283#ifdef HAVE_ATEXIT
153 atexit(rxvt_clean_exit); 284 atexit (rxvt_clean_exit);
154#else 285#else
155#endif 286#endif
156#endif 287#endif
157 288
158 struct sigaction sa; 289 struct sigaction sa;
… …
164 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 295 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 296 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 297 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
167 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 298 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
168 299
169/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 300 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
170/* signal (SIGURG, SIG_DFL); */ 301 /* signal (SIGURG, SIG_DFL); */
171 302
172 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 303 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
173 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 304 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
174} 305}
175 306
176bool 307bool
177rxvt_term::init (int argc, const char *const *argv) 308rxvt_term::init (int argc, const char *const *argv)
178{ 309{
179 dR;//TODO (scrollbar, setidle)
180
181 /* 310 /*
182 * Save and then give up any super-user privileges 311 * Save and then give up any super-user privileges
183 * If we need privileges in any area then we must specifically request it. 312 * If we need privileges in any area then we must specifically request it.
184 * We should only need to be root in these cases: 313 * We should only need to be root in these cases:
185 * 1. write utmp entries on some systems 314 * 1. write utmp entries on some systems
186 * 2. chown tty on some systems 315 * 2. chown tty on some systems
187 */ 316 */
188 rxvt_privileges (this, SAVE); 317 privileges (SAVE);
189 rxvt_privileges (this, IGNORE); 318 privileges (IGNORE);
190 319
191 rxvt_init_secondary (this); 320 init_secondary ();
192 321
193 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 322 const char **cmd_argv = init_resources (argc, argv);
194 323
324 set_locale ("");
325
195#if (MENUBAR_MAX) 326#if MENUBAR_MAX
196 rxvt_menubar_read (this, rs[Rs_menu]); 327 menubar_read (rs[Rs_menu]);
197#endif 328#endif
198#ifdef HAVE_SCROLLBARS 329#ifdef HAVE_SCROLLBARS
199 if (Options & Opt_scrollBar) 330 if (Options & Opt_scrollBar)
200 scrollbar_setIdle (); /* set existence for size calculations */ 331 scrollBar.setIdle (); /* set existence for size calculations */
201#endif 332#endif
202 333
203 rxvt_Create_Windows (this, argc, argv); 334 create_windows (argc, argv);
204 335
205 rxvt_init_xlocale (this); 336 init_xlocale ();
206 337
207 rxvt_scr_reset (this); /* initialize screen */ 338 scr_reset (); /* initialize screen */
208#ifdef RXVT_GRAPHICS
209 rxvt_Gr_reset (this); /* reset graphics */
210#endif
211 339
212#if 0 340#if 0
213#ifdef DEBUG_X
214 XSynchronize(Xdisplay, True); 341 XSynchronize (display->display, True);
215#endif
216#endif 342#endif
217 343
218#ifdef HAVE_SCROLLBARS 344#ifdef HAVE_SCROLLBARS
219 if (Options & Opt_scrollBar) 345 if (Options & Opt_scrollBar)
220 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 346 resize_scrollbar (); /* create and map scrollbar */
221#endif 347#endif
222#if (MENUBAR_MAX) 348#if (MENUBAR_MAX)
223 if (menubar_visible(r)) 349 if (menubar_visible ())
224 XMapWindow (Xdisplay, menuBar.win); 350 XMapWindow (display->display, menuBar.win);
225#endif 351#endif
226#ifdef TRANSPARENT 352#ifdef TRANSPARENT
227 if (Options & Opt_transparent) 353 if (Options & Opt_transparent)
228 { 354 {
229 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 355 XSelectInput (display->display, display->root, PropertyChangeMask);
230 rxvt_check_our_parents (this); 356 check_our_parents ();
231 } 357 }
232#endif 358#endif
359
360 rootwin_ev.start (display, display->root);
361
233 XMapWindow (Xdisplay, TermWin.vt); 362 XMapWindow (display->display, TermWin.vt);
234 XMapWindow (Xdisplay, TermWin.parent[0]); 363 XMapWindow (display->display, TermWin.parent[0]);
235 364
236 rxvt_init_env (this);
237 rxvt_init_command (this, cmd_argv); 365 init_command (cmd_argv);
238 366
239 x_ev.start (Xfd, EVENT_READ);
240 pty_ev.start (cmd_fd, EVENT_READ); 367 pty_ev.start (cmd_fd, EVENT_READ);
241 368
242 check_ev.start (); 369 check_ev.start ();
243
244 process_x_events ();
245 370
246 return true; 371 return true;
247} 372}
248 373
249/* ------------------------------------------------------------------------- * 374/* ------------------------------------------------------------------------- *
… …
253 * Catch a SIGCHLD signal and exit if the direct child has died 378 * Catch a SIGCHLD signal and exit if the direct child has died
254 */ 379 */
255/* ARGSUSED */ 380/* ARGSUSED */
256/* EXTPROTO */ 381/* EXTPROTO */
257RETSIGTYPE 382RETSIGTYPE
258rxvt_Child_signal(int sig __attribute__ ((unused))) 383rxvt_Child_signal (int sig __attribute__ ((unused)))
259{ 384{
260 int pid, save_errno = errno; 385 int pid, save_errno = errno;
261 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 386 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
262 ; 387 ;
263 errno = save_errno; 388 errno = save_errno;
264 389
265#if 0 390#if 0
266 if (pid == R->cmd_pid) 391 if (pid == cmd_pid)
267 exit (EXIT_SUCCESS); 392 exit (EXIT_SUCCESS);
268#endif 393#endif
269} 394}
270 395
271/* 396/*
272 * Catch a fatal signal and tidy up before quitting 397 * Catch a fatal signal and tidy up before quitting
273 */ 398 */
274/* EXTPROTO */ 399/* EXTPROTO */
275RETSIGTYPE 400RETSIGTYPE
276rxvt_Exit_signal(int sig) 401rxvt_Exit_signal (int sig)
277{ 402{
278 signal(sig, SIG_DFL); 403 signal (sig, SIG_DFL);
279#ifdef DEBUG_CMD 404#ifdef DEBUG_CMD
280 rxvt_print_error("signal %d", sig); 405 rxvt_print_error ("signal %d", sig);
281#endif 406#endif
282 rxvt_clean_exit(); 407 rxvt_clean_exit ();
283 kill(getpid(), sig); 408 kill (getpid (), sig);
284} 409}
285 410
286/* ARGSUSED */
287/* INTPROTO */ 411/* INTPROTO */
288int 412int
289rxvt_xerror_handler(const Display * display 413rxvt_xerror_handler (Display *display, XErrorEvent *event)
290 __attribute__ ((unused)), const XErrorEvent * event)
291{ 414{
292 dR;
293
294 if (R->allowedxerror == -1) 415 if (GET_R->allowedxerror == -1)
295 R->allowedxerror = event->error_code; 416 GET_R->allowedxerror = event->error_code;
296 else 417 else
297 { 418 {
298 rxvt_print_error("XError: Request: %d . %d, Error: %d", 419 old_xerror_handler (display, event);
299 event->request_code, event->minor_code,
300 event->error_code);
301
302 R->destroy (); 420 GET_R->destroy ();
303 } 421 }
304 422
305 return 0; 423 return 0;
306} 424}
307 425
… …
312 */ 430 */
313/* EXTPROTO */ 431/* EXTPROTO */
314void 432void
315rxvt_clean_exit () 433rxvt_clean_exit ()
316{ 434{
317 dR; 435 // TODO: rxvtd should clean up all ressources
318 436 if (GET_R)
319 R->destroy (); 437 GET_R->destroy ();
320} 438}
321 439
322/* ------------------------------------------------------------------------- * 440/* ------------------------------------------------------------------------- *
323 * MEMORY ALLOCATION WRAPPERS * 441 * MEMORY ALLOCATION WRAPPERS *
324 * ------------------------------------------------------------------------- */ 442 * ------------------------------------------------------------------------- */
325/* EXTPROTO */ 443/* EXTPROTO */
326void * 444void *
327rxvt_malloc(size_t size) 445rxvt_malloc (size_t size)
328{ 446{
329 void *p; 447 void *p;
330 448
331 p = malloc(size); 449 p = malloc (size);
332 if (p) 450 if (p)
333 return p; 451 return p;
334 452
335 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 453 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
336 rxvt_clean_exit(); 454 rxvt_clean_exit ();
337 exit(EXIT_FAILURE); 455 exit (EXIT_FAILURE);
338/* NOTREACHED */ 456 /* NOTREACHED */
339} 457}
340 458
341/* EXTPROTO */ 459/* EXTPROTO */
342void * 460void *
343rxvt_calloc(size_t number, size_t size) 461rxvt_calloc (size_t number, size_t size)
344{ 462{
345 void *p; 463 void *p;
346 464
347 p = calloc(number, size); 465 p = calloc (number, size);
348 if (p) 466 if (p)
349 return p; 467 return p;
350 468
351 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 469 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
352 rxvt_clean_exit(); 470 rxvt_clean_exit ();
353 exit(EXIT_FAILURE); 471 exit (EXIT_FAILURE);
354/* NOTREACHED */ 472 /* NOTREACHED */
355} 473}
356 474
357/* EXTPROTO */ 475/* EXTPROTO */
358void * 476void *
359rxvt_realloc(void *ptr, size_t size) 477rxvt_realloc (void *ptr, size_t size)
360{ 478{
361 void *p; 479 void *p;
362 480
363 if (ptr) 481 if (ptr)
364 p = realloc(ptr, size); 482 p = realloc (ptr, size);
365 else 483 else
366 p = malloc(size); 484 p = malloc (size);
367 if (p) 485 if (p)
368 return p; 486 return p;
369 487
370 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 488 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
371 rxvt_clean_exit(); 489 rxvt_clean_exit ();
372 exit(EXIT_FAILURE); 490 exit (EXIT_FAILURE);
373/* NOTREACHED */ 491 /* NOTREACHED */
374} 492}
375 493
376/* ------------------------------------------------------------------------- * 494/* ------------------------------------------------------------------------- *
377 * PRIVILEGED OPERATIONS * 495 * PRIVILEGED OPERATIONS *
378 * ------------------------------------------------------------------------- */ 496 * ------------------------------------------------------------------------- */
379/* take care of suid/sgid super-user (root) privileges */ 497/* take care of suid/sgid super-user (root) privileges */
380/* INTPROTO */
381void 498void
382rxvt_privileges(pR_ int mode) 499rxvt_term::privileges (int mode)
383{ 500{
384#if ! defined(__CYGWIN32__) 501#if ! defined(__CYGWIN32__)
385# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 502# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
386/* setreuid() is the poor man's setuid(), seteuid() */ 503 /* setreuid () is the poor man's setuid (), seteuid () */
387# define seteuid(a) setreuid(-1, (a)) 504# define seteuid(a) setreuid(-1, (a))
388# define setegid(a) setregid(-1, (a)) 505# define setegid(a) setregid(-1, (a))
389# define HAVE_SETEUID 506# define HAVE_SETEUID
390# endif 507# endif
391# ifdef HAVE_SETEUID 508# ifdef HAVE_SETEUID
392 switch (mode) { 509 switch (mode)
510 {
393 case IGNORE: 511 case IGNORE:
394 /* 512 /*
395 * change effective uid/gid - not real uid/gid - so we can switch 513 * change effective uid/gid - not real uid/gid - so we can switch
396 * back to root later, as required 514 * back to root later, as required
397 */ 515 */
398 seteuid(getuid()); 516 seteuid (getuid ());
399 setegid(getgid()); 517 setegid (getgid ());
400 break; 518 break;
401 case SAVE: 519 case SAVE:
402 R->euid = geteuid(); 520 euid = geteuid ();
403 R->egid = getegid(); 521 egid = getegid ();
404 break; 522 break;
405 case RESTORE: 523 case RESTORE:
406 seteuid(R->euid); 524 seteuid (euid);
407 setegid(R->egid); 525 setegid (egid);
408 break; 526 break;
409 } 527 }
410# else 528# else
411 switch (mode) { 529 switch (mode)
530 {
412 case IGNORE: 531 case IGNORE:
413 setuid(getuid()); 532 setuid (getuid ());
414 setgid(getgid()); 533 setgid (getgid ());
415 /* FALLTHROUGH */ 534 /* FALLTHROUGH */
416 case SAVE: 535 case SAVE:
417 /* FALLTHROUGH */ 536 /* FALLTHROUGH */
418 case RESTORE: 537 case RESTORE:
419 break; 538 break;
420 } 539 }
421# endif 540# endif
422#endif 541#endif
423} 542}
424 543
425#ifdef UTMP_SUPPORT 544#ifdef UTMP_SUPPORT
426/* EXTPROTO */
427void 545void
428rxvt_privileged_utmp(pR_ char action) 546rxvt_term::privileged_utmp (char action)
429{ 547{
430 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 548 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
431 action, R->next_utmp_action, getpid())); 549 action, next_utmp_action, getpid ()));
432 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 550 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
433 || (R->Options & Opt_utmpInhibit) 551 || (Options & Opt_utmpInhibit)
434 || R->ttydev == NULL || *R->ttydev == '\0') 552 || ttydev == NULL || *ttydev == '\0')
435 return; 553 return;
436 554
437 rxvt_privileges(aR_ RESTORE); 555 privileges (RESTORE);
438 if (action == SAVE) { 556 if (action == SAVE)
557 {
439 R->next_utmp_action = RESTORE; 558 next_utmp_action = RESTORE;
440 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 559 makeutent (ttydev, rs[Rs_display_name]);
560 }
561 else
441 } else { /* action == RESTORE */ 562 { /* action == RESTORE */
442 R->next_utmp_action = IGNORE; 563 next_utmp_action = IGNORE;
443 rxvt_cleanutent(aR); 564 cleanutent ();
444 } 565 }
445 rxvt_privileges(aR_ IGNORE); 566 privileges (IGNORE);
446} 567}
447#endif 568#endif
448 569
449#ifndef NO_SETOWNER_TTYDEV 570#ifndef NO_SETOWNER_TTYDEV
450/* EXTPROTO */
451void 571void
452rxvt_privileged_ttydev(pR_ char action) 572rxvt_term::privileged_ttydev (char action)
453{ 573{
454 D_MAIN((stderr, 574 D_MAIN ((stderr,
455 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 575 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
456 action, R->next_tty_action, getpid())); 576 action, next_tty_action, getpid ()));
457 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 577 if (next_tty_action != action || (action != SAVE && action != RESTORE)
458 || R->ttydev == NULL || *R->ttydev == '\0') 578 || ttydev == NULL || *ttydev == '\0')
459 return; 579 return;
460 580
461 rxvt_privileges(aR_ RESTORE); 581 privileges (RESTORE);
462 582
463 if (action == SAVE) { 583 if (action == SAVE)
584 {
464 R->next_tty_action = RESTORE; 585 next_tty_action = RESTORE;
465# ifndef RESET_TTY_TO_COMMON_DEFAULTS 586# ifndef RESET_TTY_TO_COMMON_DEFAULTS
466/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 587 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
467 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 588 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
468 R->next_tty_action = IGNORE; 589 next_tty_action = IGNORE;
469 else 590 else
470# endif 591# endif
592
471 { 593 {
472 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 594 chown (ttydev, getuid (), ttygid); /* fail silently */
473 chmod(R->ttydev, R->ttymode); 595 chmod (ttydev, ttymode);
474# ifdef HAVE_REVOKE 596# ifdef HAVE_REVOKE
475 revoke(R->ttydev); 597 revoke (ttydev);
476# endif 598# endif
599
477 } 600 }
601 }
602 else
478 } else { /* action == RESTORE */ 603 { /* action == RESTORE */
479 R->next_tty_action = IGNORE; 604 next_tty_action = IGNORE;
480# ifndef RESET_TTY_TO_COMMON_DEFAULTS 605# ifndef RESET_TTY_TO_COMMON_DEFAULTS
481 chmod(R->ttydev, R->ttyfd_stat.st_mode); 606 chmod (ttydev, ttyfd_stat.st_mode);
482 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 607 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
483# else 608# else
484 chmod(R->ttydev, 609 chmod (ttydev,
485 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 610 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
486 chown(R->ttydev, 0, 0); 611 chown (ttydev, 0, 0);
487# endif 612# endif
488 }
489 613
614 }
615
490 rxvt_privileges(aR_ IGNORE); 616 privileges (IGNORE);
491 617
492# ifndef RESET_TTY_TO_COMMON_DEFAULTS 618# ifndef RESET_TTY_TO_COMMON_DEFAULTS
493 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 619 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
494 action == RESTORE ? "Restoring" : (action == 620 action == RESTORE ? "Restoring" : (action ==
495 SAVE ? "Saving" : 621 SAVE ? "Saving" :
496 "UNKNOWN ERROR for"), R->ttydev, 622 "UNKNOWN ERROR for"), ttydev,
497 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 623 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
498 R->ttyfd_stat.st_gid)); 624 ttyfd_stat.st_gid));
499# endif 625# endif
500} 626}
501#endif 627#endif
502 628
503/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
504/* 630/*
505 * window size/position calculcations for XSizeHint and other storage. 631 * window size/position calculcations for XSizeHint and other storage.
506 * if width/height are non-zero then override calculated width/height 632 * if width/height are non-zero then override calculated width/height
507 */ 633 */
508/* EXTPROTO */
509void 634void
510rxvt_window_calc(pR_ unsigned int width, unsigned int height) 635rxvt_term::window_calc (unsigned int width, unsigned int height)
511{ 636{
512 short recalc_x, recalc_y; 637 short recalc_x, recalc_y;
513 int x, y, sb_w, mb_h, flags; 638 int x, y, sb_w, mb_h, flags;
514 unsigned int w, h; 639 unsigned int w, h;
515 unsigned int max_width, max_height; 640 unsigned int max_width, max_height;
516 641
517 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 642 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
518 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 643 TermWin.ncol, TermWin.nrow, szHint.width,
519 R->szHint.height)); 644 szHint.height));
520 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 645 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
521 R->szHint.win_gravity = NorthWestGravity; 646 szHint.win_gravity = NorthWestGravity;
522/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 647 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
523 648
524 recalc_x = recalc_y = 0; 649 recalc_x = recalc_y = 0;
525 flags = 0; 650 flags = 0;
526 if (!R->parsed_geometry) { 651 if (!parsed_geometry)
652 {
527 R->parsed_geometry = 1; 653 parsed_geometry = 1;
528 if (R->rs[Rs_geometry]) 654 if (rs[Rs_geometry])
529 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 655 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
530 if (flags & WidthValue) { 656 if (flags & WidthValue)
657 {
531 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 658 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
532 R->szHint.flags |= USSize; 659 szHint.flags |= USSize;
533 } 660 }
534 if (flags & HeightValue) { 661 if (flags & HeightValue)
662 {
535 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 663 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
536 R->szHint.flags |= USSize; 664 szHint.flags |= USSize;
537 } 665 }
538 if (flags & XValue) { 666 if (flags & XValue)
667 {
539 R->szHint.x = x; 668 szHint.x = x;
540 R->szHint.flags |= USPosition; 669 szHint.flags |= USPosition;
541 if (flags & XNegative) { 670 if (flags & XNegative)
671 {
542 recalc_x = 1; 672 recalc_x = 1;
543 R->szHint.win_gravity = NorthEastGravity; 673 szHint.win_gravity = NorthEastGravity;
544 } 674 }
545 } 675 }
546 if (flags & YValue) { 676 if (flags & YValue)
677 {
547 R->szHint.y = y; 678 szHint.y = y;
548 R->szHint.flags |= USPosition; 679 szHint.flags |= USPosition;
549 if (flags & YNegative) { 680 if (flags & YNegative)
681 {
550 recalc_y = 1; 682 recalc_y = 1;
551 if (R->szHint.win_gravity == NorthEastGravity) 683 if (szHint.win_gravity == NorthEastGravity)
552 R->szHint.win_gravity = SouthEastGravity; 684 szHint.win_gravity = SouthEastGravity;
553 else 685 else
554 R->szHint.win_gravity = SouthWestGravity; 686 szHint.win_gravity = SouthWestGravity;
555 } 687 }
556 } 688 }
557 } 689 }
558/* TODO: BOUNDS */ 690 /* TODO: BOUNDS */
559 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 691 TermWin.width = TermWin.ncol * TermWin.fwidth;
560 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 692 TermWin.height = TermWin.nrow * TermWin.fheight;
561 max_width = MAX_COLS * R->TermWin.fwidth; 693 max_width = MAX_COLS * TermWin.fwidth;
562 max_height = MAX_ROWS * R->TermWin.fheight; 694 max_height = MAX_ROWS * TermWin.fheight;
563 695
564 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 696 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
565 697
566 sb_w = mb_h = 0; 698 sb_w = mb_h = 0;
567 R->window_vt_x = R->window_vt_y = 0; 699 window_vt_x = window_vt_y = 0;
568 if (scrollbar_visible(R)) { 700 if (scrollbar_visible ())
701 {
569 sb_w = scrollbar_TotalWidth(); 702 sb_w = scrollbar_TotalWidth ();
570 R->szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
571 if (!(R->Options & Opt_scrollBar_right)) 704 if (! (Options & Opt_scrollBar_right))
572 R->window_vt_x = sb_w; 705 window_vt_x = sb_w;
573 } 706 }
574 if (menubar_visible(R)) { 707 if (menubar_visible ())
708 {
575 mb_h = menuBar_TotalHeight(); 709 mb_h = menuBar_TotalHeight ();
576 R->szHint.base_height += mb_h; 710 szHint.base_height += mb_h;
577 R->window_vt_y = mb_h; 711 window_vt_y = mb_h;
578 } 712 }
579 R->szHint.width_inc = R->TermWin.fwidth; 713 szHint.width_inc = TermWin.fwidth;
580 R->szHint.height_inc = R->TermWin.fheight; 714 szHint.height_inc = TermWin.fheight;
581 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 715 szHint.min_width = szHint.base_width + szHint.width_inc;
582 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 716 szHint.min_height = szHint.base_height + szHint.height_inc;
583 717
584 if (width && width - R->szHint.base_width < max_width) { 718 if (width && width - szHint.base_width < max_width)
719 {
585 R->szHint.width = width; 720 szHint.width = width;
586 R->TermWin.width = width - R->szHint.base_width; 721 TermWin.width = width - szHint.base_width;
587 } else { 722 }
723 else
724 {
588 MIN_IT(R->TermWin.width, max_width); 725 MIN_IT (TermWin.width, max_width);
589 R->szHint.width = R->szHint.base_width + R->TermWin.width; 726 szHint.width = szHint.base_width + TermWin.width;
590 } 727 }
591 if (height && height - R->szHint.base_height < max_height) { 728 if (height && height - szHint.base_height < max_height)
729 {
592 R->szHint.height = height; 730 szHint.height = height;
593 R->TermWin.height = height - R->szHint.base_height; 731 TermWin.height = height - szHint.base_height;
594 } else { 732 }
733 else
734 {
595 MIN_IT(R->TermWin.height, max_height); 735 MIN_IT (TermWin.height, max_height);
596 R->szHint.height = R->szHint.base_height + R->TermWin.height; 736 szHint.height = szHint.base_height + TermWin.height;
597 } 737 }
598 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 738 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
599 R->window_sb_x = R->szHint.width - sb_w; 739 window_sb_x = szHint.width - sb_w;
600 740
601 if (recalc_x) 741 if (recalc_x)
602 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 742 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
603 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 743 - szHint.width - 2 * TermWin.ext_bwidth);
604 if (recalc_y) 744 if (recalc_y)
605 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 745 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
606 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 746 - szHint.height - 2 * TermWin.ext_bwidth);
607 747
608 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 748 TermWin.ncol = TermWin.width / TermWin.fwidth;
609 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 749 TermWin.nrow = TermWin.height / TermWin.fheight;
610 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 750 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
611 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 751 TermWin.ncol, TermWin.nrow, szHint.width,
612 R->szHint.height)); 752 szHint.height));
613 return; 753 return;
614} 754}
615 755
616/*----------------------------------------------------------------------*/ 756/*----------------------------------------------------------------------*/
617/* 757/*
618 * Tell the teletype handler what size the window is. 758 * Tell the teletype handler what size the window is.
619 * Called after a window size change. 759 * Called after a window size change.
620 */ 760 */
621void 761void
622rxvt_term::tt_winch () 762rxvt_term::tt_winch ()
623{ 763{
624 struct winsize ws; 764 struct winsize ws;
625 765
626 if (cmd_fd < 0) 766 if (cmd_fd < 0)
627 return; 767 return;
628 768
629 ws.ws_col = TermWin.ncol; 769 ws.ws_col = TermWin.ncol;
… …
631 ws.ws_xpixel = ws.ws_ypixel = 0; 771 ws.ws_xpixel = ws.ws_ypixel = 0;
632#ifndef DEBUG_SIZE 772#ifndef DEBUG_SIZE
633 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 773 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
634#else 774#else
635 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 775 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
636 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 776 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
637# ifdef SIGWINCH 777# ifdef SIGWINCH
638 else if (cmd_pid) /* force through to the command */ 778 else if (cmd_pid) /* force through to the command */
639 kill (cmd_pid, SIGWINCH); 779 kill (cmd_pid, SIGWINCH);
640# endif 780# endif
641#endif 781#endif
642} 782}
643 783
644/*----------------------------------------------------------------------*/ 784/*----------------------------------------------------------------------*/
645/* rxvt_change_font() - Switch to a new font */ 785/* rxvt_change_font () - Switch to a new font */
646/* 786/*
647 * init = 1 - initialize 787 * init = 1 - initialize
648 * 788 *
649 * fontname == FONT_UP - switch to bigger font 789 * fontname == FONT_UP - switch to bigger font
650 * fontname == FONT_DN - switch to smaller font 790 * fontname == FONT_DN - switch to smaller font
651 */ 791 */
652/* EXTPROTO */ 792bool
653void
654rxvt_change_font(pR_ int init, const char *fontname) 793rxvt_term::change_font (const char *fontname)
655{ 794{
656} 795 if (fontname == FONT_UP)
796 {
797 // TODO
798 }
799 else if (fontname == FONT_DN)
800 {
801 // TODO
802 }
803 else
804 {
805 rxvt_fontset *fs = new rxvt_fontset (this);
657 806
658/* INTPROTO */ 807 if (fs && fs->populate (fontname ? fontname : "fixed"))
659void 808 {
809 delete TermWin.fontset;
810 TermWin.fontset = fs;
811 TermWin.fwidth = fs->base_font ()->width;
812 TermWin.fheight = fs->base_font ()->height;
813 TermWin.fbase = fs->base_font ()->ascent;
814
815 if (TermWin.parent[0])
816 {
817 resize_all_windows (0, 0, 0);
818 scr_remap_chars ();
819 scr_touch (true);
820 }
821
822 return true;
823 }
824 }
825
826 return false;
827}
828
829bool
660rxvt_font_up_down(pR_ int n, int direction) 830rxvt_term::font_up_down (int n, int direction)
661{ 831{
832 return false;
662} 833}
663 834
664/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
665/*----------------------------------------------------------------------*/ 836/*----------------------------------------------------------------------*/
666/* xterm sequences - title, iconName, color (exptl) */ 837/* xterm sequences - title, iconName, color (exptl) */
667/* EXTPROTO */
668void 838void
669rxvt_set_title(pR_ const char *str) 839rxvt_term::set_title (const char *str)
670{ 840{
671#ifndef SMART_WINDOW_TITLE 841#ifndef SMART_WINDOW_TITLE
672 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 842 XStoreName (display->display, TermWin.parent[0], str);
673#else 843#else
674 char *name; 844 char *name;
675 845
676 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 846 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
677 name = NULL; 847 name = NULL;
678 if (name == NULL || STRCMP(name, str)) 848 if (name == NULL || STRCMP (name, str))
679 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 849 XStoreName (display->display, TermWin.parent[0], str);
680 if (name) 850 if (name)
681 XFree(name); 851 XFree (name);
682#endif 852#endif
683} 853}
684 854
685/* EXTPROTO */
686void 855void
687rxvt_set_iconName(pR_ const char *str) 856rxvt_term::set_iconName (const char *str)
688{ 857{
689#ifndef SMART_WINDOW_TITLE 858#ifndef SMART_WINDOW_TITLE
690 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 859 XSetIconName (display->display, TermWin.parent[0], str);
691#else 860#else
692 char *name; 861 char *name;
693 862
694 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 863 if (XGetIconName (display->display, TermWin.parent[0], &name))
695 name = NULL; 864 name = NULL;
696 if (name == NULL || STRCMP(name, str)) 865 if (name == NULL || STRCMP (name, str))
697 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 866 XSetIconName (display->display, TermWin.parent[0], str);
698 if (name) 867 if (name)
699 XFree(name); 868 XFree (name);
700#endif 869#endif
701} 870}
702 871
703#ifdef XTERM_COLOR_CHANGE 872#ifdef XTERM_COLOR_CHANGE
704/* EXTPROTO */
705void 873void
706rxvt_set_window_color(pR_ int idx, const char *color) 874rxvt_term::set_window_color (int idx, const char *color)
707{ 875{
708 rxvt_color xcol; 876 rxvt_color xcol;
709 int i; 877 int i;
710 878
711 if (color == NULL || *color == '\0') 879 if (color == NULL || *color == '\0')
712 return; 880 return;
713 881
714/* handle color aliases */ 882 /* handle color aliases */
715 if (isdigit(*color)) { 883 if (isdigit (*color))
884 {
716 i = atoi(color); 885 i = atoi (color);
886 if (i >= 8 && i <= 15)
717 if (i >= 8 && i <= 15) { /* bright colors */ 887 { /* bright colors */
718 i -= 8; 888 i -= 8;
719# ifndef NO_BRIGHTCOLOR 889# ifndef NO_BRIGHTCOLOR
720 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 890 PixColors[idx] = PixColors[minBrightCOLOR + i];
721 SET_PIXCOLOR(R, idx); 891 SET_PIXCOLOR (idx);
722 goto Done; 892 goto Done;
723# endif 893# endif
894
724 } 895 }
725 if (i >= 0 && i <= 7) { /* normal colors */ 896 if (i >= 0 && i <= 7)
897 { /* normal colors */
726 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 898 PixColors[idx] = PixColors[minCOLOR + i];
727 SET_PIXCOLOR(R, idx); 899 SET_PIXCOLOR (idx);
728 goto Done; 900 goto Done;
729 } 901 }
730 } 902 }
731 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 903 if (!rXParseAllocColor (& xcol, color))
732 return; 904 return;
733/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 905 /* XStoreColor (display->display, XCMAP, XColor*); */
734 906
735/* 907 /*
736 * FIXME: should free colors here, but no idea how to do it so instead, 908 * FIXME: should free colors here, but no idea how to do it so instead,
737 * so just keep gobbling up the colormap 909 * so just keep gobbling up the colormap
738 */ 910 */
739# if 0 911# if 0
740 for (i = Color_Black; i <= Color_White; i++) 912 for (i = Color_Black; i <= Color_White; i++)
741 if (R->PixColors[idx] == R->PixColors[i]) 913 if (PixColors[idx] == PixColors[i])
742 break; 914 break;
743 if (i > Color_White) { 915 if (i > Color_White)
916 {
744 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 917 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
745 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 918 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
746 DisplayPlanes(R->Xdisplay, Xscreen)); 919 DisplayPlanes (display->display, display->screen));
747 } 920 }
748# endif 921# endif
749 922
750 R->PixColors[idx] = xcol; 923 PixColors[idx] = xcol;
751 SET_PIXCOLOR(R, idx); 924 SET_PIXCOLOR (idx);
752 925
753/* XSetWindowAttributes attr; */ 926 /* XSetWindowAttributes attr; */
754/* Cursor cursor; */ 927 /* Cursor cursor; */
755 Done: 928Done:
756 if (idx == Color_bg && !(R->Options & Opt_transparent)) 929 if (idx == Color_bg && ! (Options & Opt_transparent))
757 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 930 XSetWindowBackground (display->display, TermWin.vt,
758 R->PixColors[Color_bg]); 931 PixColors[Color_bg]);
759 932
760/* handle Color_BD, scrollbar background, etc. */ 933 /* handle Color_BD, scrollbar background, etc. */
761 934
762 rxvt_set_colorfgbg(aR); 935 set_colorfgbg ();
763 rxvt_recolour_cursor(aR); 936 recolour_cursor ();
764/* the only reasonable way to enforce a clean update */ 937 /* the only reasonable way to enforce a clean update */
765 rxvt_scr_poweron(aR); 938 scr_poweron ();
766} 939}
767 940
768#else 941#else
769# define rxvt_set_window_color(aR_ idx,color) ((void)0) 942# define set_window_color (idx,color) ((void)0)
770#endif /* XTERM_COLOR_CHANGE */ 943#endif /* XTERM_COLOR_CHANGE */
771 944
772/* EXTPROTO */
773void 945void
774rxvt_recolour_cursor(pR) 946rxvt_term::recolour_cursor ()
775{ 947{
776 rxvt_color xcol[2];
777
778#if TODO 948#if TODO
949 rxvt_color xcol[2];
950
779 xcol[0] = R->PixColors[Color_pointer]; 951 xcol[0] = PixColors[Color_pointer];
780 xcol[1] = R->PixColors[Color_bg]; 952 xcol[1] = PixColors[Color_bg];
781 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 953 XQueryColors (display->display, XCMAP, xcol, 2);
782 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 954 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
783#endif 955#endif
784} 956}
785 957
786/*----------------------------------------------------------------------*/ 958/*----------------------------------------------------------------------*/
787/* 959/*
788 * find if fg/bg matches any of the normal (low-intensity) colors 960 * find if fg/bg matches any of the normal (low-intensity) colors
789 */ 961 */
790/* INTPROTO */
791void 962void
792rxvt_set_colorfgbg(pR) 963rxvt_term::set_colorfgbg ()
793{ 964{
794 unsigned int i; 965 unsigned int i;
795 const char *xpmb = "\0"; 966 const char *xpmb = "\0";
796 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 967 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
797 968
798 R->env_colorfgbg = 969 env_colorfgbg =
799 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 970 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
800 STRCPY(fstr, "default"); 971 STRCPY (fstr, "default");
801 STRCPY(bstr, "default"); 972 STRCPY (bstr, "default");
802 for (i = Color_Black; i <= Color_White; i++) 973 for (i = Color_Black; i <= Color_White; i++)
803 if (R->PixColors[Color_fg] == R->PixColors[i]) { 974 if (PixColors[Color_fg] == PixColors[i])
975 {
804 sprintf(fstr, "%d", (i - Color_Black)); 976 sprintf (fstr, "%d", (i - Color_Black));
805 break; 977 break;
806 } 978 }
807 for (i = Color_Black; i <= Color_White; i++) 979 for (i = Color_Black; i <= Color_White; i++)
808 if (R->PixColors[Color_bg] == R->PixColors[i]) { 980 if (PixColors[Color_bg] == PixColors[i])
981 {
809 sprintf(bstr, "%d", (i - Color_Black)); 982 sprintf (bstr, "%d", (i - Color_Black));
810#ifdef XPM_BACKGROUND 983#ifdef XPM_BACKGROUND
811 xpmb = "default;"; 984 xpmb = "default;";
812#endif 985#endif
813 break; 986 break;
814 } 987 }
988
815 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 989 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
816 putenv(R->env_colorfgbg);
817 990
818#ifndef NO_BRIGHTCOLOR 991#ifndef NO_BRIGHTCOLOR
819 R->colorfgbg = DEFAULT_RSTYLE; 992 colorfgbg = DEFAULT_RSTYLE;
820 for (i = minCOLOR; i <= maxCOLOR; i++) { 993 for (i = minCOLOR; i <= maxCOLOR; i++)
994 {
821 if (R->PixColors[Color_fg] == R->PixColors[i]) 995 if (PixColors[Color_fg] == PixColors[i])
822 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 996 colorfgbg = SET_FGCOLOR (colorfgbg, i);
823 if (R->PixColors[Color_bg] == R->PixColors[i]) 997 if (PixColors[Color_bg] == PixColors[i])
824 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 998 colorfgbg = SET_BGCOLOR (colorfgbg, i);
825 } 999 }
826#endif 1000#endif
827} 1001}
828 1002
829/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
830/* 1004/*
831 * Colour determination for low colour displays, routine from 1005 * Colour determination for low colour displays, routine from
832 * Hans de Goede <hans@highrise.nl> 1006 * Hans de Goede <hans@highrise.nl>
833 */ 1007 */
834 1008
835/* EXTPROTO */
836int 1009int
837rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 1010rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
838{ 1011{
839 screen_in_out->set(aR_ colour);
840
841 if (!screen_in_out->set(aR_ colour)) { 1012 if (!screen_in_out->set (display, colour))
1013 {
842 rxvt_print_error("can't allocate colour: %s", colour); 1014 rxvt_print_error ("can't allocate colour: %s", colour);
843 return false; 1015 return false;
844 } 1016 }
845 1017
846 return true; 1018 return true;
847} 1019}
848 1020
849/* -------------------------------------------------------------------- * 1021/* -------------------------------------------------------------------- *
850 * - WINDOW RESIZING - * 1022 * - WINDOW RESIZING - *
851 * -------------------------------------------------------------------- */ 1023 * -------------------------------------------------------------------- */
852/* EXTPROTO */
853void 1024void
854rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 1025rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
855 int ignoreparent)
856{ 1026{
857 int fix_screen; 1027 int fix_screen;
858 1028
859#ifdef SMART_RESIZE 1029#ifdef SMART_RESIZE
860 int old_width = R->szHint.width, old_height = R->szHint.height; 1030 int old_width = szHint.width, old_height = szHint.height;
861#endif 1031#endif
862 1032
863 rxvt_window_calc(aR_ width, height); 1033 window_calc (width, height);
864 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 1034 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
865 if (!ignoreparent) { 1035 if (!ignoreparent)
1036 {
866#ifdef SMART_RESIZE 1037#ifdef SMART_RESIZE
867/* 1038 /*
868 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1039 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
869 * reposition window on resize depending on placement on screen 1040 * reposition window on resize depending on placement on screen
870 */ 1041 */
871 int x, y, x1, y1; 1042 int x, y, x1, y1;
872 int dx, dy; 1043 int dx, dy;
873 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1044 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
874 Window unused_cr; 1045 Window unused_cr;
875 1046
876 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1047 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
877 0, 0, &x, &y, &unused_cr); 1048 0, 0, &x, &y, &unused_cr);
878 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 1049 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
879 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1050 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
880 /* 1051 /*
881 * if Xroot isn't the parent window, a WM will probably have offset 1052 * if display->root isn't the parent window, a WM will probably have offset
882 * our position for handles and decorations. Counter it 1053 * our position for handles and decorations. Counter it
883 */ 1054 */
884 if (x1 != x || y1 != y) { 1055 if (x1 != x || y1 != y)
1056 {
885 x -= x1; 1057 x -= x1;
886 y -= y1; 1058 y -= y1;
887 } 1059 }
888 1060
889 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 1061 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
890 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 1062 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
891 dx = old_width - R->szHint.width; 1063 dx = old_width - szHint.width;
892 dy = old_height - R->szHint.height; 1064 dy = old_height - szHint.height;
893 1065
894 /* Check position of the center of the window */ 1066 /* Check position of the center of the window */
895 if (x < x1) /* left half */ 1067 if (x < x1) /* left half */
896 dx = 0; 1068 dx = 0;
897 else if (x == x1) /* exact center */ 1069 else if (x == x1) /* exact center */
898 dx /= 2; 1070 dx /= 2;
899 if (y < y1) /* top half */ 1071 if (y < y1) /* top half */
900 dy = 0; 1072 dy = 0;
901 else if (y == y1) /* exact center */ 1073 else if (y == y1) /* exact center */
902 dy /= 2; 1074 dy /= 2;
903 1075
904 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1076 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
905 R->szHint.width, R->szHint.height); 1077 szHint.width, szHint.height);
906#else 1078#else
907 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1079 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
908 R->szHint.height); 1080 szHint.height);
909#endif 1081#endif
910 }
911 1082
1083 }
1084
912 fix_screen = (R->TermWin.ncol != R->prev_ncol 1085 fix_screen = (TermWin.ncol != prev_ncol
913 || R->TermWin.nrow != R->prev_nrow); 1086 || TermWin.nrow != prev_nrow);
1087
914 if (fix_screen || width != R->old_width || height != R->old_height) { 1088 if (fix_screen || width != old_width || height != old_height)
1089 {
915 if (scrollbar_visible(R)) { 1090 if (scrollbar_visible ())
1091 {
916 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1092 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
917 0, scrollbar_TotalWidth(), R->szHint.height); 1093 0, scrollbar_TotalWidth (), szHint.height);
918 rxvt_Resize_scrollBar(aR); 1094 resize_scrollbar ();
919 } 1095 }
1096
920 if (menubar_visible(R)) 1097 if (menubar_visible ())
921 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1098 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
922 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1099 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1100
923 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1101 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
924 R->window_vt_y, TermWin_TotalWidth(), 1102 window_vt_y, TermWin_TotalWidth (),
925 TermWin_TotalHeight()); 1103 TermWin_TotalHeight ());
926#ifdef RXVT_GRAPHICS 1104 scr_clear (height != old_height);
927 if (R->old_height)
928 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
929 R->old_height - R->szHint.base_height);
930#endif
931 rxvt_scr_clear(aR);
932#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
933 rxvt_resize_pixmap(aR); 1106 resize_pixmap ();
934#endif 1107#endif
935 }
936 1108
1109 }
1110
937 if (fix_screen || R->old_height == 0) { 1111 if (fix_screen || old_height == 0)
1112 {
938 int curr_screen = -1; 1113 int curr_screen = -1;
939 uint16_t old_ncol = R->prev_ncol; 1114 int old_ncol = prev_ncol;
940 1115
941 /* scr_reset only works on the primary screen */ 1116 /* scr_reset only works on the primary screen */
942 if (R->old_height) /* this is not the first time through */ 1117 if (old_height) /* this is not the first time through */
1118 {
1119 unsigned int ncol = TermWin.ncol;
1120 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
943 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1121 curr_screen = scr_change_screen (PRIMARY);
944 rxvt_scr_reset(aR); 1122 TermWin.ncol = ncol;
945 if (curr_screen >= 0) { /* this is not the first time through */
946 rxvt_scr_change_screen(aR_ curr_screen);
947 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
948 } 1123 }
949 }
950 1124
1125 scr_reset ();
1126
1127 if (curr_screen >= 0) /* this is not the first time through */
1128 {
1129 scr_change_screen (curr_screen);
1130 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1131 }
1132 }
1133
951 R->old_width = R->szHint.width; 1134 old_width = szHint.width;
952 R->old_height = R->szHint.height; 1135 old_height = szHint.height;
953 1136
954#ifdef USE_XIM 1137#ifdef USE_XIM
955 rxvt_IMSetStatusPosition(aR); 1138 IMSetStatusPosition ();
956#endif 1139#endif
957} 1140}
958 1141
959/* 1142/*
960 * Set the width/height of the vt window in characters. Units are pixels. 1143 * Set the width/height of the vt window in characters. Units are pixels.
961 * good for toggling 80/132 columns 1144 * good for toggling 80/132 columns
962 */ 1145 */
963/* EXTPROTO */
964void 1146void
965rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1147rxvt_term::set_widthheight (unsigned int width, unsigned int height)
966{ 1148{
967 XWindowAttributes wattr; 1149 XWindowAttributes wattr;
968 1150
969 if (width == 0 || height == 0) { 1151 if (width == 0 || height == 0)
1152 {
970 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1153 XGetWindowAttributes (display->display, display->root, &wattr);
971 if (width == 0) 1154 if (width == 0)
972 width = wattr.width - R->szHint.base_width; 1155 width = wattr.width - szHint.base_width;
973 if (height == 0) 1156 if (height == 0)
974 height = wattr.height - R->szHint.base_height; 1157 height = wattr.height - szHint.base_height;
975 } 1158 }
976 if (width != R->TermWin.width || height != R->TermWin.height) { 1159 if (width != TermWin.width || height != TermWin.height)
1160 {
977 width += R->szHint.base_width; 1161 width += szHint.base_width;
978 height += R->szHint.base_height; 1162 height += szHint.base_height;
979 rxvt_resize_all_windows(aR_ width, height, 0); 1163 resize_all_windows (width, height, 0);
980 } 1164 }
981} 1165}
982 1166
983/* -------------------------------------------------------------------- * 1167/* -------------------------------------------------------------------- *
984 * - X INPUT METHOD ROUTINES - * 1168 * - X INPUT METHOD ROUTINES - *
985 * -------------------------------------------------------------------- */ 1169 * -------------------------------------------------------------------- */
986#ifdef USE_XIM 1170#ifdef USE_XIM
987/* INTPROTO */ 1171
988void 1172void
989rxvt_setSize(pR_ XRectangle * size) 1173rxvt_term::im_set_size (XRectangle *size)
990{ 1174{
991 size->x = R->TermWin.int_bwidth; 1175 size->x = TermWin.int_bwidth;
992 size->y = R->TermWin.int_bwidth; 1176 size->y = TermWin.int_bwidth;
993 size->width = Width2Pixel(R->TermWin.ncol); 1177 size->width = Width2Pixel (TermWin.ncol);
994 size->height = Height2Pixel(R->TermWin.nrow); 1178 size->height = Height2Pixel (TermWin.nrow);
995} 1179}
996 1180
997/* INTPROTO */
998void 1181void
999rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1182rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1000{ 1183{
1001 *fg = R->PixColors[Color_fg]; 1184 *fg = PixColors[Color_fg];
1002 *bg = R->PixColors[Color_bg]; 1185 *bg = PixColors[Color_bg];
1003} 1186}
1004 1187
1005/* Checking whether input method is running. */ 1188/* Checking whether input method is running. */
1006/* INTPROTO */
1007Bool 1189bool
1008rxvt_IMisRunning(pR) 1190rxvt_term::IMisRunning ()
1009{ 1191{
1010 char *p; 1192 char *p;
1011 Atom atom; 1193 Atom atom;
1012 Window win; 1194 Window win;
1013 char server[IMBUFSIZ]; 1195 char server[IMBUFSIZ];
1014 1196
1015/* get current locale modifier */ 1197 /* get current locale modifier */
1016 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1198 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1199 {
1017 STRCPY(server, "@server="); 1200 STRCPY (server, "@server=");
1018 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1201 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1019 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1202 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1020 *p = '\0'; 1203 *p = '\0';
1021 1204
1022 atom = XInternAtom(R->Xdisplay, server, False); 1205 atom = XInternAtom (display->display, server, False);
1023 win = XGetSelectionOwner(R->Xdisplay, atom); 1206 win = XGetSelectionOwner (display->display, atom);
1024 if (win != None) 1207 if (win != None)
1025 return True; 1208 return True;
1026 } 1209 }
1027 return False; 1210 return False;
1028} 1211}
1029 1212
1030/* EXTPROTO */
1031void 1213void
1032rxvt_IMSendSpot(pR) 1214rxvt_term::IMSendSpot ()
1033{ 1215{
1034 XPoint spot; 1216 XPoint spot;
1035 XVaNestedList preedit_attr; 1217 XVaNestedList preedit_attr;
1036 1218
1037 if (R->Input_Context == NULL 1219 if (Input_Context == NULL
1038 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1220 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1039 || !(R->event_type == KeyPress 1221 || ! (event_type == KeyPress
1040 || R->event_type == Expose 1222 || event_type == Expose
1041 || R->event_type == NoExpose 1223 || event_type == NoExpose
1042 || R->event_type == SelectionNotify 1224 || event_type == SelectionNotify
1043 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1225 || event_type == ButtonRelease || event_type == FocusIn)
1044 || !rxvt_IMisRunning(aR)) 1226 || !IMisRunning ())
1045 return; 1227 return;
1046 1228
1047 rxvt_setPosition(aR_ & spot); 1229 im_set_position (&spot);
1048 1230
1049 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1231 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1050 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1232 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1051 XFree(preedit_attr); 1233 XFree (preedit_attr);
1052} 1234}
1053 1235
1054/* EXTPROTO */
1055void 1236void
1056rxvt_setTermFontSet(pR_ int idx)
1057{
1058 char *string;
1059 long length;
1060 int success = 0;
1061
1062 if (idx < 0 || idx >= MAX_NFONTS)
1063 return;
1064}
1065
1066/* INTPROTO */
1067void
1068rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1237rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1069 XRectangle * needed_rect) 1238 XRectangle * needed_rect)
1070{ 1239{
1071 int mbh, vtx = 0; 1240 int mbh, vtx = 0;
1072 1241
1073 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1242 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1074 vtx = scrollbar_TotalWidth(); 1243 vtx = scrollbar_TotalWidth ();
1244
1075 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1245 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1076 mbh -= R->TermWin.lineSpace; 1246 mbh -= TermWin.lineSpace;
1077 1247
1078 preedit_rect->x = needed_rect->width + vtx; 1248 preedit_rect->x = needed_rect->width + vtx;
1079 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1249 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1080 1250
1081 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1251 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1082 + vtx;
1083 preedit_rect->height = Height2Pixel(1); 1252 preedit_rect->height = Height2Pixel (1);
1084 1253
1085 status_rect->x = vtx; 1254 status_rect->x = vtx;
1086 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1255 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1087 1256
1088 status_rect->width = needed_rect->width ? needed_rect->width 1257 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1089 : Width2Pixel(R->TermWin.ncol + 1);
1090 status_rect->height = Height2Pixel(1); 1258 status_rect->height = Height2Pixel (1);
1091} 1259}
1092 1260
1093/* ARGSUSED */
1094/* INTPROTO */
1095void 1261void
1096rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1262rxvt_term::im_destroy ()
1097 __attribute__ ((unused)), XPointer call_data
1098 __attribute__ ((unused)))
1099{ 1263{
1100 dR; 1264 if (Input_Context)
1101 1265 {
1266 XDestroyIC (Input_Context);
1102 R->Input_Context = NULL; 1267 Input_Context = NULL;
1103/* To avoid Segmentation Fault in C locale: Solaris only? */ 1268 }
1104 if (STRCMP(R->locale, "C"))
1105 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1106 rxvt_IMInstantiateCallback, NULL);
1107}
1108 1269
1109/* 1270 if (input_method)
1110 * X manual pages and include files don't match on some systems:
1111 * some think this is an XIDProc and others an XIMProc so we can't
1112 * use the first argument - need to update this to be nice for
1113 * both types via some sort of configure detection
1114 */
1115/* ARGSUSED */
1116/* EXTPROTO */
1117void
1118rxvt_IMInstantiateCallback(Display * unused
1119 __attribute__ ((unused)), XPointer client_data
1120 __attribute__ ((unused)), XPointer call_data
1121 __attribute__ ((unused)))
1122{
1123 dR;
1124 int i, found, had_im;
1125 const char *p;
1126 char **s;
1127 char buf[IMBUFSIZ];
1128
1129 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1130 if (R->Input_Context)
1131 return;
1132
1133 found = had_im = 0;
1134 p = R->rs[Rs_inputMethod];
1135 if (p && *p) {
1136 had_im = 1;
1137 s = rxvt_splitcommastring(p);
1138 for (i = 0; s[i]; i++) {
1139 if (*s[i]) {
1140 STRCPY(buf, "@im=");
1141 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1142 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1143 && (rxvt_IM_get_IC(aR) == True)) {
1144 found = 1;
1145 break;
1146 }
1147 }
1148 }
1149 for (i = 0; s[i]; i++)
1150 free(s[i]);
1151 free(s);
1152 } 1271 {
1153 if (found) 1272 display->put_xim (input_method);
1154 return; 1273 input_method = 0;
1155
1156/* try with XMODIFIERS env. var. */
1157 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1158 rxvt_IM_get_IC(aR);
1159 return;
1160 } 1274 }
1161
1162/* try with no modifiers base IF the user didn't specify an IM */
1163 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1164 && rxvt_IM_get_IC(aR) == True)
1165 return;
1166} 1275}
1167 1276
1168/* 1277/*
1169 * Try to open a XIM with the current modifiers, then see if we can 1278 * Try to open a XIM with the current modifiers, then see if we can
1170 * open a suitable preedit type 1279 * open a suitable preedit type
1171 */ 1280 */
1172/* INTPROTO */
1173Bool 1281bool
1174rxvt_IM_get_IC(pR) 1282rxvt_term::IM_get_IC (const char *modifiers)
1175{ 1283{
1176 int i, j, found; 1284 int i, j, found;
1177 XIM xim; 1285 XIM xim;
1178 XPoint spot; 1286 XPoint spot;
1179 XRectangle rect, status_rect, needed_rect; 1287 XRectangle rect, status_rect, needed_rect;
1180 unsigned long fg, bg; 1288 unsigned long fg, bg;
1181 const char *p; 1289 const char *p;
1182 char **s; 1290 char **s;
1183 XIMStyles *xim_styles; 1291 XIMStyles *xim_styles;
1184 XVaNestedList preedit_attr, status_attr; 1292 XVaNestedList preedit_attr, status_attr;
1185 XIMCallback ximcallback;
1186 1293
1294 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1295 return false;
1296
1187 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1297 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1188 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1298 input_method = display->get_xim (locale, modifiers);
1189 if (xim == NULL) 1299 if (input_method == NULL)
1190 return False; 1300 return false;
1191 1301
1302 xim = input_method->xim;
1303
1192 xim_styles = NULL; 1304 xim_styles = NULL;
1193 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1305 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1194 || !xim_styles || !xim_styles->count_styles) { 1306 || !xim_styles || !xim_styles->count_styles)
1195 XCloseIM(xim); 1307 {
1308 display->put_xim (input_method);
1196 return False; 1309 return false;
1197 } 1310 }
1198 1311
1199 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1312 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1200 : "OverTheSpot,OffTheSpot,Root";
1201 s = rxvt_splitcommastring(p); 1313 s = rxvt_splitcommastring (p);
1202 for (i = found = 0; !found && s[i]; i++) { 1314 for (i = found = 0; !found && s[i]; i++)
1315 {
1203 if (!STRCMP(s[i], "OverTheSpot")) 1316 if (!STRCMP (s[i], "OverTheSpot"))
1204 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1317 input_style = (XIMPreeditPosition | XIMStatusNothing);
1205 else if (!STRCMP(s[i], "OffTheSpot")) 1318 else if (!STRCMP (s[i], "OffTheSpot"))
1206 R->input_style = (XIMPreeditArea | XIMStatusArea); 1319 input_style = (XIMPreeditArea | XIMStatusArea);
1207 else if (!STRCMP(s[i], "Root")) 1320 else if (!STRCMP (s[i], "Root"))
1208 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1321 input_style = (XIMPreeditNothing | XIMStatusNothing);
1209 1322
1210 for (j = 0; j < xim_styles->count_styles; j++) 1323 for (j = 0; j < xim_styles->count_styles; j++)
1211 if (R->input_style == xim_styles->supported_styles[j]) { 1324 if (input_style == xim_styles->supported_styles[j])
1325 {
1212 found = 1; 1326 found = 1;
1327 break;
1328 }
1329 }
1330
1331 for (i = 0; s[i]; i++)
1332 free (s[i]);
1333
1334 free (s);
1335 XFree (xim_styles);
1336
1337 if (!found)
1338 {
1339 display->put_xim (input_method);
1340 return false;
1341 }
1342
1343 preedit_attr = status_attr = NULL;
1344
1345 if (input_style & XIMPreeditPosition)
1346 {
1347 im_set_size (&rect);
1348 im_set_position (&spot);
1349 im_set_color (&fg, &bg);
1350
1351 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1352 XNSpotLocation, &spot,
1353 XNForeground, fg, XNBackground, bg,
1354 //XNFontSet, TermWin.fontset,
1355 NULL);
1356 }
1357 else if (input_style & XIMPreeditArea)
1358 {
1359 im_set_color (&fg, &bg);
1360
1361 /*
1362 * The necessary width of preedit area is unknown
1363 * until create input context.
1364 */
1365 needed_rect.width = 0;
1366
1367 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1368
1369 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1370 XNForeground, fg, XNBackground, bg,
1371 //XNFontSet, TermWin.fontset,
1372 NULL);
1373 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1374 XNForeground, fg, XNBackground, bg,
1375 //XNFontSet, TermWin.fontset,
1376 NULL);
1377 }
1378
1379 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1380 XNClientWindow, TermWin.parent[0],
1381 XNFocusWindow, TermWin.parent[0],
1382 preedit_attr ? XNPreeditAttributes : NULL,
1383 preedit_attr,
1384 status_attr ? XNStatusAttributes : NULL,
1385 status_attr, NULL);
1386 if (preedit_attr) XFree (preedit_attr);
1387 if (status_attr) XFree (status_attr);
1388
1389 if (Input_Context == NULL)
1390 {
1391 rxvt_print_error ("failed to create input context");
1392 display->put_xim (input_method);
1393 return false;
1394 }
1395
1396 if (input_style & XIMPreeditArea)
1397 IMSetStatusPosition ();
1398
1399 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1400 return true;
1401}
1402
1403void
1404rxvt_term::im_cb ()
1405{
1406 int i, found, had_im;
1407 const char *p;
1408 char **s;
1409 char buf[IMBUFSIZ];
1410
1411 im_destroy ();
1412
1413 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1414 if (Input_Context)
1415 return;
1416
1417#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1418 if (rs[Rs_imLocale])
1419 SET_LOCALE (rs[Rs_imLocale]);
1420#endif
1421
1422 p = rs[Rs_inputMethod];
1423 if (p && *p)
1424 {
1425 bool found = false;
1426
1427 s = rxvt_splitcommastring (p);
1428 for (i = 0; s[i]; i++)
1429 {
1430 if (*s[i])
1431 {
1432 STRCPY (buf, "@im=");
1433 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1434 if (IM_get_IC (buf))
1435 {
1436 found = true;
1213 break; 1437 break;
1438 }
1214 } 1439 }
1215 } 1440 }
1216 for (i = 0; s[i]; i++) 1441 for (i = 0; s[i]; i++)
1217 free(s[i]); 1442 free (s[i]);
1218 free(s); 1443 free (s);
1219 XFree(xim_styles);
1220 1444
1221 if (!found) { 1445 if (found)
1222 XCloseIM(xim); 1446 goto done;
1223 return False;
1224 } 1447 }
1225 1448
1226 ximcallback.callback = rxvt_IMDestroyCallback; 1449 /* try with XMODIFIERS env. var. */
1450 if (IM_get_IC (""))
1451 goto done;
1227 1452
1228/* XXX: not sure why we need this (as well as IC one below) */ 1453 /* try with no modifiers base IF the user didn't specify an IM */
1229 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1454 if (IM_get_IC ("@im=none"))
1455 goto done;
1230 1456
1231 preedit_attr = status_attr = NULL; 1457done:
1232 1458#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1233 if (R->input_style & XIMPreeditPosition) { 1459 if (rs[Rs_imLocale])
1234 rxvt_setSize(aR_ & rect); 1460 SET_LOCALE (locale);
1235 rxvt_setPosition(aR_ & spot); 1461#endif
1236 rxvt_setColor(aR_ & fg, &bg);
1237
1238 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1239 XNSpotLocation, &spot,
1240 XNForeground, fg, XNBackground, bg,
1241 //XNFontSet, R->TermWin.fontset,
1242 NULL);
1243 } else if (R->input_style & XIMPreeditArea) {
1244 rxvt_setColor(aR_ & fg, &bg);
1245
1246 /*
1247 * The necessary width of preedit area is unknown
1248 * until create input context.
1249 */
1250 needed_rect.width = 0;
1251
1252 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1253
1254 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1255 XNForeground, fg, XNBackground, bg,
1256 //XNFontSet, R->TermWin.fontset,
1257 NULL);
1258 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1259 XNForeground, fg, XNBackground, bg,
1260 //XNFontSet, R->TermWin.fontset,
1261 NULL);
1262 }
1263 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1264 XNClientWindow, R->TermWin.parent[0],
1265 XNFocusWindow, R->TermWin.parent[0],
1266 XNDestroyCallback, &ximcallback,
1267 preedit_attr ? XNPreeditAttributes : NULL,
1268 preedit_attr,
1269 status_attr ? XNStatusAttributes : NULL,
1270 status_attr, NULL);
1271 if (preedit_attr)
1272 XFree(preedit_attr);
1273 if (status_attr)
1274 XFree(status_attr);
1275 if (R->Input_Context == NULL) {
1276 rxvt_print_error("failed to create input context");
1277 XCloseIM(xim);
1278 return False;
1279 }
1280 if (R->input_style & XIMPreeditArea)
1281 rxvt_IMSetStatusPosition(aR);
1282 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1283 return True;
1284} 1462}
1285 1463
1286/* EXTPROTO */
1287void 1464void
1288rxvt_IMSetStatusPosition(pR) 1465rxvt_term::IMSetStatusPosition ()
1289{ 1466{
1290 XRectangle preedit_rect, status_rect, *needed_rect; 1467 XRectangle preedit_rect, status_rect, *needed_rect;
1291 XVaNestedList preedit_attr, status_attr; 1468 XVaNestedList preedit_attr, status_attr;
1292 1469
1293 if (R->Input_Context == NULL 1470 if (Input_Context == NULL
1294 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1471 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1295 || !rxvt_IMisRunning(aR)) 1472 || !IMisRunning ())
1296 return; 1473 return;
1297 1474
1298/* Getting the necessary width of preedit area */ 1475 /* Getting the necessary width of preedit area */
1299 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1476 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1300 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1477 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1301 XFree(status_attr); 1478 XFree (status_attr);
1302 1479
1303 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1480 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1304 1481
1305 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1482 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1306 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1483 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1307 1484
1308 XSetICValues(R->Input_Context, 1485 XSetICValues (Input_Context,
1309 XNPreeditAttributes, preedit_attr, 1486 XNPreeditAttributes, preedit_attr,
1310 XNStatusAttributes, status_attr, NULL); 1487 XNStatusAttributes, status_attr, NULL);
1311 1488
1312 XFree(preedit_attr); 1489 XFree (preedit_attr);
1313 XFree(status_attr); 1490 XFree (status_attr);
1314} 1491}
1315#endif /* USE_XIM */ 1492#endif /* USE_XIM */
1316 1493
1317/*----------------------------------------------------------------------*/ 1494/*----------------------------------------------------------------------*/
1318rxvt_t rxvt_current_term; 1495rxvt_t rxvt_current_term;

Diff Legend

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