[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.76 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC

…		…
51	static char curlocale[128];	51	static char curlocale[128];
52		52
53	bool	53	bool
54	rxvt_set_locale (const char *locale)	54	rxvt_set_locale (const char *locale)
55	{	55	{
56	if (!locale \|\| !STRNCMP (locale, curlocale, 128))	56	if (!locale \|\| !strncmp (locale, curlocale, 128))
57	return false;	57	return false;
58		58
59	STRNCPY (curlocale, locale, 128);	59	strncpy (curlocale, locale, 128);
60	setlocale (LC_CTYPE, curlocale);	60	setlocale (LC_CTYPE, curlocale);
61	return true;	61	return true;
62	}	62	}
63		63
64	#if ENABLE_COMBINING	64	#if ENABLE_COMBINING
…		…
128	void *	128	void *
129	rxvt_term::operator new (size_t s)	129	rxvt_term::operator new (size_t s)
130	{	130	{
131	void *p = malloc (s);	131	void *p = malloc (s);
132		132
133	MEMSET (p, 0, s);	133	memset (p, 0, s);
134	return p;	134	return p;
135	}	135	}
136		136
137	void	137	void
138	rxvt_term::operator delete (void *p, size_t s)	138	rxvt_term::operator delete (void *p, size_t s)
…		…
140	free (p);	140	free (p);
141	}	141	}
142		142
143	rxvt_term::rxvt_term ()	143	rxvt_term::rxvt_term ()
144	:	144	:
		145	#if TRANSPARENT
145	rootwin_ev (this, &rxvt_term::rootwin_cb),	146	rootwin_ev (this, &rxvt_term::rootwin_cb),
		147	#endif
		148	#ifdef HAVE_SCROLLBARS
		149	scrollbar_ev (this, &rxvt_term::x_cb),
		150	#endif
		151	#ifdef MENUBAR
		152	menubar_ev (this, &rxvt_term::x_cb),
		153	#endif
		154	#ifdef CURSOR_BLINK
		155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
		156	#endif
		157	#ifdef TEXT_BLINK
		158	text_blink_ev (this, &rxvt_term::text_blink_cb),
		159	#endif
		160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
		162	#endif
		163	#ifdef SELECTION_SCROLLING
		164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
		165	#endif
		166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
		168	#endif
		169	#ifdef POINTER_BLANK
		170	pointer_ev (this, &rxvt_term::pointer_cb),
		171	#endif
		172	#ifdef USE_XIM
		173	im_ev (this, &rxvt_term::im_cb),
		174	#endif
