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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.128 by root, Mon Jan 17 00:59:23 2005 UTC

…		…
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
35	#include "main.intpro" /* PROTOS for internal routines */	35	#include "main.intpro" /* PROTOS for internal routines */
36		36
37	#include <signal.h>	37	#include <csignal>
		38	#include <cstring>
38		39
39	#ifdef TTY_GID_SUPPORT	40	#ifdef TTY_GID_SUPPORT
40	# include <grp.h>	41	# include <grp.h>
41	#endif	42	#endif
42		43
43	#ifdef HAVE_TERMIOS_H	44	#ifdef HAVE_TERMIOS_H
44	# include <termios.h>	45	# include <termios.h>
45	#endif	46	#endif
46		47
47	#include <cstring>	48	#ifdef KEYSYM_RESOURCE
		49	# include "keyboard.h"
		50	#endif
48		51
49	vector<rxvt_term *> rxvt_term::termlist;	52	vector<rxvt_term *> rxvt_term::termlist;
50		53
51	static char curlocale[128];	54	static char curlocale[128];
52		55
…		…
123	return len;	126	return len;
124		127
125	}	128	}
126	#endif	129	#endif
127		130
128	void *
129	rxvt_term::operator new (size_t s)
130	{
131	void *p = malloc (s);
132
133	memset (p, 0, s);
134	return p;
135	}
136
137	void
138	rxvt_term::operator delete (void *p, size_t s)
139	{
140	free (p);
141	}
142
143	rxvt_term::rxvt_term ()	131	rxvt_term::rxvt_term ()
144	:	132	:
145	#if TRANSPARENT	133	#if TRANSPARENT
146	rootwin_ev (this, &rxvt_term::rootwin_cb),	134	rootwin_ev (this, &rxvt_term::rootwin_cb),
147	#endif	135	#endif
…		…
170	pointer_ev (this, &rxvt_term::pointer_cb),	158	pointer_ev (this, &rxvt_term::pointer_cb),
171	#endif	159	#endif
172	#ifdef USE_XIM	160	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),	161	im_ev (this, &rxvt_term::im_cb),
174	#endif	162	#endif
		163	sw_term (this, &rxvt_term::sig_term),
		164	sw_chld (this, &rxvt_term::sig_chld),
