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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.33 by pcg, Fri Feb 13 13:28:17 2004 UTC

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

Diff Legend

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