146	termwin_ev (this, &rxvt_term::x_cb),	175	termwin_ev (this, &rxvt_term::x_cb),
147	vt_ev (this, &rxvt_term::x_cb),	176	vt_ev (this, &rxvt_term::x_cb),
148	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif
151	#ifdef MENUBAR
152	menubar_ev (this, &rxvt_term::x_cb),
153	#endif
154	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156	#endif
157	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),
159	#endif
160	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162	#endif
163	#ifdef SELECTION_SCROLLING
164	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165	#endif
166	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168	#endif
169	#ifdef POINTER_BLANK
170	pointer_ev (this, &rxvt_term::pointer_cb),
171	#endif
172	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),
174	#endif
175	check_ev (this, &rxvt_term::check_cb),	177	check_ev (this, &rxvt_term::check_cb),
176	flush_ev (this, &rxvt_term::flush_cb),	178	flush_ev (this, &rxvt_term::flush_cb),
177	destroy_ev (this, &rxvt_term::destroy_cb),	179	destroy_ev (this, &rxvt_term::destroy_cb),
178	pty_ev (this, &rxvt_term::pty_cb),	180	pty_ev (this, &rxvt_term::pty_cb),
179	incr_ev (this, &rxvt_term::incr_cb)	181	incr_ev (this, &rxvt_term::incr_cb)
…		…
185		187
186	rxvt_term::~rxvt_term ()	188	rxvt_term::~rxvt_term ()
187	{	189	{
188	termlist.erase (find (termlist.begin (), termlist.end(), this));	190	termlist.erase (find (termlist.begin (), termlist.end(), this));
189		191
190	if (cmd_fd >= 0)	192	if (cmd_pid)
191	close (cmd_fd);	193	kill (-cmd_pid, SIGHUP);
192		194
193	#ifndef NO_SETOWNER_TTYDEV	195	pty.put ();
194	privileged_ttydev (RESTORE);	196
195	#endif
196	#ifdef UTMP_SUPPORT	197	#ifdef UTMP_SUPPORT
197	privileged_utmp (RESTORE);	198	privileged_utmp (RESTORE);
198	#endif	199	#endif
199		200
200	delete TermWin.fontset;	201	delete TermWin.fontset;
201		202
202	if (display)	203	if (display)
203	{	204	{
204	selection_clear ();	205	selection_clear ();
205		206
		207	#ifdef USE_XIM
		208	im_destroy ();
		209	#endif
206	#ifdef MENUBAR	210	#ifdef MENUBAR
207	if (menubarGC) XFreeGC (display->display, menubarGC);	211	if (menubarGC) XFreeGC (display->display, menubarGC);
208	#endif	212	#endif
209	#ifdef XTERM_SCROLLBAR	213	#ifdef XTERM_SCROLLBAR
210	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);	214	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
211	if (ShadowGC) XFreeGC (display->display, ShadowGC);	215	if (ShadowGC) XFreeGC (display->display, ShadowGC);
212	#endif	216	#endif
…		…
243	XDestroyWindow (display->display, TermWin.parent[0]);	247	XDestroyWindow (display->display, TermWin.parent[0]);
244	}	248	}
245		249
246	// TODO: free pixcolours, colours should become part of rxvt_display	250	// TODO: free pixcolours, colours should become part of rxvt_display
247		251
248	delete PixColorsFocused;	252	delete pix_colors_focused;
249	#ifdef OFF_FOCUS_FADING	253	#ifdef OFF_FOCUS_FADING
250	delete PixColorsUnFocused;	254	delete pix_colors_unfocused;
251	#endif	255	#endif
252		256
253	displays.put (display);	257	displays.put (display);
254		258
255	scr_release ();	259	scr_release ();
…		…
274	}	278	}
275		279
276	void	280	void
277	rxvt_term::destroy ()	281	rxvt_term::destroy ()
278	{	282	{
		283	if (destroy_ev.active)
		284	return;
		285
		286	#if ENABLE_OVERLAY
		287	scr_overlay_off ();
		288	#endif
		289
279	if (display)	290	if (display)
280	{	291	{
		292	#if USE_XIM
		293	im_ev.stop (display);
		294	#endif
		295	#if HAVE_SCROLLBARS
		296	scrollbar_ev.stop (display);
		297	#endif
		298	#if MENUBAR
		299	menubar_ev.stop (display);
		300	#endif
		301	#if TRANSPARENT
281	rootwin_ev.stop (display);	302	rootwin_ev.stop (display);
		303	#endif
		304	incr_ev.stop ();
282	termwin_ev.stop (display);	305	termwin_ev.stop (display);
283	vt_ev.stop (display);	306	vt_ev.stop (display);
284	#ifdef USE_XIM
285	im_destroy ();
286	im_ev.stop (display);
287	#endif
288	#ifdef HAVE_SCROLLBARS
289	scrollbar_ev.stop (display);
290	#endif
291	#ifdef MENUBAR
292	menubar_ev.stop (display);
293	#endif
294	}	307	}
295		308
296	check_ev.stop ();	309	check_ev.stop ();
297	pty_ev.stop ();	310	pty_ev.stop ();
298	#ifdef CURSOR_BLINK	311	#ifdef CURSOR_BLINK
…		…
330	SET_R (this);	343	SET_R (this);
331		344
332	if (!init_vars ())	345	if (!init_vars ())
333	return false;	346	return false;
334		347
		348	init_secondary ();
		349
		350	const char **cmd_argv = init_resources (argc, argv);
		351
		352	set_locale ("");
		353
		354	#if MENUBAR_MAX
		355	menubar_read (rs[Rs_menu]);
		356	#endif
		357	#ifdef HAVE_SCROLLBARS
		358	if (options & Opt_scrollBar)
		359	scrollBar.setIdle (); /* set existence for size calculations */
		360	#endif
		361
		362	create_windows (argc, argv);
		363
		364	init_xlocale ();
		365
		366	scr_reset (); /* initialize screen */
		367
		368	#if 0
		369	XSynchronize (display->display, True);
		370	#endif
		371
		372	#ifdef HAVE_SCROLLBARS
		373	if (options & Opt_scrollBar)
		374	resize_scrollbar (); /* create and map scrollbar */
		375	#endif
		376	#if (MENUBAR_MAX)
		377	if (menubar_visible ())
		378	XMapWindow (display->display, menuBar.win);
		379	#endif
		380	#ifdef TRANSPARENT
		381	if (options & Opt_transparent)
		382	{
		383	XSelectInput (display->display, display->root, PropertyChangeMask);
		384	check_our_parents ();
		385	rootwin_ev.start (display, display->root);
		386	}
		387	#endif
		388
		389	XMapWindow (display->display, TermWin.vt);
		390	XMapWindow (display->display, TermWin.parent[0]);
		391
		392	init_command (cmd_argv);
		393
		394	pty_ev.start (pty.pty, EVENT_READ);
		395
		396	check_ev.start ();
		397
		398	return true;
		399	}
		400
		401	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);
		402
		403	void
		404	rxvt_init ()
		405	{
		406	/* install exit handler for cleanup */
		407	#if 0
		408	#ifdef HAVE_ATEXIT
		409	atexit (rxvt_clean_exit);
		410	#else
		411	#endif
		412	#endif
335	/*	413	/*
336	* Save and then give up any super-user privileges	414	* Save and then give up any super-user privileges
337	* If we need privileges in any area then we must specifically request it.	415	* If we need privileges in any area then we must specifically request it.
338	* We should only need to be root in these cases:	416	* We should only need to be root in these cases:
339	* 1. write utmp entries on some systems	417	* 1. write utmp entries on some systems
340	* 2. chown tty on some systems	418	* 2. chown tty on some systems
341	*/	419	*/
342	privileges (SAVE);	420	rxvt_privileges (SAVE);
343	privileges (IGNORE);	421	rxvt_privileges (IGNORE);
344
345	init_secondary ();
346
347	const char **cmd_argv = init_resources (argc, argv);
348
349	set_locale ("");
350
351	#if MENUBAR_MAX
352	menubar_read (rs[Rs_menu]);
353	#endif
354	#ifdef HAVE_SCROLLBARS
355	if (Options & Opt_scrollBar)
356	scrollBar.setIdle (); /* set existence for size calculations */
357	#endif
358
359	create_windows (argc, argv);
360
361	init_xlocale ();
362
363	scr_reset (); /* initialize screen */
364
365	#if 0
366	XSynchronize (display->display, True);
367	#endif
368
369	#ifdef HAVE_SCROLLBARS
370	if (Options & Opt_scrollBar)
371	resize_scrollbar (); /* create and map scrollbar */
372	#endif
373	#if (MENUBAR_MAX)
374	if (menubar_visible ())
375	XMapWindow (display->display, menuBar.win);
376	#endif
377	#ifdef TRANSPARENT
378	if (Options & Opt_transparent)
379	{
380	XSelectInput (display->display, display->root, PropertyChangeMask);
381	check_our_parents ();
382	}
383	#endif
384
385	rootwin_ev.start (display, display->root);
386
387	XMapWindow (display->display, TermWin.vt);
388	XMapWindow (display->display, TermWin.parent[0]);
389
390	init_command (cmd_argv);
391
392	pty_ev.start (cmd_fd, EVENT_READ);
393
394	check_ev.start ();
395
396	return true;
397	}
398
399	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);
400
401	void
402	rxvt_init_signals ()
403	{
404	/* install exit handler for cleanup */
405	#if 0
406	#ifdef HAVE_ATEXIT
407	atexit (rxvt_clean_exit);
408	#else
409	#endif
410	#endif
411		422
412	struct sigaction sa;	423	struct sigaction sa;
413		424
414	sigfillset (&sa.sa_mask);	425	sigfillset (&sa.sa_mask);
415	sa.sa_flags = SA_NOCLDSTOP \| SA_RESTART;	426	sa.sa_flags = SA_NOCLDSTOP \| SA_RESTART;
…		…
443	break;	454	break;
444	}	455	}
445	}	456	}
446		457
447	/* ARGSUSED */	458	/* ARGSUSED */
448	/* EXTPROTO */	459	/* INTPROTO */
449	RETSIGTYPE	460	RETSIGTYPE
450	rxvt_Child_signal (int sig __attribute__ ((unused)))	461	rxvt_Child_signal (int sig __attribute__ ((unused)))
451	{	462	{
452	int pid, save_errno = errno;	463	int pid, save_errno = errno;
453		464
…		…
458	}	469	}
459		470
460	/*	471	/*
461	* Catch a fatal signal and tidy up before quitting	472	* Catch a fatal signal and tidy up before quitting
462	*/	473	*/
463	/* EXTPROTO */	474	/* INTPROTO */
464	RETSIGTYPE	475	RETSIGTYPE
465	rxvt_Exit_signal (int sig)	476	rxvt_Exit_signal (int sig)
466	{	477	{
467	signal (sig, SIG_DFL);	478	signal (sig, SIG_DFL);
468	#ifdef DEBUG_CMD	479	#ifdef DEBUG_CMD
…		…
490	/----------------------------------------------------------------------/	501	/----------------------------------------------------------------------/
491	/*	502	/*
492	* Exit gracefully, clearing the utmp entry and restoring tty attributes	503	* Exit gracefully, clearing the utmp entry and restoring tty attributes
493	* TODO: if debugging, this should free up any known resources if we can	504	* TODO: if debugging, this should free up any known resources if we can
494	*/	505	*/
495	/* EXTPROTO */	506	/* INTPROTO */
496	void	507	void
497	rxvt_clean_exit ()	508	rxvt_clean_exit ()
498	{	509	{
499	// TODO: rxvtd should clean up all ressources	510	// TODO: rxvtd should clean up all ressources
500	if (GET_R)	511	if (GET_R)
…		…
502	}	513	}
503		514
504	/* ------------------------------------------------------------------------- *	515	/* ------------------------------------------------------------------------- *
505	* MEMORY ALLOCATION WRAPPERS *	516	* MEMORY ALLOCATION WRAPPERS *
506	* ------------------------------------------------------------------------- */	517	* ------------------------------------------------------------------------- */
507	/* EXTPROTO */	518	/* INTPROTO */
508	void *	519	void *
509	rxvt_malloc (size_t size)	520	rxvt_malloc (size_t size)
510	{	521	{
511	void *p;	522	void *p;
512		523
513	p = malloc (size);	524	p = malloc (size);
514	if (p)	525	if (p)
515	return p;	526	return p;
516		527
517	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");	528	rxvt_fatal ("memory allocation failure. aborting.\n");
518	rxvt_clean_exit ();
519	exit (EXIT_FAILURE);
520	/* NOTREACHED */	529	/* NOTREACHED */
521	}	530	}
522		531
523	/* EXTPROTO */	532	/* INTPROTO */
524	void *	533	void *
525	rxvt_calloc (size_t number, size_t size)	534	rxvt_calloc (size_t number, size_t size)
526	{	535	{
527	void *p;	536	void *p;
528		537
529	p = calloc (number, size);	538	p = calloc (number, size);
530	if (p)	539	if (p)
531	return p;	540	return p;
532		541
533	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");	542	rxvt_fatal ("memory allocation failure. aborting.\n");
534	rxvt_clean_exit ();
535	exit (EXIT_FAILURE);
536	/* NOTREACHED */	543	/* NOTREACHED */
537	}	544	}
538		545
539	/* EXTPROTO */	546	/* INTPROTO */
540	void *	547	void *
541	rxvt_realloc (void *ptr, size_t size)	548	rxvt_realloc (void *ptr, size_t size)
542	{	549	{
543	void *p;	550	void *p;
544		551
545	if (ptr)	552	if (ptr)
546	p = realloc (ptr, size);	553	p = realloc (ptr, size);
547	else	554	else
548	p = malloc (size);	555	p = malloc (size);
		556
549	if (p)	557	if (p)
550	return p;	558	return p;
551		559
552	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");	560	rxvt_fatal ("memory allocation failure. aborting.\n");
553	rxvt_clean_exit ();
554	exit (EXIT_FAILURE);
555	/* NOTREACHED */	561	/* NOTREACHED */
556	}	562	}
557		563
558	/* ------------------------------------------------------------------------- *	564	/* ------------------------------------------------------------------------- *
559	* PRIVILEGED OPERATIONS *	565	* PRIVILEGED OPERATIONS *
560	* ------------------------------------------------------------------------- */	566	* ------------------------------------------------------------------------- */
561	/* take care of suid/sgid super-user (root) privileges */	567	/* take care of suid/sgid super-user (root) privileges */
562	void	568	void
563	rxvt_term::privileges (int mode)	569	rxvt_privileges (rxvt_privaction action)
564	{	570	{
		571	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		572	static uid_t euid;
		573	static gid_t egid;
		574	#endif
		575
565	#if ! defined(__CYGWIN32__)	576	#if ! defined(__CYGWIN32__)
566	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)	577	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
567	/* setreuid () is the poor man's setuid (), seteuid () */	578	/* setreuid () is the poor man's setuid (), seteuid () */
568	# define seteuid(a) setreuid(-1, (a))	579	# define seteuid(a) setreuid(-1, (a))
569	# define setegid(a) setregid(-1, (a))	580	# define setegid(a) setregid(-1, (a))
570	# define HAVE_SETEUID	581	# define HAVE_SETEUID
571	# endif	582	# endif
572	# ifdef HAVE_SETEUID	583	# ifdef HAVE_SETEUID
573	switch (mode)	584	switch (action)
574	{	585	{
575	case IGNORE:	586	case IGNORE:
576	/*	587	/*
577	* change effective uid/gid - not real uid/gid - so we can switch	588	* change effective uid/gid - not real uid/gid - so we can switch
578	* back to root later, as required	589	* back to root later, as required
…		…
588	seteuid (euid);	599	seteuid (euid);
589	setegid (egid);	600	setegid (egid);
590	break;	601	break;
591	}	602	}
592	# else	603	# else
593	switch (mode)	604	switch (action)
594	{	605	{
595	case IGNORE:	606	case IGNORE:
596	setuid (getuid ());	607	setuid (getuid ());
597	setgid (getgid ());	608	setgid (getgid ());
598	/* FALLTHROUGH */	609	/* FALLTHROUGH */
…		…
605	#endif	616	#endif
606	}	617	}
607		618
608	#ifdef UTMP_SUPPORT	619	#ifdef UTMP_SUPPORT
609	void	620	void
610	rxvt_term::privileged_utmp (char action)	621	rxvt_term::privileged_utmp (rxvt_privaction action)
611	{	622	{
612	D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
613	action, next_utmp_action, getpid ()));
614	if (next_utmp_action != action \|\| (action != SAVE && action != RESTORE)
615	\|\| (Options & Opt_utmpInhibit)	623	if ((options & Opt_utmpInhibit)
616	\|\| ttydev == NULL \|\| *ttydev == '\0')	624	\|\| !pty.name \|\| !*pty.name)
617	return;	625	return;
618		626
619	privileges (RESTORE);	627	rxvt_privileges (RESTORE);
		628
620	if (action == SAVE)	629	if (action == SAVE)
621	{
622	next_utmp_action = RESTORE;
623	makeutent (ttydev, rs[Rs_display_name]);	630	makeutent (pty.name, rs[Rs_display_name]);
624	}
625	else	631	else
626	{ /* action == RESTORE */
627	next_utmp_action = IGNORE;
628	cleanutent ();	632	cleanutent ();
629	}	633
630	privileges (IGNORE);	634	rxvt_privileges (IGNORE);
631	}
632	#endif
633
634	#ifndef NO_SETOWNER_TTYDEV
635	void
636	rxvt_term::privileged_ttydev (char action)
637	{
638	D_MAIN ((stderr,
639	"privileged_ttydev (%c); waiting for: %c (pid: %d)",
640	action, next_tty_action, getpid ()));
641	if (next_tty_action != action \|\| (action != SAVE && action != RESTORE)
642	\|\| ttydev == NULL \|\| *ttydev == '\0')
643	return;
644
645	privileges (RESTORE);
646
647	if (action == SAVE)
648	{
649	next_tty_action = RESTORE;
650	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
651	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
652	if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
653	next_tty_action = IGNORE;
654	else
655	# endif
656
657	{
658	chown (ttydev, getuid (), ttygid); /* fail silently */
659	chmod (ttydev, ttymode);
660	# ifdef HAVE_REVOKE
661	revoke (ttydev);
662	# endif
663
664	}
665	}
666	else
667	{ /* action == RESTORE */
668	next_tty_action = IGNORE;
669	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
670	chmod (ttydev, ttyfd_stat.st_mode);
671	chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
672	# else
673	chmod (ttydev,
674	(S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));
675	chown (ttydev, 0, 0);
676	# endif
677
678	}
679
680	privileges (IGNORE);
681
682	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
683	D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
684	action == RESTORE ? "Restoring" : (action ==
685	SAVE ? "Saving" :
686	"UNKNOWN ERROR for"), ttydev,
687	ttyfd_stat.st_mode, ttyfd_stat.st_uid,
688	ttyfd_stat.st_gid));
689	# endif
690	}	635	}
691	#endif	636	#endif
692		637
693	/----------------------------------------------------------------------/	638	/----------------------------------------------------------------------/
694	/*	639	/*
…		…
765		710
766	if (scrollbar_visible ())	711	if (scrollbar_visible ())
767	{	712	{
768	sb_w = scrollbar_TotalWidth ();	713	sb_w = scrollbar_TotalWidth ();
769	szHint.base_width += sb_w;	714	szHint.base_width += sb_w;
770	if (!(Options & Opt_scrollBar_right))	715	if (!(options & Opt_scrollBar_right))
771	window_vt_x += sb_w;	716	window_vt_x += sb_w;
772	}	717	}
773		718
774	if (menubar_visible ())	719	if (menubar_visible ())
775	{	720	{
…		…
803	{	748	{
804	MIN_IT (TermWin.height, max_height);	749	MIN_IT (TermWin.height, max_height);
805	szHint.height = szHint.base_height + TermWin.height;	750	szHint.height = szHint.base_height + TermWin.height;
806	}	751	}
807		752
808	if (scrollbar_visible () && (Options & Opt_scrollBar_right))	753	if (scrollbar_visible () && (options & Opt_scrollBar_right))
809	window_sb_x = szHint.width - sb_w;	754	window_sb_x = szHint.width - sb_w;
810		755
811	if (recalc_x)	756	if (recalc_x)
812	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))	757	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
813	- szHint.width - 2 * TermWin.ext_bwidth);	758	- szHint.width - 2 * TermWin.ext_bwidth);
…		…
829	* Called after a window size change.	774	* Called after a window size change.
830	*/	775	*/
831	void	776	void
832	rxvt_term::tt_winch ()	777	rxvt_term::tt_winch ()
833	{	778	{
		779	if (pty.pty < 0)
		780	return;
		781
834	struct winsize ws;	782	struct winsize ws;
835
836	if (cmd_fd < 0)
837	return;
838		783
839	ws.ws_col = TermWin.ncol;	784	ws.ws_col = TermWin.ncol;
840	ws.ws_row = TermWin.nrow;	785	ws.ws_row = TermWin.nrow;
841	ws.ws_xpixel = ws.ws_ypixel = 0;	786	ws.ws_xpixel = TermWin.width;
842	#ifndef DEBUG_SIZE	787	ws.ws_ypixel = TermWin.height;
843	(void)ioctl (cmd_fd, TIOCSWINSZ, &ws);	788	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
844	#else	789
845	if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)	790	#if 0
846	D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));	791	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
847	# ifdef SIGWINCH
848	else if (cmd_pid) /* force through to the command */	792	if (cmd_pid) /* force through to the command */
849	kill (cmd_pid, SIGWINCH);	793	kill (cmd_pid, SIGWINCH);
850	# endif
851	#endif	794	#endif
852	}	795	}
853		796
854	/----------------------------------------------------------------------/	797	/----------------------------------------------------------------------/
855	/* rxvt_change_font () - Switch to a new font */	798	/* rxvt_change_font () - Switch to a new font */
…		…
915	char *name;	858	char *name;
916		859
917	if (!XFetchName (display->display, TermWin.parent[0], &name))	860	if (!XFetchName (display->display, TermWin.parent[0], &name))
918	name = NULL;	861	name = NULL;
919		862
920	if (name == NULL \|\| STRCMP (name, str))	863	if (name == NULL \|\| strcmp (name, str))
921	#endif	864	#endif
922	XStoreName (display->display, TermWin.parent[0], str);	865	XStoreName (display->display, TermWin.parent[0], str);
923		866
924	#ifdef SMART_WINDOW_TITLE	867	#ifdef SMART_WINDOW_TITLE
925	if (name)	868	if (name)
…		…
934	char *name;	877	char *name;
935		878
936	if (!XGetIconName (display->display, TermWin.parent[0], &name))	879	if (!XGetIconName (display->display, TermWin.parent[0], &name))
937	name = NULL;	880	name = NULL;
938		881
939	if (name == NULL \|\| STRCMP (name, str))	882	if (name == NULL \|\| strcmp (name, str))
940	#endif	883	#endif
941	XSetIconName (display->display, TermWin.parent[0], str);	884	XSetIconName (display->display, TermWin.parent[0], str);
942		885
943	#ifdef SMART_WINDOW_TITLE	886	#ifdef SMART_WINDOW_TITLE
944	if (name)	887	if (name)
…		…
962	i = atoi (color);	905	i = atoi (color);
963	if (i >= 8 && i <= 15)	906	if (i >= 8 && i <= 15)
964	{ /* bright colors */	907	{ /* bright colors */
965	i -= 8;	908	i -= 8;
966	# ifndef NO_BRIGHTCOLOR	909	# ifndef NO_BRIGHTCOLOR
967	PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];	910	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
968	SET_PIXCOLOR (idx);	911	SET_PIXCOLOR (idx);
969	goto Done;	912	goto Done;
970	# endif	913	# endif
971		914
972	}	915	}
973	if (i >= 0 && i <= 7)	916	if (i >= 0 && i <= 7)
974	{ /* normal colors */	917	{ /* normal colors */
975	PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];	918	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
976	SET_PIXCOLOR (idx);	919	SET_PIXCOLOR (idx);
977	goto Done;	920	goto Done;
978	}	921	}
979	}	922	}
980		923
…		…
987	* FIXME: should free colors here, but no idea how to do it so instead,	930	* FIXME: should free colors here, but no idea how to do it so instead,
988	* so just keep gobbling up the colormap	931	* so just keep gobbling up the colormap
989	*/	932	*/
990	# if 0	933	# if 0
991	for (i = Color_Black; i <= Color_White; i++)	934	for (i = Color_Black; i <= Color_White; i++)
992	if (PixColors[idx] == PixColors[i])	935	if (pix_colors[idx] == pix_colors[i])
993	break;	936	break;
994	if (i > Color_White)	937	if (i > Color_White)
995	{	938	{
996	/* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */	939	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
997	XFreeColors (display->display, display->cmap, (PixColors + idx), 1,	940	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
998	DisplayPlanes (display->display, display->screen));	941	DisplayPlanes (display->display, display->screen));
999	}	942	}
1000	# endif	943	# endif
1001		944
1002	PixColorsFocused[idx] = xcol;	945	pix_colors_focused[idx] = xcol;
1003	SET_PIXCOLOR (idx);	946	SET_PIXCOLOR (idx);
1004		947
1005	/* XSetWindowAttributes attr; */	948	/* XSetWindowAttributes attr; */
1006	/* Cursor cursor; */	949	/* Cursor cursor; */
1007	Done:	950	Done:
1008	#ifdef OFF_FOCUS_FADING	951	#ifdef OFF_FOCUS_FADING
1009	PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));	952	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1010	#endif	953	#endif
1011	if (idx == Color_bg && ! (Options & Opt_transparent))	954	if (idx == Color_bg && ! (options & Opt_transparent))
1012	XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);	955	XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
1013		956
1014	/* handle Color_BD, scrollbar background, etc. */	957	/* handle Color_BD, scrollbar background, etc. */
1015		958
1016	set_colorfgbg ();	959	set_colorfgbg ();
1017	recolour_cursor ();	960	recolour_cursor ();
…		…
1025	void	968	void
1026	rxvt_term::recolour_cursor ()	969	rxvt_term::recolour_cursor ()
1027	{	970	{
1028	XColor xcol[2];	971	XColor xcol[2];
1029		972
1030	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];	973	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? pix_colors_focused[Color_pointer_fg] : pix_colors_focused[Color_fg];
1031	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];	974	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? pix_colors_focused[Color_pointer_bg] : pix_colors_focused[Color_bg];
1032	XQueryColors (display->display, display->cmap, xcol, 2);	975	XQueryColors (display->display, display->cmap, xcol, 2);
1033	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	976	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1034	}	977	}
1035		978
1036	/----------------------------------------------------------------------/	979	/----------------------------------------------------------------------/
…		…
1044	const char *xpmb = "\0";	987	const char *xpmb = "\0";
1045	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	988	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1046		989
1047	env_colorfgbg =	990	env_colorfgbg =
1048	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);	991	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1049	STRCPY (fstr, "default");	992	strcpy (fstr, "default");
1050	STRCPY (bstr, "default");	993	strcpy (bstr, "default");
1051	for (i = Color_Black; i <= Color_White; i++)	994	for (i = Color_Black; i <= Color_White; i++)
1052	if (PixColors[Color_fg] == PixColors[i])	995	if (pix_colors[Color_fg] == pix_colors[i])
1053	{	996	{
1054	sprintf (fstr, "%d", (i - Color_Black));	997	sprintf (fstr, "%d", (i - Color_Black));
1055	break;	998	break;
1056	}	999	}
1057	for (i = Color_Black; i <= Color_White; i++)	1000	for (i = Color_Black; i <= Color_White; i++)
1058	if (PixColors[Color_bg] == PixColors[i])	1001	if (pix_colors[Color_bg] == pix_colors[i])
1059	{	1002	{
1060	sprintf (bstr, "%d", (i - Color_Black));	1003	sprintf (bstr, "%d", (i - Color_Black));
1061	#ifdef XPM_BACKGROUND	1004	#ifdef XPM_BACKGROUND
1062	xpmb = "default;";	1005	xpmb = "default;";
1063	#endif	1006	#endif
…		…
1068		1011
1069	#ifndef NO_BRIGHTCOLOR	1012	#ifndef NO_BRIGHTCOLOR
1070	colorfgbg = DEFAULT_RSTYLE;	1013	colorfgbg = DEFAULT_RSTYLE;
1071	for (i = minCOLOR; i <= maxCOLOR; i++)	1014	for (i = minCOLOR; i <= maxCOLOR; i++)
1072	{	1015	{
1073	if (PixColors[Color_fg] == PixColors[i])	1016	if (pix_colors[Color_fg] == pix_colors[i])
1074	colorfgbg = SET_FGCOLOR (colorfgbg, i);	1017	colorfgbg = SET_FGCOLOR (colorfgbg, i);
1075	if (PixColors[Color_bg] == PixColors[i])	1018	if (pix_colors[Color_bg] == pix_colors[i])
1076	colorfgbg = SET_BGCOLOR (colorfgbg, i);	1019	colorfgbg = SET_BGCOLOR (colorfgbg, i);
1077	}	1020	}
1078	#endif	1021	#endif
1079	}	1022	}
1080		1023
…		…
1231	if (width == 0)	1174	if (width == 0)
1232	width = wattr.width - szHint.base_width;	1175	width = wattr.width - szHint.base_width;
1233	if (height == 0)	1176	if (height == 0)
1234	height = wattr.height - szHint.base_height;	1177	height = wattr.height - szHint.base_height;
1235	}	1178	}
		1179