175	termwin_ev (this, &rxvt_term::x_cb),	165	termwin_ev (this, &rxvt_term::x_cb),
176	vt_ev (this, &rxvt_term::x_cb),	166	vt_ev (this, &rxvt_term::x_cb),
177	check_ev (this, &rxvt_term::check_cb),	167	check_ev (this, &rxvt_term::check_cb),
178	flush_ev (this, &rxvt_term::flush_cb),	168	flush_ev (this, &rxvt_term::flush_cb),
179	destroy_ev (this, &rxvt_term::destroy_cb),	169	destroy_ev (this, &rxvt_term::destroy_cb),
…		…
181	incr_ev (this, &rxvt_term::incr_cb)	171	incr_ev (this, &rxvt_term::incr_cb)
182	{	172	{
183	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	173	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
184		174
185	termlist.push_back (this);	175	termlist.push_back (this);
		176
		177	#ifdef KEYSYM_RESOURCE
		178	keyboard = new keyboard_manager;
		179
		180	if (!keyboard)
		181	rxvt_fatal ("out of memory, aborting.\n");
		182	#endif
186	}	183	}
187		184
188	rxvt_term::~rxvt_term ()	185	rxvt_term::~rxvt_term ()
189	{	186	{
190	termlist.erase (find (termlist.begin (), termlist.end(), this));	187	termlist.erase (find (termlist.begin (), termlist.end(), this));
…		…
196		193
197	#ifdef UTMP_SUPPORT	194	#ifdef UTMP_SUPPORT
198	privileged_utmp (RESTORE);	195	privileged_utmp (RESTORE);
199	#endif	196	#endif
200		197
		198	#if ENABLE_STYLES
		199	for (int i = RS_styleCount; --i; )
		200	if (TermWin.fontset[i] != TermWin.fontset[0])
		201	delete TermWin.fontset[i];
		202	#endif
201	delete TermWin.fontset;	203	delete TermWin.fontset[0];
202		204
203	if (display)	205	if (display)
204	{	206	{
205	selection_clear ();	207	selection_clear ();
206		208
…		…
267	free (env_windowid);	269	free (env_windowid);
268	free (env_display);	270	free (env_display);
269	free (env_term);	271	free (env_term);
270	free (env_colorfgbg);	272	free (env_colorfgbg);
271	free (locale);	273	free (locale);
272	#if 0	274	free (v_buffer);
273	free (codeset);	275	free (incr_buf);
274	#endif
275		276
276	delete envv;	277	delete envv;
277	delete argv;	278	delete argv;
		279
		280	#ifdef KEYSYM_RESOURCE
		281	delete keyboard;
		282	#endif
278	}	283	}
279		284
280	void	285	void
281	rxvt_term::destroy ()	286	rxvt_term::destroy ()
282	{	287	{
…		…
340	bool	345	bool
341	rxvt_term::init (int argc, const char const argv)	346	rxvt_term::init (int argc, const char const argv)
342	{	347	{
343	SET_R (this);	348	SET_R (this);
344		349
		350	set_locale ("");
		351
345	if (!init_vars ())	352	if (!init_vars ())
346	return false;	353	return false;
347		354
348	init_secondary ();	355	init_secondary ();
349		356
350	const char **cmd_argv = init_resources (argc, argv);	357	const char **cmd_argv = init_resources (argc, argv);
351		358
352	set_locale ("");	359	#ifdef KEYSYM_RESOURCE
		360	keyboard->register_done ();
		361	#endif
353		362
354	#if MENUBAR_MAX	363	#if MENUBAR_MAX
355	menubar_read (rs[Rs_menu]);	364	menubar_read (rs[Rs_menu]);
356	#endif	365	#endif
357	#ifdef HAVE_SCROLLBARS	366	#ifdef HAVE_SCROLLBARS
…		…
387	#endif	396	#endif
388		397
389	XMapWindow (display->display, TermWin.vt);	398	XMapWindow (display->display, TermWin.vt);
390	XMapWindow (display->display, TermWin.parent[0]);	399	XMapWindow (display->display, TermWin.parent[0]);
391		400
		401	set_colorfgbg ();
		402
392	init_command (cmd_argv);	403	init_command (cmd_argv);
393		404
		405	free (cmd_argv);
		406
394	pty_ev.start (pty.pty, EVENT_READ);	407	pty_ev.start (pty.pty, EVENT_READ);
395		408
396	check_ev.start ();	409	check_ev.start ();
397		410
398	return true;	411	return true;
…		…
401	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);	414	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);
402		415
403	void	416	void
404	rxvt_init ()	417	rxvt_init ()
405	{	418	{
406	/* install exit handler for cleanup */
407	#if 0
408	#ifdef HAVE_ATEXIT
409	atexit (rxvt_clean_exit);
410	#else
411	#endif
412	#endif
413	/*	419	/*
414	* Save and then give up any super-user privileges	420	* Save and then give up any super-user privileges
415	* If we need privileges in any area then we must specifically request it.	421	* If we need privileges in any area then we must specifically request it.
416	* We should only need to be root in these cases:	422	* We should only need to be root in these cases:
417	* 1. write utmp entries on some systems	423	* 1. write utmp entries on some systems
418	* 2. chown tty on some systems	424	* 2. chown tty on some systems
419	*/	425	*/
420	rxvt_privileges (SAVE);	426	rxvt_privileges (SAVE);
421	rxvt_privileges (IGNORE);	427	rxvt_privileges (IGNORE);
422		428
423	struct sigaction sa;	429	signal (SIGHUP, SIG_IGN);
424		430	signal (SIGPIPE, SIG_IGN);
425	sigfillset (&sa.sa_mask);
426	sa.sa_flags = SA_NOCLDSTOP \| SA_RESTART;
427	sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
428	sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
429	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
430	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
431	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
432	sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
433		431
434	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	432	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
435	/* signal (SIGURG, SIG_DFL); */	433	/* signal (SIGURG, SIG_DFL); */
436		434
437	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	435	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
		436	// TODO: handle this with exceptions and tolerate the memory loss
438	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);	437	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
439	}	438	}
440		439
441	/* ------------------------------------------------------------------------- *	440	/* ------------------------------------------------------------------------- *
442	* SIGNAL HANDLING & EXIT HANDLER *	441	* SIGNAL HANDLING & EXIT HANDLER *
443	* ------------------------------------------------------------------------- */	442	* ------------------------------------------------------------------------- */
444	/*	443	/*
445	* Catch a SIGCHLD signal and exit if the direct child has died	444	* Catch a SIGCHLD signal and exit if the direct child has died
446	*/	445	*/
447		446
448	void rxvt_term::child_exited (int pid)	447	void
		448	rxvt_term::sig_chld (sig_watcher &w)
449	{	449	{
450	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	450	// we are being called for every SIGCHLD, not just ours
451	if (pid == (*t)->cmd_pid)	451	int pid;
452	{
453	(*t)->destroy ();
454	break;
455	}
456	}
457
458	/* ARGSUSED */
459	/* INTPROTO */
460	RETSIGTYPE
461	rxvt_Child_signal (int sig __attribute__ ((unused)))
462	{
463	int pid, save_errno = errno;
464		452
465	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)	453	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
466	rxvt_term::child_exited (pid);	454	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
467		455	if (pid == (*t)->cmd_pid)
468	errno = save_errno;	456	{
469	}	457	(*t)->destroy ();
470		458	break;
471	/*	459	}
472	* Catch a fatal signal and tidy up before quitting
473	*/
474	/* INTPROTO */
475	RETSIGTYPE
476	rxvt_Exit_signal (int sig)
477	{
478	signal (sig, SIG_DFL);
479	#ifdef DEBUG_CMD
480	rxvt_warn ("caught signal %d, exiting.\n", sig);
481	#endif
482	rxvt_clean_exit ();
483	kill (getpid (), sig);
484	}
485
486	/* INTPROTO */
487	int
488	rxvt_xerror_handler (Display display, XErrorEvent event)
489	{
490	if (GET_R->allowedxerror == -1)
491	GET_R->allowedxerror = event->error_code;
492	else
493	{
494	old_xerror_handler (display, event);
495	GET_R->destroy ();
496	}
497
498	return 0;
499	}	460	}
500		461
501	/----------------------------------------------------------------------/	462	/----------------------------------------------------------------------/
502	/*	463	/*
503	* Exit gracefully, clearing the utmp entry and restoring tty attributes	464	* Exit gracefully, clearing the utmp entry and restoring tty attributes
504	* TODO: if debugging, this should free up any known resources if we can	465	* TODO: if debugging, this should free up any known resources if we can
505	*/	466	*/
		467	void
		468	rxvt_destroy_all ()
		469	{
		470	// TODO: rxvtd should clean up all ressources
		471	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		472	(*t)->destroy ();
		473	}
		474
		475	/*
		476	* Catch a fatal signal and tidy up before quitting
		477	*/
		478	void
		479	rxvt_term::sig_term (sig_watcher &w)
		480	{
		481	#ifdef DEBUG_CMD
		482	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
		483	#endif
		484	rxvt_destroy_all ();
		485	signal (w.signum, SIG_DFL);
		486	kill (getpid (), w.signum);
		487	}
		488
506	/* INTPROTO */	489	/* INTPROTO */
507	void	490	int
508	rxvt_clean_exit ()	491	rxvt_xerror_handler (Display display, XErrorEvent event)
509	{	492	{
510	// TODO: rxvtd should clean up all ressources	493	if (GET_R->allowedxerror == -1)
511	if (GET_R)	494	GET_R->allowedxerror = event->error_code;
		495	else
		496	{
		497	old_xerror_handler (display, event);
512	GET_R->destroy ();	498	GET_R->destroy ();
		499	}
		500
		501	return 0;
513	}	502	}
514		503
515	/* ------------------------------------------------------------------------- *	504	/* ------------------------------------------------------------------------- *
516	* MEMORY ALLOCATION WRAPPERS *	505	* MEMORY ALLOCATION WRAPPERS *
517	* ------------------------------------------------------------------------- */	506	* ------------------------------------------------------------------------- */
518	/* INTPROTO */	507	void *
519	void *
520	rxvt_malloc (size_t size)	508	rxvt_malloc (size_t size)
521	{	509	{
522	void *p;
523
524	p = malloc (size);	510	void *p = malloc (size);
		511
525	if (p)	512	if (!p)
526	return p;
527
528	rxvt_fatal ("memory allocation failure. aborting.\n");	513	rxvt_fatal ("memory allocation failure. aborting.\n");
529	/* NOTREACHED */	514
		515	return p;
530	}	516	}
531		517
532	/* INTPROTO */	518	/* INTPROTO */
533	void *	519	void *
534	rxvt_calloc (size_t number, size_t size)	520	rxvt_calloc (size_t number, size_t size)
535	{	521	{
536	void *p;
537
538	p = calloc (number, size);	522	void *p = calloc (number, size);
		523
539	if (p)	524	if (!p)
540	return p;
541
542	rxvt_fatal ("memory allocation failure. aborting.\n");	525	rxvt_fatal ("memory allocation failure. aborting.\n");
543	/* NOTREACHED */	526
		527	return p;
544	}	528	}
545		529
546	/* INTPROTO */	530	/* INTPROTO */
547	void *	531	void *
548	rxvt_realloc (void *ptr, size_t size)	532	rxvt_realloc (void *ptr, size_t size)
549	{	533	{
550	void *p;
551
552	if (ptr)
553	p = realloc (ptr, size);	534	void *p = realloc (ptr, size);
554	else
555	p = malloc (size);
556		535
557	if (p)	536	if (!p)
558	return p;
559
560	rxvt_fatal ("memory allocation failure. aborting.\n");	537	rxvt_fatal ("memory allocation failure. aborting.\n");
561	/* NOTREACHED */	538
		539	return p;
562	}	540	}
563		541
564	/* ------------------------------------------------------------------------- *	542	/* ------------------------------------------------------------------------- *
565	* PRIVILEGED OPERATIONS *	543	* PRIVILEGED OPERATIONS *
566	* ------------------------------------------------------------------------- */	544	* ------------------------------------------------------------------------- */
…		…
793	kill (cmd_pid, SIGWINCH);	771	kill (cmd_pid, SIGWINCH);
794	#endif	772	#endif
795	}	773	}
796		774
797	/----------------------------------------------------------------------/	775	/----------------------------------------------------------------------/
798	/* rxvt_change_font () - Switch to a new font */	776	/* set_fonts () - load and set the various fonts
799	/*	777	/*
800	* init = 1 - initialize	778	* init = 1 - initialize
801	*	779	*
802	* fontname == FONT_UP - switch to bigger font	780	* fontname == FONT_UP - switch to bigger font
803	* fontname == FONT_DN - switch to smaller font	781	* fontname == FONT_DN - switch to smaller font
804	*/	782	*/
805	bool	783	bool
806	rxvt_term::change_font (const char *fontname)	784	rxvt_term::set_fonts ()
807	{	785	{
808	if (fontname == FONT_UP)
809	{
810	// TODO
811	}
812	else if (fontname == FONT_DN)
813	{
814	// TODO
815	}
816	else
817	{
818	rxvt_fontset *fs = new rxvt_fontset (this);	786	rxvt_fontset *fs = new rxvt_fontset (this);
		787	rxvt_fontprop prop;
819		788
820	if (fs && fs->populate (fontname ? fontname : "fixed"))	789	if (!fs
		790	\|\| !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
		791	\|\| !fs->realize_font (1))
		792	{
		793	delete fs;
		794	return false;
		795	}
		796
		797	#if ENABLE_STYLES
		798	for (int i = RS_styleCount; --i; )
		799	if (TermWin.fontset[i] != TermWin.fontset[0])
		800	delete TermWin.fontset[i];
		801	#endif
		802
		803	delete TermWin.fontset[0];
		804	TermWin.fontset[0] = fs;
		805
		806	prop = (*fs)[1]->properties ();
		807	prop.height += TermWin.lineSpace;
		808	fs->set_prop (prop);
		809
		810	TermWin.fwidth = prop.width;
		811	TermWin.fheight = prop.height;
		812	TermWin.fweight = prop.weight;
		813	TermWin.fslant = prop.slant;
		814	TermWin.fbase = (*fs)[1]->ascent;
		815
		816	for (int style = 1; style < 4; style++)
		817	{
		818	#if ENABLE_STYLES
		819	const char *res = rs[Rs_font + style];
		820
		821	if (res && !*res)
		822	TermWin.fontset[style] = TermWin.fontset[0];
		823	else
821	{	824	{
822	delete TermWin.fontset;	825	TermWin.fontset[style] = fs = new rxvt_fontset (this);
823	TermWin.fontset = fs;	826	rxvt_fontprop prop2 = prop;
824	TermWin.fwidth = fs->base_font ()->width;
825	TermWin.fheight = fs->base_font ()->height;
826	TermWin.fbase = fs->base_font ()->ascent;
827		827
828	if (TermWin.parent[0])	828	if (res)
		829	prop2.weight = prop2.slant = rxvt_fontprop::unset;
		830	else
829	{	831	{
830	resize_all_windows (0, 0, 0);	832	res = TermWin.fontset[0]->fontdesc;
831	scr_remap_chars ();	833
832	scr_touch (true);	834	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
		835	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
833	}	836	}
834		837
835	for (unicode_t ch = 0x20; ch <= 0x7f; ch++)	838	fs->populate (res);
836	TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);	839	fs->set_prop (prop2);
837
838	return true;
839	}	840	}
		841	#else
		842	TermWin.fontset[style] = TermWin.fontset[0];
		843	#endif
		844	}
		845
		846	if (TermWin.parent[0])
840	}	847	{
		848	resize_all_windows (0, 0, 0);
		849	scr_remap_chars ();
		850	scr_touch (true);
		851	}
841		852
842	return false;	853	return true;
843	}	854	}
844		855
845	bool	856	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846	rxvt_term::font_up_down (int n, int direction)
847	{	857	{
848	return false;	858	// TODO: SMART_WINDOW_TITLE
		859	XChangeProperty (display->display, TermWin.parent[0],
		860	prop, XA_STRING, 8, PropModeReplace,
		861	(const unsigned char *)str, len >= 0 ? len : strlen (str));
		862	}
		863
		864	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
		865	{
		866	// TODO: SMART_WINDOW_TITLE
		867	wchar_t *ws = rxvt_mbstowcs (str, len);
		868	char *s = rxvt_wcstoutf8 (ws);
		869
		870	XChangeProperty (display->display, TermWin.parent[0],
		871	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
		872	(const unsigned char *)s, strlen (s));
		873
		874	free (s);
		875	free (ws);
849	}	876	}
850		877
851	/----------------------------------------------------------------------/	878	/----------------------------------------------------------------------/
852	/----------------------------------------------------------------------/	879	/----------------------------------------------------------------------/
853	/* xterm sequences - title, iconName, color (exptl) */	880	/* xterm sequences - title, iconName, color (exptl) */
854	void	881	void
855	rxvt_term::set_title (const char *str)	882	rxvt_term::set_title (const char *str)
856	{	883	{
857	#ifdef SMART_WINDOW_TITLE	884	set_string_property (XA_WM_NAME, str);
858	char *name;	885	#if ENABLE_FRILLS
859		886	set_utf8_property (xa[XA_NET_WM_NAME], str);
860	if (!XFetchName (display->display, TermWin.parent[0], &name))
861	name = NULL;
862
863	if (name == NULL \|\| strcmp (name, str))
864	#endif
865	XStoreName (display->display, TermWin.parent[0], str);
866
867	#ifdef SMART_WINDOW_TITLE
868	if (name)
869	XFree (name);
870	#endif	887	#endif
871	}	888	}
872		889
873	void	890	void
874	rxvt_term::set_icon_name (const char *str)	891	rxvt_term::set_icon_name (const char *str)
875	{	892	{
876	#ifdef SMART_WINDOW_TITLE	893	set_string_property (XA_WM_ICON_NAME, str);
877	char *name;	894	#if ENABLE_FRILLS
878		895	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
879	if (!XGetIconName (display->display, TermWin.parent[0], &name))
880	name = NULL;
881
882	if (name == NULL \|\| strcmp (name, str))
883	#endif
884	XSetIconName (display->display, TermWin.parent[0], str);
885
886	#ifdef SMART_WINDOW_TITLE
887	if (name)
888	XFree (name);
889	#endif	896	#endif
890	}	897	}
891		898
892	#ifdef XTERM_COLOR_CHANGE	899	#ifdef XTERM_COLOR_CHANGE
893	void	900	void
…		…
947		954
948	/* XSetWindowAttributes attr; */	955	/* XSetWindowAttributes attr; */
949	/* Cursor cursor; */	956	/* Cursor cursor; */
950	Done:	957	Done:
951	#ifdef OFF_FOCUS_FADING	958	#ifdef OFF_FOCUS_FADING
		959	if (rs[Rs_fade])
952	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));	960	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
953	#endif	961	#endif
954	if (idx == Color_bg && ! (options & Opt_transparent))
955	XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
956		962
957	/* handle Color_BD, scrollbar background, etc. */	963	/TODO: handle Color_BD, scrollbar background, etc. /
958		964
959	set_colorfgbg ();
960	recolour_cursor ();	965	recolour_cursor ();
961	scr_touch (true);	966	scr_recolour ();
962	}	967	}
963		968
964	#else	969	#else
965	# define set_window_color (idx,color) ((void)0)	970	# define set_window_color (idx,color) ((void)0)
966	#endif /* XTERM_COLOR_CHANGE */	971	#endif /* XTERM_COLOR_CHANGE */
…		…
968	void	973	void
969	rxvt_term::recolour_cursor ()	974	rxvt_term::recolour_cursor ()
970	{	975	{
971	XColor xcol[2];	976	XColor xcol[2];
972		977
973	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? pix_colors_focused[Color_pointer_fg] : pix_colors_focused[Color_fg];	978	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
974	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? pix_colors_focused[Color_pointer_bg] : pix_colors_focused[Color_bg];	979	? pix_colors_focused[Color_pointer_fg]
		980	: pix_colors_focused[Color_fg];
		981	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
		982	? pix_colors_focused[Color_pointer_bg]
		983	: pix_colors_focused[Color_bg];
		984
975	XQueryColors (display->display, display->cmap, xcol, 2);	985	XQueryColors (display->display, display->cmap, xcol, 2);
976	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	986	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
977	}	987	}
978		988
979	/----------------------------------------------------------------------/	989	/----------------------------------------------------------------------/
…		…
981	* find if fg/bg matches any of the normal (low-intensity) colors	991	* find if fg/bg matches any of the normal (low-intensity) colors
982	*/	992	*/
983	void	993	void
984	rxvt_term::set_colorfgbg ()	994	rxvt_term::set_colorfgbg ()
985	{	995	{
986	unsigned int i;	996	unsigned int i;
987	const char *xpmb = "\0";	997	const char *xpmb = "\0";
988	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	998	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
989		999
990	env_colorfgbg =
991	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);	1000	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992	strcpy (fstr, "default");	1001	strcpy (fstr, "default");
993	strcpy (bstr, "default");	1002	strcpy (bstr, "default");
994	for (i = Color_Black; i <= Color_White; i++)	1003	for (i = Color_Black; i <= Color_White; i++)
995	if (pix_colors[Color_fg] == pix_colors[i])	1004	if (pix_colors[Color_fg] == pix_colors[i])
996	{	1005	{
997	sprintf (fstr, "%d", (i - Color_Black));	1006	sprintf (fstr, "%d", (i - Color_Black));
998	break;	1007	break;
999	}	1008	}
		1009
1000	for (i = Color_Black; i <= Color_White; i++)	1010	for (i = Color_Black; i <= Color_White; i++)
1001	if (pix_colors[Color_bg] == pix_colors[i])	1011	if (pix_colors[Color_bg] == pix_colors[i])
1002	{	1012	{
1003	sprintf (bstr, "%d", (i - Color_Black));	1013	sprintf (bstr, "%d", (i - Color_Black));
1004	#ifdef XPM_BACKGROUND	1014	#ifdef XPM_BACKGROUND
…		…
1006	#endif	1016	#endif
1007	break;	1017	break;
1008	}	1018	}
1009		1019
1010	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1020	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1011
1012	#ifndef NO_BRIGHTCOLOR
1013	colorfgbg = DEFAULT_RSTYLE;
1014	for (i = minCOLOR; i <= maxCOLOR; i++)
1015	{
1016	if (pix_colors[Color_fg] == pix_colors[i])
1017	colorfgbg = SET_FGCOLOR (colorfgbg, i);
1018	if (pix_colors[Color_bg] == pix_colors[i])
1019	colorfgbg = SET_BGCOLOR (colorfgbg, i);
1020	}
1021	#endif
1022	}	1021	}
1023		1022
1024	/----------------------------------------------------------------------/	1023	/----------------------------------------------------------------------/
1025	/*
1026	* Colour determination for low colour displays, routine from
1027	* Hans de Goede <hans@highrise.nl>
1028	*/
1029		1024
1030	int	1025	int
1031	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	1026	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)
1032	{	1027	{
1033	if (!screen_in_out->set (display, colour))	1028	if (!screen_in_out->set (display, colour))
…		…
1252	}	1247	}
1253		1248
1254	void	1249	void
1255	rxvt_term::IMSendSpot ()	1250	rxvt_term::IMSendSpot ()
1256	{	1251	{
1257	XPoint spot;	1252	XPoint nspot;
1258	XVaNestedList preedit_attr;	1253	XVaNestedList preedit_attr;
1259		1254
1260	if (!Input_Context	1255	if (!Input_Context
1261	\|\| !TermWin.focus	1256	\|\| !TermWin.focus
1262	\|\| !(input_style & XIMPreeditPosition)	1257	\|\| !(input_style & XIMPreeditPosition))
1263	#if 0
1264	\|\| !(event_type == KeyPress
1265	\|\| event_type == Expose
1266	\|\| event_type == NoExpose
1267	\|\| event_type == SelectionNotify
1268	\|\| event_type == ButtonRelease \|\| event_type == FocusIn)
1269	#endif
1270	\|\| !IMisRunning ())
1271	return;	1258	return;
1272		1259
1273	im_set_position (spot);	1260	im_set_position (nspot);
		1261
		1262	if (nspot.x == spot.x && nspot.y == spot.y)
		1263	return;
		1264
		1265	spot = nspot;
1274		1266
1275	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);	1267	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1276	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1268	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1277	XFree (preedit_attr);	1269	XFree (preedit_attr);
1278	}	1270	}
1279		1271
1280	void	1272	void
1281	rxvt_term::im_destroy ()	1273	rxvt_term::im_destroy ()
1282	{	1274	{
1283	if (Input_Context)
1284	{
1285	XDestroyIC (Input_Context);
1286	Input_Context = 0;
1287	}
1288
1289	if (input_method)	1275	if (input_method)
1290	{	1276	{
		1277	if (Input_Context && input_method->xim)
		1278	XDestroyIC (Input_Context);
		1279
1291	display->put_xim (input_method);	1280	display->put_xim (input_method);
1292	input_method = 0;	1281	input_method = 0;
1293	}	1282	}
		1283
		1284	Input_Context = 0;
1294	}	1285	}
1295		1286
1296	/*	1287	/*
1297	* Try to open a XIM with the current modifiers, then see if we can	1288	* Try to open a XIM with the current modifiers, then see if we can
1298	* open a suitable preedit type	1289	* open a suitable preedit type
…		…
1316	input_method = display->get_xim (locale, modifiers);	1307	input_method = display->get_xim (locale, modifiers);
1317	if (input_method == NULL)	1308	if (input_method == NULL)
1318	return false;	1309	return false;
1319		1310
1320	xim = input_method->xim;	1311	xim = input_method->xim;
		1312	spot.x = spot.y = -1;
1321		1313
1322	xim_styles = NULL;	1314	xim_styles = NULL;
1323	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)	1315	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1324	\|\| !xim_styles \|\| !xim_styles->count_styles)	1316	\|\| !xim_styles \|\| !xim_styles->count_styles)
1325	{	1317	{
1326	im_destroy ();	1318	im_destroy ();
1327	return false;	1319	return false;
1328	}	1320	}
1329		1321
1330	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";	1322	const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
		1323
		1324	for (int pi = 0; pi < 2; pi++)
		1325	{
		1326	p = pet[pi];
		1327
		1328	if (!p)
		1329	continue;
		1330
1331	s = rxvt_splitcommastring (p);	1331	s = rxvt_splitcommastring (p);
1332		1332
1333	for (i = found = 0; !found && s[i]; i++)	1333	for (i = found = 0; !found && s[i]; i++)
1334	{	1334	{
1335	if (!strcmp (s[i], "OverTheSpot"))	1335	if (!strcmp (s[i], "OverTheSpot"))
1336	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1336	input_style = (XIMPreeditPosition \| XIMStatusNothing);
1337	else if (!strcmp (s[i], "OffTheSpot"))	1337	else if (!strcmp (s[i], "OffTheSpot"))
1338	input_style = (XIMPreeditArea \| XIMStatusArea);	1338	input_style = (XIMPreeditArea \| XIMStatusArea);
1339	else if (!strcmp (s[i], "Root"))	1339	else if (!strcmp (s[i], "Root"))
1340	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1340	input_style = (XIMPreeditNothing \| XIMStatusNothing);
		1341	else if (!strcmp (s[i], "None"))
		1342	input_style = (XIMPreeditNone \| XIMStatusNone);
1341		1343
1342	for (j = 0; j < xim_styles->count_styles; j++)	1344	for (j = 0; j < xim_styles->count_styles; j++)
1343	if (input_style == xim_styles->supported_styles[j])	1345	if (input_style == xim_styles->supported_styles[j])
1344	{	1346	{
		1347	rxvt_freecommastring (s);
		1348
1345	found = 1;	1349	found = 1;
1346	break;	1350	goto foundpet;
		1351	}
		1352
1347	}	1353	}
1348	}
1349		1354
1350	for (i = 0; s[i]; i++)	1355	rxvt_freecommastring (s);
1351	free (s[i]);	1356	}
1352		1357
1353	free (s);	1358	foundpet:
		1359
1354	XFree (xim_styles);	1360	XFree (xim_styles);
1355		1361
1356	if (!found)	1362	if (!found)
1357	{	1363	{
1358	im_destroy ();	1364	im_destroy ();
…		…
1483	if (p && *p)	1489	if (p && *p)
1484	{	1490	{
1485	bool found = false;	1491	bool found = false;
1486		1492
1487	s = rxvt_splitcommastring (p);	1493	s = rxvt_splitcommastring (p);
		1494
1488	for (i = 0; s[i]; i++)	1495	for (i = 0; s[i]; i++)
1489	{	1496	{
1490	if (*s[i])	1497	if (*s[i])
1491	{	1498	{
1492	strcpy (buf, "@im=");	1499	strcpy (buf, "@im=");
…		…
1496	found = true;	1503	found = true;
1497	break;	1504	break;
1498	}	1505	}
1499	}	1506	}
1500	}	1507	}
1501	for (i = 0; s[i]; i++)	1508
1502	free (s[i]);	1509	rxvt_freecommastring (s);
1503	free (s);
1504		1510
1505	if (found)	1511	if (found)
1506	goto done;	1512	goto done;
1507	}	1513	}
1508		1514

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC vs. Revision 1.128 by root, Mon Jan 17 00:59:23 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.94 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.128 by root, Mon Jan 17 00:59:23 2005 UTC