1236	if (width != TermWin.width \|\| height != TermWin.height)	1180	if (width != TermWin.width \|\| height != TermWin.height)
1237	{	1181	{
1238	width += szHint.base_width;	1182	width += szHint.base_width;
1239	height += szHint.base_height;	1183	height += szHint.base_height;
1240	resize_all_windows (width, height, 0);	1184	resize_all_windows (width, height, 0);
…		…
1245	* - X INPUT METHOD ROUTINES - *	1189	* - X INPUT METHOD ROUTINES - *
1246	* -------------------------------------------------------------------- */	1190	* -------------------------------------------------------------------- */
1247	#ifdef USE_XIM	1191	#ifdef USE_XIM
1248		1192
1249	void	1193	void
		1194	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
		1195	{
		1196	fg = pix_colors[Color_fg];
		1197	bg = pix_colors[Color_bg];
		1198	}
		1199
		1200	void
1250	rxvt_term::im_set_size (XRectangle *size)	1201	rxvt_term::im_set_size (XRectangle &size)
1251	{	1202	{
		1203	// the int_bwidth terms make no sense to me
1252	size->x = TermWin.int_bwidth;	1204	size.x = TermWin.int_bwidth;
1253	size->y = TermWin.int_bwidth;	1205	size.y = TermWin.int_bwidth;
1254	size->width = Width2Pixel (TermWin.ncol);	1206	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1255	size->height = Height2Pixel (TermWin.nrow);	1207	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1256	}	1208	}
1257		1209
1258	void	1210	void
1259	rxvt_term::im_set_color (unsigned long fg, unsigned long bg)	1211	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
		1212	XRectangle &status_rect,
		1213	const XRectangle &needed_rect)
1260	{	1214	{
1261	*fg = PixColors[Color_fg];	1215	preedit_rect.x = needed_rect.width;
1262	*bg = PixColors[Color_bg];	1216	preedit_rect.y = 0;
		1217	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
		1218	preedit_rect.height = TermWin.fheight;
		1219
		1220	status_rect.x = 0;
		1221	status_rect.y = 0;
		1222	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
		1223	status_rect.height = TermWin.fheight;
1263	}	1224	}
1264		1225
1265	/* Checking whether input method is running. */	1226	/* Checking whether input method is running. */
1266	bool	1227	bool
1267	rxvt_term::IMisRunning ()	1228	rxvt_term::IMisRunning ()
1268	{	1229	{
1269	char *p;	1230	char *p;
1270	Atom atom;	1231	Atom atom;
1271	Window win;	1232	Window win;
1272	char server[IMBUFSIZ];	1233	char server[IMBUFSIZ];
1273		1234
1274	/* get current locale modifier */	1235	/* get current locale modifier */
1275	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1236	if ((p = XSetLocaleModifiers (NULL)) != NULL)
1276	{	1237	{
1277	STRCPY (server, "@server=");	1238	strcpy (server, "@server=");
1278	STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1239	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
		1240
1279	if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */	1241	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1280	*p = '\0';	1242	*p = '\0';
1281		1243
1282	atom = XInternAtom (display->display, server, False);	1244	atom = XInternAtom (display->display, server, False);
1283	win = XGetSelectionOwner (display->display, atom);	1245	win = XGetSelectionOwner (display->display, atom);
		1246
1284	if (win != None)	1247	if (win != None)
1285	return True;	1248	return True;
1286	}	1249	}
		1250
1287	return False;	1251	return False;
1288	}	1252	}
1289		1253
1290	void	1254	void
1291	rxvt_term::IMSendSpot ()	1255	rxvt_term::IMSendSpot ()
1292	{	1256	{
1293	XPoint spot;	1257	XPoint spot;
1294	XVaNestedList preedit_attr;	1258	XVaNestedList preedit_attr;
1295		1259
1296	if (Input_Context == NULL	1260	if (!Input_Context
		1261	\|\| !TermWin.focus
1297	\|\| !TermWin.focus \|\| ! (input_style & XIMPreeditPosition)	1262	\|\| !(input_style & XIMPreeditPosition)
		1263	#if 0
1298	\|\| ! (event_type == KeyPress	1264	\|\| !(event_type == KeyPress
1299	\|\| event_type == Expose	1265	\|\| event_type == Expose
1300	\|\| event_type == NoExpose	1266	\|\| event_type == NoExpose
1301	\|\| event_type == SelectionNotify	1267	\|\| event_type == SelectionNotify
1302	\|\| event_type == ButtonRelease \|\| event_type == FocusIn)	1268	\|\| event_type == ButtonRelease \|\| event_type == FocusIn)
		1269	#endif
1303	\|\| !IMisRunning ())	1270	\|\| !IMisRunning ())
1304	return;	1271	return;
1305		1272
1306	im_set_position (&spot);	1273	im_set_position (spot);
1307		1274
1308	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);	1275	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1309	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1276	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1310	XFree (preedit_attr);	1277	XFree (preedit_attr);
1311	}	1278	}
1312		1279
1313	void	1280	void
1314	rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1315	XRectangle * needed_rect)
1316	{
1317	int mbh, vtx = 0;
1318
1319	if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1320	vtx = scrollbar_TotalWidth ();
1321
1322	mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1323	mbh -= TermWin.lineSpace;
1324
1325	preedit_rect->x = needed_rect->width + vtx;
1326	preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1327
1328	preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1329	preedit_rect->height = Height2Pixel (1);
1330
1331	status_rect->x = vtx;
1332	status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1333
1334	status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1335	status_rect->height = Height2Pixel (1);
1336	}
1337
1338	void
1339	rxvt_term::im_destroy ()	1281	rxvt_term::im_destroy ()
1340	{	1282	{
1341	if (Input_Context)	1283	if (Input_Context)
1342	{	1284	{
1343	XDestroyIC (Input_Context);	1285	XDestroyIC (Input_Context);
1344	Input_Context = NULL;	1286	Input_Context = 0;
1345	}	1287	}
1346		1288
1347	if (input_method)	1289	if (input_method)
1348	{	1290	{
1349	display->put_xim (input_method);	1291	display->put_xim (input_method);
…		…
1356	* open a suitable preedit type	1298	* open a suitable preedit type
1357	*/	1299	*/
1358	bool	1300	bool
1359	rxvt_term::IM_get_IC (const char *modifiers)	1301	rxvt_term::IM_get_IC (const char *modifiers)
1360	{	1302	{
1361	int i, j, found;	1303	int i, j, found;
1362	XIM xim;	1304	XIM xim;
1363	XPoint spot;	1305	XPoint spot;
1364	XRectangle rect, status_rect, needed_rect;	1306	XRectangle rect, status_rect, needed_rect;
1365	unsigned long fg, bg;	1307	unsigned long fg, bg;
1366	const char *p;	1308	const char *p;
1367	char **s;	1309	char **s;
1368	XIMStyles *xim_styles;	1310	XIMStyles *xim_styles;
1369	XVaNestedList preedit_attr, status_attr;
1370		1311
1371	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1312	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1372	return false;	1313	return false;
1373		1314
1374	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1315	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1380		1321
1381	xim_styles = NULL;	1322	xim_styles = NULL;
1382	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)	1323	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1383	\|\| !xim_styles \|\| !xim_styles->count_styles)	1324	\|\| !xim_styles \|\| !xim_styles->count_styles)
1384	{	1325	{
1385	display->put_xim (input_method);	1326	im_destroy ();
1386	return false;	1327	return false;
1387	}	1328	}
1388		1329
1389	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";	1330	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1390	s = rxvt_splitcommastring (p);	1331	s = rxvt_splitcommastring (p);
		1332
1391	for (i = found = 0; !found && s[i]; i++)	1333	for (i = found = 0; !found && s[i]; i++)
1392	{	1334	{
1393	if (!STRCMP (s[i], "OverTheSpot"))	1335	if (!strcmp (s[i], "OverTheSpot"))
1394	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1336	input_style = (XIMPreeditPosition \| XIMStatusNothing);
1395	else if (!STRCMP (s[i], "OffTheSpot"))	1337	else if (!strcmp (s[i], "OffTheSpot"))
1396	input_style = (XIMPreeditArea \| XIMStatusArea);	1338	input_style = (XIMPreeditArea \| XIMStatusArea);
1397	else if (!STRCMP (s[i], "Root"))	1339	else if (!strcmp (s[i], "Root"))
1398	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1340	input_style = (XIMPreeditNothing \| XIMStatusNothing);
1399		1341
1400	for (j = 0; j < xim_styles->count_styles; j++)	1342	for (j = 0; j < xim_styles->count_styles; j++)
1401	if (input_style == xim_styles->supported_styles[j])	1343	if (input_style == xim_styles->supported_styles[j])
1402	{	1344	{
…		…
1411	free (s);	1353	free (s);
1412	XFree (xim_styles);	1354	XFree (xim_styles);
1413		1355
1414	if (!found)	1356	if (!found)
1415	{	1357	{
1416	display->put_xim (input_method);	1358	im_destroy ();
1417	return false;	1359	return false;
1418	}	1360	}
1419		1361
1420	preedit_attr = status_attr = NULL;	1362	XFontSet fs = 0;
		1363	XVaNestedList preedit_attr = 0, status_attr = 0;
		1364
		1365	if (input_style & (XIMPreeditPosition \| XIMPreeditArea))
		1366	{
		1367	// fake us a font-set, please
		1368	char **missing_charset_list;
		1369	int missing_charset_count;
		1370	char *def_string;
		1371	char pat[512];
		1372
		1373	sprintf (pat,
		1374	"----R---%d------*,"
		1375	"----R---%d------*,"
		1376	"----R---%d------*,"
		1377	"----R---%d------*,"
		1378	"----R---%d------*,"
		1379	"*",
		1380	TermWin.fheight,
		1381	TermWin.fheight + 1, TermWin.fheight - 1,
		1382	TermWin.fheight - 2, TermWin.fheight + 2);
		1383
		1384	fs = XCreateFontSet (display->display, pat,
		1385	&missing_charset_list, &missing_charset_count, &def_string);
		1386
		1387	if (missing_charset_list)
		1388	XFreeStringList (missing_charset_list);
		1389
		1390	if (!fs)
		1391	{
		1392	input_style &= ~(XIMPreeditPosition \| XIMPreeditArea);
		1393	rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
		1394	}
		1395	}
1421		1396
1422	if (input_style & XIMPreeditPosition)	1397	if (input_style & XIMPreeditPosition)
1423	{	1398	{
1424	im_set_size (&rect);	1399	im_set_size (rect);
1425	im_set_position (&spot);	1400	im_set_position (spot);
1426	im_set_color (&fg, &bg);	1401	im_set_color (fg, bg);
1427		1402
1428	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1403	preedit_attr = XVaCreateNestedList (0,
		1404	XNForeground, fg,
		1405	XNBackground, bg,
		1406	XNArea, &rect,
1429	XNSpotLocation, &spot,	1407	XNSpotLocation, &spot,
1430	XNForeground, fg, XNBackground, bg,
1431	//XNFontSet, TermWin.fontset,	1408	XNFontSet, fs,
1432	NULL);	1409	NULL);
1433	}	1410	}
1434	else if (input_style & XIMPreeditArea)	1411	else if (input_style & XIMPreeditArea)
1435	{	1412	{
1436	im_set_color (&fg, &bg);	1413	im_set_color (fg, bg);
1437		1414
1438	/*	1415	/*
1439	* The necessary width of preedit area is unknown	1416	* The necessary width of preedit area is unknown
1440	* until create input context.	1417	* until create input context.
1441	*/	1418	*/
1442	needed_rect.width = 0;	1419	needed_rect.width = 0;
1443
1444	im_set_preedit_area (&rect, &status_rect, &needed_rect);	1420	im_set_preedit_area (rect, status_rect, needed_rect);
1445		1421
1446	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1422	preedit_attr = XVaCreateNestedList (0,
		1423	XNForeground, fg,
1447	XNForeground, fg, XNBackground, bg,	1424	XNBackground, bg,
		1425	XNArea, &rect,
		1426	XNFontSet, fs,
		1427	NULL);
		1428	status_attr = XVaCreateNestedList (0,
		1429	XNForeground, fg,
		1430	XNBackground, bg,
		1431	XNArea, &status_rect,
1448	//XNFontSet, TermWin.fontset,	1432	XNFontSet, fs,
1449	NULL);	1433	NULL);
1450	status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1451	XNForeground, fg, XNBackground, bg,
1452	//XNFontSet, TermWin.fontset,
1453	NULL);
1454	}	1434	}
1455		1435
1456	Input_Context = XCreateIC (xim, XNInputStyle, input_style,	1436	Input_Context = XCreateIC (xim,
		1437	XNInputStyle, input_style,
1457	XNClientWindow, TermWin.parent[0],	1438	XNClientWindow, TermWin.vt,
1458	XNFocusWindow, TermWin.parent[0],	1439	XNFocusWindow, TermWin.parent[0],
1459	preedit_attr ? XNPreeditAttributes : NULL,	1440	preedit_attr ? XNPreeditAttributes : NULL,
1460	preedit_attr,	1441	preedit_attr,
1461	status_attr ? XNStatusAttributes : NULL,	1442	status_attr ? XNStatusAttributes : NULL,
1462	status_attr, NULL);	1443	status_attr, NULL);
		1444
1463	if (preedit_attr) XFree (preedit_attr);	1445	if (preedit_attr) XFree (preedit_attr);
1464	if (status_attr) XFree (status_attr);	1446	if (status_attr) XFree (status_attr);
		1447	if (fs) XFreeFontSet (display->display, fs);
1465		1448
1466	if (Input_Context == NULL)	1449	if (Input_Context == NULL)
1467	{	1450	{
1468	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1451	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1469	display->put_xim (input_method);	1452	im_destroy ();
1470	return false;	1453	return false;
1471	}	1454	}
1472		1455
1473	if (input_style & XIMPreeditArea)	1456	if (input_style & XIMPreeditArea)
1474	IMSetStatusPosition ();	1457	IMSetStatusPosition ();
…		…
1504	s = rxvt_splitcommastring (p);	1487	s = rxvt_splitcommastring (p);
1505	for (i = 0; s[i]; i++)	1488	for (i = 0; s[i]; i++)
1506	{	1489	{
1507	if (*s[i])	1490	if (*s[i])
1508	{	1491	{
1509	STRCPY (buf, "@im=");	1492	strcpy (buf, "@im=");
1510	STRNCAT (buf, s[i], IMBUFSIZ - 5);	1493	strncat (buf, s[i], IMBUFSIZ - 5);
1511	if (IM_get_IC (buf))	1494	if (IM_get_IC (buf))
1512	{	1495	{
1513	found = true;	1496	found = true;
1514	break;	1497	break;
1515	}	1498	}
…		…
1539	}	1522	}
1540		1523
1541	void	1524	void
1542	rxvt_term::IMSetStatusPosition ()	1525	rxvt_term::IMSetStatusPosition ()
1543	{	1526	{
1544	XRectangle preedit_rect, status_rect, *needed_rect;	1527	XRectangle preedit_rect, status_rect, *needed_rect;
1545	XVaNestedList preedit_attr, status_attr;	1528	XVaNestedList preedit_attr, status_attr;
1546		1529
1547	if (Input_Context == NULL	1530	if (!Input_Context
		1531	\|\| !TermWin.focus
1548	\|\| !TermWin.focus \|\| ! (input_style & XIMPreeditArea)	1532	\|\| !(input_style & XIMPreeditArea)
1549	\|\| !IMisRunning ())	1533	\|\| !IMisRunning ())
1550	return;	1534	return;
1551		1535
1552	/* Getting the necessary width of preedit area */	1536	/* Getting the necessary width of preedit area */
1553	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1537	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1554	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1538	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1555	XFree (status_attr);	1539	XFree (status_attr);
1556		1540
1557	im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);	1541	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
		1542	XFree (needed_rect);
1558		1543
1559	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1544	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1560	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1545	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1561		1546
1562	XSetICValues (Input_Context,	1547	XSetICValues (Input_Context,
1563	XNPreeditAttributes, preedit_attr,	1548	XNPreeditAttributes, preedit_attr,
1564	XNStatusAttributes, status_attr, NULL);	1549	XNStatusAttributes, status_attr, NULL);
1565		1550
1566	XFree (preedit_attr);	1551	XFree (preedit_attr);
1567	XFree (status_attr);	1552	XFree (status_attr);
1568	}	1553	}
1569	#endif /* USE_XIM */	1554	#endif /* USE_XIM */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.76 by root, Wed Aug 4 03:29:28 2004 UTC vs. Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.76 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC