[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.85 by elmex, Wed Apr 12 12:55:56 2006 UTC vs.
Revision 1.113 by root, Sat Apr 15 12:46:48 2006 UTC

…		…
7		7
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $TOPLEVEL;	12	our $ROOT;
13	our $BUTTON_STATE;	13	our $BUTTON_STATE;
14		14
15	# class methods for events	15	# class methods for events
16	sub feed_sdl_key_down_event {	16	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	17	$FOCUS->key_down ($_[0]) if $FOCUS;
…		…
24	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	25	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $TOPLEVEL->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
30		30
31	$GRAB = $widget;	31	$GRAB = $widget;
32	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
33	}	33	}
34		34
35	$BUTTON_STATE \|= 1 << ($ev->button - 1);	35	$BUTTON_STATE \|= 1 << ($ev->button - 1);
36		36
37	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	38	}
39		39
40	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	41	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43		43
44	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
45		45
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
47		47
48	$GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		49
50	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	52	$grab->update if $grab;
53	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
56		56
57	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
58	my ($ev) = @_;	58	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60		60
61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
62		62
63	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
65		65
66	$hover->update if $hover;	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER;	67	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}	68	}
69		69
70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
		71	}
		72
		73	# convert position array to integers
		74	sub harmonize {
		75	my ($vals) = @_;
		76
		77	my $rem = 0;
		78
		79	for ($vals) {
		80	my $i = int $_ + $rem;
		81	$rem += $_ - $i;
		82	$_ = $i;
		83	}
71	}	84	}
72		85
73	#############################################################################	86	#############################################################################
74		87
75	package CFClient::UI::Base;	88	package CFClient::UI::Base;
…		…
133	my ($self, $x, $y, $w, $h) = @_;	146	my ($self, $x, $y, $w, $h) = @_;
134		147
135	$self->_size_allocate ($x, $y, $w, $h);	148	$self->_size_allocate ($x, $y, $w, $h);
136	}	149	}
137		150
		151	# return top left coordinates
		152	sub _topleft {
		153	my ($self, $x, $y) = @_;
		154
		155	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
		156	}
		157
138	# translate global coordinates to local coordinate system	158	# translate global coordinates to local coordinate system
139	sub translate {	159	sub coord2local {
140	my ($self, $x, $y) = @_;	160	my ($self, $x, $y) = @_;
141		161
142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	162	my ($X, $Y) = $self->_topleft;
		163	($x - $X, $y - $Y)
		164	}
		165
		166	# translate local coordinates to global coordinate system
		167	sub coord2global {
		168	my ($self, $x, $y) = @_;
		169
		170	my ($X, $Y) = $self->_topleft;
		171	($x + $X, $y + $Y)
143	}	172	}
144		173
145	sub focus_in {	174	sub focus_in {
146	my ($self) = @_;	175	my ($self) = @_;
147		176
148	return if $FOCUS == $self;	177	return if $FOCUS == $self;
		178	return unless $self->{can_focus};
149		179
150	my $focus = $FOCUS; $FOCUS = $self;	180	my $focus = $FOCUS; $FOCUS = $self;
151	$focus->update if $focus;	181	$focus->update if $focus;
152	$FOCUS->update;	182	$FOCUS->update;
153	}	183	}
…		…
186	glPushMatrix;	216	glPushMatrix;
187	glTranslate $self->{x}, $self->{y}, 0;	217	glTranslate $self->{x}, $self->{y}, 0;
188	$self->_draw;	218	$self->_draw;
189	glPopMatrix;	219	glPopMatrix;
190		220
191	if ($self == $HOVER) {	221	if ($self == $HOVER && $self->{can_hover}) {
192	my ($x, $y) = @$self{qw(x y)};	222	my ($x, $y) = @$self{qw(x y)};
193		223
194	glColor 0, 0, 1, 0.2;	224	glColor 0, 0, 1, 0.2;
195	glEnable GL_BLEND;	225	glEnable GL_BLEND;
196	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	226	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
219		249
220	()	250	()
221	}	251	}
222		252
223	sub set_parent {	253	sub set_parent {
224	my ($self, $par) = @_;	254	my ($self, $parent) = @_;
225		255
226	$self->{parent} = $par;
227	Scalar::Util::weaken $self->{parent};	256	Scalar::Util::weaken ($self->{parent} = $parent);
228	}
229
230	sub get_parent {
231	$_[0]->{parent}
232	}	257	}
233		258
234	sub update {	259	sub update {
235	my ($self) = @_;	260	my ($self) = @_;
236		261
…		…
325		350
326	$self	351	$self
327	}	352	}
328		353
329	sub add {	354	sub add {
330	my ($self, $chld) = @_;	355	my ($self, $child) = @_;
331		356
332	$chld->set_parent ($self);	357	$child->set_parent ($self);
		358
		359	use sort 'stable';
333		360
334	$self->{children} = [	361	$self->{children} = [
335	sort { $a->{z} <=> $b->{z} }	362	sort { $a->{z} <=> $b->{z} }
336	@{$self->{children}}, $chld	363	@{$self->{children}}, $child
337	];	364	];
338		365
339	$self->{w} = $self->{h} = -1;	366	$self->{w} = $self->{h} = -1;
340	$self->update;	367	$self->update;
341	}	368	}
…		…
438	}	465	}
439		466
440	sub render_chld {	467	sub render_chld {
441	my ($self) = @_;	468	my ($self) = @_;
442		469
443	$self->{texture} =	470	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
444	CFClient::Texture->new_from_opengl (	471	glClearColor 0, 0, 0, 1;
445	$self->{w}, $self->{h}, sub { $self->child->draw }	472	glClear GL_COLOR_BUFFER_BIT;
446	);	473	$self->child->draw;
		474	};
447	}	475	}
448		476
449	sub size_allocate {	477	sub size_allocate {
450	my ($self, $x, $y, $w, $h) = @_;	478	my ($self, $x, $y, $w, $h) = @_;
451		479
…		…
529		557
530	my @tex =	558	my @tex =
531	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	559	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	560	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533		561
		562	sub new {
		563	my $class = shift;
		564
		565	# TODO: user_x, user_y, overwrite moveto?
		566
		567	$class->SUPER::new (
		568	bg => [1, 1, 1, 1],
		569	border_bg => [1, 1, 1, 1],
		570	border => $::FONTSIZE * 0.8,
		571	@_
		572	)
		573	}
		574
534	sub size_request {	575	sub size_request {
535	my ($self) = @_;	576	my ($self) = @_;
536		577
537	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};	578	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538		579
539	my ($w, $h) = $self->SUPER::size_request;	580	my ($w, $h) = $self->SUPER::size_request;
540		581
541	$h += $tex[1]->{h};	582	(
542	$h += $tex[4]->{h};	583	$w + $self->{border} * 2,
543	$w += $tex[2]->{w};	584	$h + $self->{border} * 2,
544	$w += $tex[3]->{w};	585	)
545
546	($w, $h)
547	}	586	}
548		587
549	sub size_allocate {	588	sub size_allocate {
550	my ($self, $x, $y, $w, $h) = @_;	589	my ($self, $x, $y, $w, $h) = @_;
551		590
552	$self->_size_allocate ($x, $y, $w, $h) or return;	591	$self->_size_allocate ($x, $y, $w, $h) or return;
553		592
554	$h -= $tex[1]{h};	593	$h -= List::Util::max 0, $self->{border} * 2;
555	$h -= $tex[4]{h};	594	$w -= List::Util::max 0, $self->{border} * 2;
556	$w -= $tex[2]{w};
557	$w -= $tex[3]{w};
558		595
559	$h = $h < 0 ? 0 : $h;	596	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
560	$w = $w < 0 ? 0 : $w;
561
562	my $child = $self->child;
563
564	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565	}	597	}
566		598
567	sub button_down {	599	sub button_down {
568	my ($self, $ev, $x, $y) = @_;	600	my ($self, $ev, $x, $y) = @_;
569		601
570	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}	602	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
571	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {	603	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
572		604
573	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	605	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574	my ($bw, $bh) = ($self->{w}, $self->{h});	606	my ($bw, $bh) = ($self->{w}, $self->{h});
575		607
576	$self->{motion} = sub {	608	$self->{motion} = sub {
…		…
582	$self->{user_h} = $bh + $y - $oy;	614	$self->{user_h} = $bh + $y - $oy;
583	$self->update;	615	$self->update;
584	};	616	};
585		617
586	} elsif ($x >= 0 && $x < $self->{w}	618	} elsif ($x >= 0 && $x < $self->{w}
587	&& $y >= 0 && $y < $tex[1]{h}) {	619	&& $y >= 0 && $y < $self->{border}) {
588		620
589	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	621	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590	my ($bx, $by) = ($self->{x}, $self->{y});	622	my ($bx, $by) = ($self->{x}, $self->{y});
591		623
592	$self->{motion} = sub {	624	$self->{motion} = sub {
…		…
613	}	645	}
614		646
615	sub _draw {	647	sub _draw {
616	my ($self) = @_;	648	my ($self) = @_;
617		649
618	my ($w, $h) = ($self->{w}, $self->{h});	650	my ($w, $h ) = ($self->{w}, $self->{h});
619	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	651	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620		652
621	glEnable GL_BLEND;	653	glEnable GL_BLEND;
622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	654	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623	glEnable GL_TEXTURE_2D;	655	glEnable GL_TEXTURE_2D;
624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	656	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625		657
626	my $top = $tex[1];	658	glColor @{ $self->{border_bg} };
627	$top->draw_quad (0, 0, $w, $top->{h});	659	$tex[1]->draw_quad (0, 0, $w, $self->{border});
628		660	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
629	my $left = $tex[3];	661	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
630	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	662	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
631
632	my $right = $tex[2];
633	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635	my $bottom = $tex[4];
636	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637		663
638	my $bg = $tex[0];	664	my $bg = $tex[0];
639		665
640	glBindTexture GL_TEXTURE_2D, $bg->{name};	666	# TODO: repeat texture not scale
641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642
643	my $rep_x = $cw / $bg->{w};	667	my $rep_x = $cw / $bg->{w};
644	my $rep_y = $ch / $bg->{h};	668	my $rep_y = $ch / $bg->{h};
645		669
		670	glColor @{ $self->{bg} };
		671
		672	$bg->{s} = $rep_x;
		673	$bg->{t} = $rep_y;
		674	$bg->{wrap_mode} = 1;
646	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	675	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
647		676
648	glDisable GL_TEXTURE_2D;	677	glDisable GL_TEXTURE_2D;
649	glDisable GL_BLEND;	678	glDisable GL_BLEND;
650		679
651	$self->child->draw;	680	$self->child->draw;
652
653	}	681	}
654		682
655	#############################################################################	683	#############################################################################
656		684
657	package CFClient::UI::Table;	685	package CFClient::UI::Table;
…		…
670	@_	698	@_
671	)	699	)
672	}	700	}
673		701
674	sub add {	702	sub add {
675	my ($self, $x, $y, $chld) = @_;	703	my ($self, $x, $y, $child) = @_;
676		704
		705	$child->set_parent ($self);
677	$self->{children}[$y][$x] = $chld;	706	$self->{children}[$y][$x] = $child;
678	$chld->set_parent ($self);
679		707
680	$self->{w} = $self->{h} = -1;	708	$self->{w} = $self->{h} = -1;
681	$self->update;	709	$self->update;
682	}	710	}
683		711
…		…
730	my $col_expand = (sum @col_expand) \|\| 1;	758	my $col_expand = (sum @col_expand) \|\| 1;
731		759
732	# linearly scale sizes	760	# linearly scale sizes
733	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	761	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	762	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		763
		764	CFClient::UI::harmonize $ws;
		765	CFClient::UI::harmonize $hs;
735		766
736	my $y;	767	my $y;
737		768
738	for my $r (0 .. $#{$self->{children}}) {	769	for my $r (0 .. $#{$self->{children}}) {
739	my $row = $self->{children}[$r]	770	my $row = $self->{children}[$r]
…		…
801	}	832	}
802		833
803	sub size_allocate {	834	sub size_allocate {
804	my ($self, $x, $y, $w, $h) = @_;	835	my ($self, $x, $y, $w, $h) = @_;
805		836
806	$self->_size_allocate ($x, $y, $w, $h) or return;	837	$self->_size_allocate ($x, $y, $w, $h);
807
808	return unless $self->{w};
809		838
810	($h, $w) = ($w, $h);	839	($h, $w) = ($w, $h);
811		840
812	my $children = $self->{children};	841	my $children = $self->{children};
813		842
…		…
829	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	858	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830	$h[$_] = $alloc_h;	859	$h[$_] = $alloc_h;
831	}	860	}
832	}	861	}
833		862
		863	CFClient::UI::harmonize \@h;
		864
834	my $y = 0;	865	my $y = 0;
835	for (0 .. $#$children) {	866	for (0 .. $#$children) {
836	my $child = $children->[$_];	867	my $child = $children->[$_];
837	my $h = $h[$_];	868	my $h = $h[$_];
838	$child->size_allocate ($y, 0, $h, $w);	869	$child->size_allocate ($y, 0, $h, $w);
…		…
861	}	892	}
862		893
863	sub size_allocate {	894	sub size_allocate {
864	my ($self, $x, $y, $w, $h) = @_;	895	my ($self, $x, $y, $w, $h) = @_;
865		896
866	$self->_size_allocate ($x, $y, $w, $h) or return;	897	$self->_size_allocate ($x, $y, $w, $h);
867
868	return unless $self->{h};
869		898
870	my $children = $self->{children};	899	my $children = $self->{children};
871		900
872	my @h = map +($_->size_request)[1], @$children;	901	my @h = map +($_->size_request)[1], @$children;
873		902
…		…
885		914
886	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	915	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
887	}	916	}
888	}	917	}
889		918
		919	CFClient::UI::harmonize \@h;
		920
890	my $y = 0;	921	my $y = 0;
891	for (0 .. $#$children) {	922	for (0 .. $#$children) {
892	my $child = $children->[$_];	923	my $child = $children->[$_];
893	my $h = $h[$_];	924	my $h = $h[$_];
894	$child->size_allocate (0, $y, $w, $h);	925	$child->size_allocate (0, $y, $w, $h);
…		…
907		938
908	sub new {	939	sub new {
909	my ($class, %arg) = @_;	940	my ($class, %arg) = @_;
910		941
911	my $self = $class->SUPER::new (	942	my $self = $class->SUPER::new (
912	fg => [1, 1, 1],	943	fg => [1, 1, 1],
913	height => $::FONTSIZE,	944	fontsize => $::FONTSIZE,
914	text => "",	945	text => "",
915	align => -1,	946	align => -1,
916	padding => 2,	947	padding => 2,
917	layout => new CFClient::Layout,	948	layout => new CFClient::Layout,
918	%arg	949	%arg
919	);	950	);
920		951
921	$self->set_text ($self->{text});	952	$self->set_text ($self->{text});
922		953
…		…
952		983
953	sub size_request {	984	sub size_request {
954	my ($self) = @_;	985	my ($self) = @_;
955		986
956	$self->{layout}->set_width;	987	$self->{layout}->set_width;
957	$self->{layout}->set_height ($self->{height});	988	$self->{layout}->set_height ($self->{fontsize});
958	my ($w, $h) = $self->{layout}->size;	989	my ($w, $h) = $self->{layout}->size;
959		990
960	(	991	(
961	$w + $self->{padding} * 2,	992	$w + $self->{padding} * 2,
962	$h + $self->{padding} * 2,	993	$h + $self->{padding} * 2,
…		…
981	sub _draw {	1012	sub _draw {
982	my ($self) = @_;	1013	my ($self) = @_;
983		1014
984	my $tex = $self->{texture} \|\|= do {	1015	my $tex = $self->{texture} \|\|= do {
985	$self->{layout}->set_width ($self->{w});	1016	$self->{layout}->set_width ($self->{w});
986	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1017	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
987	new_from_layout CFClient::Texture $self->{layout}	1018	new_from_layout CFClient::Texture $self->{layout}
988	};	1019	};
989		1020
990	glEnable GL_BLEND;	1021	glEnable GL_BLEND;
991	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1022	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
992	glEnable GL_TEXTURE_2D;	1023	glEnable GL_TEXTURE_2D;
993	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1024	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
994		1025
995	glColor @{$self->{fg}};	1026	glColor @{$self->{fg}};
996		1027
997	my $x =	1028	my $x =
998	$self->{align} < 0 ? $self->{padding}	1029	$self->{align} < 0 ? $self->{padding}
999	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1030	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1000	: ($self->{w} - $tex->{w}) * 0.5;	1031	: ($self->{w} - $tex->{w}) * 0.5;
1001		1032
1002	glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;	1033	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1003	$tex->draw_quad (0, 0);
1004		1034
1005	glDisable GL_TEXTURE_2D;	1035	glDisable GL_TEXTURE_2D;
1006	glDisable GL_BLEND;	1036	glDisable GL_BLEND;
1007	}	1037	}
1008		1038
…		…
1021	$class->SUPER::new (	1051	$class->SUPER::new (
1022	fg => [1, 1, 1],	1052	fg => [1, 1, 1],
1023	bg => [0, 0, 0, 0.2],	1053	bg => [0, 0, 0, 0.2],
1024	active_bg => [1, 1, 1, 0.5],	1054	active_bg => [1, 1, 1, 0.5],
1025	active_fg => [0, 0, 0],	1055	active_fg => [0, 0, 0],
		1056	can_hover => 1,
		1057	can_focus => 1,
1026	@_	1058	@_
1027	)	1059	)
1028	}	1060	}
1029		1061
1030	sub _set_text {	1062	sub _set_text {
1031	my ($self, $text) = @_;	1063	my ($self, $text) = @_;
1032		1064
		1065	my $old_text = $self->{text};
		1066
1033	$self->{last_activity} = $::NOW;	1067	$self->{last_activity} = $::NOW;
1034		1068
1035	$self->{text} = $text;	1069	$self->{text} = $text;
1036	$self->{layout}->set_width ($self->{w});	1070	$self->{layout}->set_width ($self->{w});
1037	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1071	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1038		1072
1039	$text =~ s/./*/g if $self->{hidden};	1073	$text =~ s/./*/g if $self->{hidden};
1040		1074
1041	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1075	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
1042		1076
1043	$text = substr $text, 0, $self->{cursor};	1077	$text = substr $text, 0, $self->{cursor};
1044	utf8::encode $text;	1078	utf8::encode $text;
1045		1079
1046	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	1080	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1081
		1082	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
		1083	if $old_text ne $self->{text};
1047	}	1084	}
1048		1085
1049	sub size_request {	1086	sub size_request {
1050	my ($self) = @_;	1087	my ($self) = @_;
1051		1088
…		…
1090	++$self->{cursor} if $self->{cursor} < length $self->{text};	1127	++$self->{cursor} if $self->{cursor} < length $self->{text};
1091	} elsif ($sym == SDLK_HOME) {	1128	} elsif ($sym == SDLK_HOME) {
1092	$self->{cursor} = 0;	1129	$self->{cursor} = 0;
1093	} elsif ($sym == SDLK_END) {	1130	} elsif ($sym == SDLK_END) {
1094	$self->{cursor} = length $text;	1131	$self->{cursor} = length $text;
		1132	} elsif ($sym == SDLK_ESCAPE) {
		1133	$self->emit ('escape');
1095	} elsif ($uni) {	1134	} elsif ($uni) {
1096	substr $text, $self->{cursor}++, 0, chr $uni;	1135	substr $text, $self->{cursor}++, 0, chr $uni;
1097	}	1136	}
1098		1137
1099	$self->_set_text ($text);	1138	$self->_set_text ($text);
…		…
1161	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1200	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1162	glEnd;	1201	glEnd;
1163	}	1202	}
1164	}	1203	}
1165		1204
		1205	package CFClient::UI::LineEntry;
		1206
		1207	our @ISA = CFClient::UI::Entry::;
		1208
		1209	use SDL;
		1210	use SDL::OpenGL;
		1211
		1212	sub key_down {
		1213	my ($self, $ev) = @_;
		1214
		1215	my $sym = $ev->key_sym;
		1216
		1217	if ($sym == SDLK_RETURN) {
		1218	$self->emit (activate => $self->get_text);
		1219	$self->update;
		1220
		1221	} else {
		1222	$self->SUPER::key_down ($ev);
		1223	}
		1224
		1225	}
		1226
1166	#############################################################################	1227	#############################################################################
1167		1228
1168	package CFClient::UI::Button;	1229	package CFClient::UI::Button;
1169		1230
1170	our @ISA = CFClient::UI::Label::;	1231	our @ISA = CFClient::UI::Label::;
…		…
1182	$class->SUPER::new (	1243	$class->SUPER::new (
1183	padding => 4,	1244	padding => 4,
1184	fg => [1, 1, 1],	1245	fg => [1, 1, 1],
1185	bg => [1, 1, 1, 0.2],	1246	bg => [1, 1, 1, 0.2],
1186	active_fg => [1, 1, 0],	1247	active_fg => [1, 1, 0],
1187	# active_bg => [0, 0, 0, 0.5],	1248	can_hover => 1,
1188	# border_fg => [1, 1, 0],
1189	@_	1249	@_
1190	)	1250	)
1191	}	1251	}
1192		1252
1193	sub button_up {	1253	sub button_up {
…		…
1224	$self->SUPER::_draw;	1284	$self->SUPER::_draw;
1225	}	1285	}
1226		1286
1227	#############################################################################	1287	#############################################################################
1228		1288
1229	package CFClient::UI::Slider;	1289	package CFClient::UI::CheckBox;
1230		1290
1231	use strict;	1291	our @ISA = CFClient::UI::DrawBG::;
1232		1292
		1293	my @tex =
		1294	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1295	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1296
		1297	use SDL;
1233	use SDL::OpenGL;	1298	use SDL::OpenGL;
1234
1235	our @ISA = CFClient::UI::DrawBG::;
1236		1299
1237	sub new {	1300	sub new {
1238	my $class = shift;	1301	my $class = shift;
1239		1302
		1303	$class->SUPER::new (
		1304	padding => 2,
		1305	fg => [1, 1, 1],
		1306	active_fg => [1, 1, 0],
		1307	state => 0,
		1308	can_hover => 1,
		1309	@_
		1310	)
		1311	}
		1312
		1313	sub size_request {
		1314	my ($self) = @_;
		1315
		1316	($self->{padding} * 2 + 6) x 2
		1317	}
		1318
		1319	sub size_allocate {
		1320	my ($self, $x, $y, $w, $h) = @_;
		1321
		1322	$self->_size_allocate ($x, $y, $w, $h);
		1323	}
		1324
		1325	sub button_down {
		1326	my ($self, $ev, $x, $y) = @_;
		1327
		1328	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1329	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1330	$self->{state} = !$self->{state};
		1331	$self->emit (changed => $self->{state});
		1332	}
		1333	}
		1334
		1335	sub _draw {
		1336	my ($self) = @_;
		1337
		1338	$self->SUPER::_draw;
		1339
		1340	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1341
		1342	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1343
		1344	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1345
		1346	glEnable GL_BLEND;
		1347	glEnable GL_TEXTURE_2D;
		1348	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1349
		1350	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1351
		1352	$tex->draw_quad (0, 0, $s, $s);
		1353
		1354	glDisable GL_TEXTURE_2D;
		1355	glDisable GL_BLEND;
		1356	}
		1357
		1358	#############################################################################
		1359
		1360	package CFClient::UI::Slider;
		1361
		1362	use strict;
		1363
		1364	use SDL::OpenGL;
		1365
		1366	our @ISA = CFClient::UI::DrawBG::;
		1367
		1368	my @tex =
		1369	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1370	qw(s1_slider.png s1_slider_bg.png);
		1371
		1372	sub new {
		1373	my $class = shift;
		1374
1240	# range [value, low, high, page]	1375	# range [value, low, high, page]
1241		1376
		1377	# TODO: 0-width page
		1378	# TODO: req_w/h are wrong with vertical
		1379	# TODO: calculations are off
1242	my $self = $class->SUPER::new (	1380	my $self = $class->SUPER::new (
1243	fg => [1, 1, 1],	1381	fg => [1, 1, 1],
1244	active_fg => [0, 0, 0],	1382	active_fg => [0, 0, 0],
1245	range => [0, 0, 100, 10],	1383	range => [0, 0, 100, 10],
1246	req_w => 40,	1384	req_w => 40,
1247	req_h => 10,	1385	req_h => 13,
1248	vertical => 0,	1386	vertical => 0,
		1387	can_hover => 1,
		1388	inner_pad => 5,
1249	@_	1389	@_
1250	);	1390	);
1251		1391
1252	$self	1392	$self
1253	}	1393	}
…		…
1274	if ($GRAB == $self) {	1414	if ($GRAB == $self) {
1275	my ($value, $lo, $hi, $page) = @{$self->{range}};	1415	my ($value, $lo, $hi, $page) = @{$self->{range}};
1276		1416
1277	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1417	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1278		1418
		1419	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1420	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1421
		1422	$x -= $inner_pad_px; # substract the padding
1279	$x = $x * ($hi - $lo) / $w + $lo;	1423	$x = $x * ($hi - $lo) / $inner_w + $lo;
1280	$x = $lo if $x < $lo;	1424	$x = $lo if $x < $lo;
1281	$x = $hi - $page if $x > $hi - $page;	1425	$x = $hi - $page if $x > $hi - $page;
1282	$self->{range}[0] = $x;	1426	$self->{range}[0] = $x;
1283		1427
1284	$self->emit (changed => $x);	1428	$self->emit (changed => $x);
1285	$self->update;	1429	$self->update;
1286	}	1430	}
		1431	}
		1432
		1433	# the inner_* stuff is for generating a padding for the slider handle,
		1434	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1435	# correct propably, but it does the job for now
		1436	sub _calc_inner_pad_px {
		1437	my ($self, $w) = @_;
		1438	($w / 100) * $self->{inner_pad} # % to pixels
1287	}	1439	}
1288		1440
1289	sub _draw {	1441	sub _draw {
1290	my ($self) = @_;	1442	my ($self) = @_;
1291		1443
…		…
1305	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1457	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1306	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1458	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1307		1459
1308	my ($value, $lo, $hi, $page) = @{$self->{range}};	1460	my ($value, $lo, $hi, $page) = @{$self->{range}};
1309		1461
		1462	$hi = $value + 1 if $lo == $hi;
		1463
		1464	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1465	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1466
1310	$page = int $page * $w / ($hi - $lo);	1467	$page = int $page * $inner_w / ($hi - $lo);
1311	$value = int +($value - $lo) * $w / ($hi - $lo);	1468	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1312		1469
1313	$w -= $page;	1470	$w -= $page;
1314	$page &= ~1;	1471	$page &= ~1;
1315	glTranslate $page * 0.5, 0, 0;	1472	glTranslate $page * 0.5, 0, 0;
1316	$page \|\|= 2;	1473	$page \|\|= 2;
1317		1474
1318	glColor @$fg;
1319	glBegin GL_LINES;
1320	glVertex 0, 0; glVertex 0, $h;
1321	glVertex $w - 1, 0; glVertex $w - 1, $h;
1322	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1323	glEnd;
1324
1325	my $knob_a = $value - $page * 0.5;	1475	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1326	my $knob_b = $value + $page * 0.5;	1476	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1327		1477
1328	glBegin GL_QUADS;	1478	glEnable GL_BLEND;
1329	glColor @$fg;	1479	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1330	glVertex $knob_a, 0;	1480	glEnable GL_TEXTURE_2D;
1331	glVertex $knob_a, $h;	1481	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1332	glVertex $knob_b, $h;
1333	glVertex $knob_b, 0;
1334		1482
1335	if ($knob_a < $knob_b - 2) {	1483	# draw background
1336	glColor @$bg;	1484	$tex[1]->draw_quad (0, 0, $w, $h);
1337	glVertex $knob_a + 1, 1;	1485
1338	glVertex $knob_a + 1, $h - 1;	1486	# draw handle
1339	glVertex $knob_b - 1, $h - 1;	1487	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1340	glVertex $knob_b - 1, 1;	1488
		1489	glDisable GL_BLEND;
		1490	glDisable GL_TEXTURE_2D;
		1491	}
		1492
		1493	#############################################################################
		1494
		1495	package CFClient::UI::TextView;
		1496
		1497	our @ISA = CFClient::UI::HBox::;
		1498
		1499	use SDL::OpenGL;
		1500
		1501	sub new {
		1502	my $class = shift;
		1503
		1504	my $self = $class->SUPER::new (
		1505	req_w => $::WIDTH / 6,
		1506	req_h => $::HEIGHT / 6,
		1507	fontsize => $::FONTSIZE,
		1508	@_,
		1509
		1510	layout => (new CFClient::Layout),
		1511	par => [],
		1512	height => 0,
		1513	children => [
		1514	(new CFClient::UI::Empty expand => 1),
		1515	(new CFClient::UI::Slider vertical => 1),
		1516	],
		1517	);
		1518
		1519	$self->{children}[1]->connect (changed => sub {
		1520	$self->update;
		1521	});
		1522
		1523	$self
		1524	}
		1525
		1526	sub set_fontsize {
		1527	my ($self, $fontsize) = @_;
		1528
		1529	$self->{fontsize} = $fontsize;
		1530	$self->reflow;
		1531	}
		1532
		1533	sub text_height {
		1534	my ($self, $text) = @_;
		1535
		1536	my $layout = $self->{layout};
		1537
		1538	$layout->set_height ($self->{fontsize});
		1539	$layout->set_width ($self->{w});
		1540	$layout->set_text ($text);
1341	}	1541
1342	glEnd;	1542	($layout->size)[1]
		1543	}
		1544
		1545	sub reflow {
		1546	my ($self) = @_;
		1547
		1548	$self->{need_reflow}++;
		1549	$self->update;
		1550	}
		1551
		1552	sub size_request {
		1553	my ($self) = @_;
		1554
		1555	($self->{req_w}, $self->{req_h})
		1556	}
		1557
		1558	sub size_allocate {
		1559	my ($self, $x, $y, $w, $h) = @_;
		1560
		1561	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1562
		1563	$self->{layout}->set_height ($self->{fontsize});
		1564	$self->{layout}->set_width ($self->{w});
		1565
		1566	$self->reflow;
		1567	}
		1568
		1569	sub add_paragraph {
		1570	my ($self, $color, $text) = @_;
		1571
		1572	#TODO: intelligently "reformat" paragraph
		1573
		1574	my $height = $self->text_height ($text);
		1575
		1576	$self->{height} += $height;
		1577
		1578	push @{$self->{par}}, [$height, $color, $text];
		1579
		1580	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1581	$self->{children}[1]->update;
		1582	}
		1583
		1584	sub update {
		1585	my ($self) = @_;
		1586
		1587	$self->SUPER::update;
		1588
		1589	return unless $self->{h} > 0;
		1590
		1591	delete $self->{texture};
		1592
		1593	$ROOT->on_refresh ($self, sub {
		1594	if (delete $self->{need_reflow}) {
		1595	my $height = 0;
		1596
		1597	$height += $_->[0] = $self->text_height ($_->[2])
		1598	for @{$self->{par}};
		1599
		1600	$self->{height} = $height;
		1601
		1602	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1603
		1604	delete $self->{texture};
		1605	}
		1606
		1607	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1608	glClearColor 0, 0, 0, 1;
		1609	glClear GL_COLOR_BUFFER_BIT;
		1610
		1611	glEnable GL_BLEND;
		1612	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1613	glEnable GL_TEXTURE_2D;
		1614	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1615
		1616	my $top = int $self->{children}[1]{range}[0];
		1617
		1618	my $y0 = $top;
		1619	my $y1 = $top + $self->{h};
		1620
		1621	my $y = 0;
		1622
		1623	my $layout = $self->{layout};
		1624
		1625	for my $par (@{$self->{par}}) {
		1626	my $h = $par->[0];
		1627
		1628	if ($y0 < $y + $h && $y < $y1) {
		1629	$layout->set_text ($par->[2]);
		1630
		1631	glColor @{ $par->[1] };
		1632	my ($W, $H) = $layout->size;
		1633	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1634	}
		1635
		1636	$y += $h;
		1637	}
		1638
		1639	glDisable GL_TEXTURE_2D;
		1640	glDisable GL_BLEND;
		1641	};
		1642	});
		1643	}
		1644
		1645	sub _draw {
		1646	my ($self) = @_;
		1647
		1648	if ($self->{texture}) {
		1649	glEnable GL_TEXTURE_2D;
		1650	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1651	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1652	glDisable GL_TEXTURE_2D;
		1653	}
		1654
		1655	$self->{children}[1]->draw;
		1656
1343	}	1657	}
1344		1658
1345	#############################################################################	1659	#############################################################################
1346		1660
1347	package CFClient::UI::MapWidget;	1661	package CFClient::UI::MapWidget;
…		…
1357		1671
1358	sub new {	1672	sub new {
1359	my $class = shift;	1673	my $class = shift;
1360		1674
1361	$class->SUPER::new (	1675	$class->SUPER::new (
1362	z => -1,	1676	z => -1,
		1677	can_focus => 1,
1363	list => (glGenLists 1),	1678	list => (glGenLists 1),
1364	@_	1679	@_
1365	)	1680	)
1366	}	1681	}
1367		1682
1368	sub key_down {	1683	sub key_down {
1369	print "MAPKEYDOWN\n";	1684	print "MAPKEYDOWN\n";
1370	}	1685	}
1371		1686
1372	sub key_up {	1687	sub key_up {
		1688	}
		1689
		1690	sub button_down {
		1691	my ($self, $ev, $x, $y) = @_;
		1692
		1693	$self->focus_in;
		1694
		1695	if ($ev->button == 2) {
		1696	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1697	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1698
		1699	$self->{motion} = sub {
		1700	my ($ev, $x, $y) = @_;
		1701
		1702	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1703
		1704	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1705	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1706
		1707	$self->update;
		1708	};
		1709	}
		1710	}
		1711
		1712	sub button_up {
		1713	my ($self, $ev, $x, $y) = @_;
		1714
		1715	delete $self->{motion};
		1716	}
		1717
		1718	sub mouse_motion {
		1719	my ($self, $ev, $x, $y) = @_;
		1720
		1721	$self->{motion}->($ev, $x, $y) if $self->{motion};
1373	}	1722	}
1374		1723
1375	sub size_request {	1724	sub size_request {
1376	(	1725	(
1377	1 + 32 * int $::WIDTH / 32,	1726	1 + 32 * int $::WIDTH / 32,
…		…
1390	my ($self) = @_;	1739	my ($self) = @_;
1391		1740
1392	if (delete $self->{need_update}) {	1741	if (delete $self->{need_update}) {
1393	glNewList $self->{list}, GL_COMPILE;	1742	glNewList $self->{list}, GL_COMPILE;
1394		1743
1395	my $mx = $::CONN->{mapx};	1744	if ($::MAP) {
1396	my $my = $::CONN->{mapy};
1397
1398	my $map = $::CONN->{map};
1399
1400	my ($xofs, $yofs);
1401
1402	my $sw = 1 + int $::WIDTH / 32;	1745	my $sw = int $::WIDTH / 32;
1403	my $sh = 1 + int $::HEIGHT / 32;	1746	my $sh = int $::HEIGHT / 32;
1404		1747
1405	if ($::CONN->{mapw} > $sw) {	1748	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1406	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1749	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1407	} else {	1750
1408	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1751	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1752
		1753	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		1754
		1755	if ($::CFG->{fow_enable}) {
		1756	if ($::CFG->{fow_smooth}) { # smooth fog of war
		1757	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
		1758	glConvolutionFilter2D
		1759	GL_CONVOLUTION_2D,
		1760	GL_ALPHA,
		1761	3, 3,
		1762	GL_ALPHA, GL_FLOAT,
		1763	pack "f*",
		1764	0.1, 0.1, 0.1,
		1765	0.1, 0.2, 0.1,
		1766	0.1, 0.1, 0.1,
		1767	;
		1768	glEnable GL_CONVOLUTION_2D;
		1769	}
		1770
		1771	my $tex = new CFClient::Texture
		1772	w => $w,
		1773	h => $h,
		1774	data => $data,
		1775	internalformat => GL_ALPHA,
		1776	format => GL_ALPHA;
		1777
		1778	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1779
		1780	glEnable GL_BLEND;
		1781	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1782	glEnable GL_TEXTURE_2D;
		1783	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1784
		1785	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1786	$tex->draw_quad (0, 0, $w * 32, $h * 32);
		1787
		1788	glDisable GL_TEXTURE_2D;
		1789	glDisable GL_BLEND;
		1790	}
		1791
		1792	# HACK BEGIN
		1793	{
		1794	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1795	my ($w, $h) = (250, 250);
		1796
		1797	glEnable GL_BLEND;
		1798	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1799	glEnable GL_TEXTURE_2D;
		1800	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1801
		1802	CFClient::Texture->new (
		1803	w => $w,
		1804	h => $h,
		1805	data => $::MAP->mapmap ($w, $h),
		1806	type => GL_UNSIGNED_INT_8_8_8_8_REV
		1807	)->draw_quad (100, 100);
		1808
		1809	glDisable GL_TEXTURE_2D;
		1810	glDisable GL_BLEND;
		1811	}
		1812	# HACK END
1409	}	1813	}
1410		1814
1411	if ($::CONN->{maph} > $sh) {
1412	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1413	} else {
1414	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1415	}
1416
1417	glEnable GL_TEXTURE_2D;
1418	glEnable GL_BLEND;
1419	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1420	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1421
1422	my $sw4 = ($sw + 3) & ~3;
1423	my $darkness = "\x00" x ($sw4 * $sh);
1424
1425	for my $x (0 .. $sw - 1) {
1426	my $row = $map->[$x + $xofs];
1427	for my $y (0 .. $sh - 1) {
1428
1429	my $cell = $row->[$y + $yofs]
1430	or next;
1431
1432	my $dark = $cell->[0];
1433	if ($dark < 0) {
1434	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1435	} else {
1436	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1437	}
1438
1439	for my $num (grep $_, @$cell[1,2,3]) {
1440	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
1441
1442	my ($w, $h) = @$tex{qw(w h)};
1443
1444	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1445	}
1446	}
1447	}
1448
1449	# if (1) { # higher quality darkness
1450	# $lighting =~ s/(.)/$1$1$1/gs;
1451	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1452	#
1453	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1454	#
1455	# $lighting = $pb->get_pixels;
1456	# $lighting =~ s/(.)../$1/gs;
1457	# }
1458
1459	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1460
1461	$darkness = new CFClient::Texture
1462	w => $sw4,
1463	h => $sh,
1464	data => $darkness,
1465	internalformat => GL_ALPHA,
1466	format => GL_ALPHA;
1467
1468	glColor 0.45, 0.45, 0.45, 1;
1469	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1470
1471	glDisable GL_TEXTURE_2D;
1472	glDisable GL_BLEND;
1473
1474	glEndList;	1815	glEndList;
1475	}	1816	}
1476		1817
		1818	glPushMatrix;
1477	glCallList $self->{list};	1819	glCallList $self->{list};
		1820	glPopMatrix;
		1821
		1822	if ($FOCUS != $self) {
		1823	glColor 64/255, 64/255, 64/255;
		1824	glLogicOp GL_AND;
		1825	glEnable GL_COLOR_LOGIC_OP;
		1826	glBegin GL_QUADS;
		1827	glVertex 0, 0;
		1828	glVertex 0, $::HEIGHT;
		1829	glVertex $::WIDTH, $::HEIGHT;
		1830	glVertex $::WIDTH, 0;
		1831	glEnd;
		1832	glDisable GL_COLOR_LOGIC_OP;
		1833	}
1478	}	1834	}
1479		1835
1480	my %DIR = (	1836	my %DIR = (
1481	SDLK_KP8, [1, "north"],	1837	SDLK_KP8, [1, "north"],
1482	SDLK_KP9, [2, "northeast"],	1838	SDLK_KP9, [2, "northeast"],
…		…
1498		1854
1499	my $mod = $ev->key_mod;	1855	my $mod = $ev->key_mod;
1500	my $sym = $ev->key_sym;	1856	my $sym = $ev->key_sym;
1501		1857
1502	if ($sym == SDLK_KP5) {	1858	if ($sym == SDLK_KP5) {
1503	$::CONN->send ("command stay fire");	1859	$::CONN->user_send ("command stay fire");
1504	} elsif ($sym == SDLK_a) {	1860	} elsif ($sym == SDLK_a) {
1505	$::CONN->send ("command apply");	1861	$::CONN->user_send ("command apply");
		1862	} elsif ($sym == SDLK_QUOTE) {
		1863	$self->emit ('activate_console');
		1864	} elsif ($sym == SDLK_SLASH) {
		1865	$self->emit ('activate_console' => '/');
1506	} elsif (exists $DIR{$sym}) {	1866	} elsif (exists $DIR{$sym}) {
1507	if ($mod & KMOD_SHIFT) {	1867	if ($mod & KMOD_SHIFT) {
1508	$self->{shft}++;	1868	$self->{shft}++;
1509	$::CONN->send ("command fire $DIR{$sym}[0]");	1869	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1510	} elsif ($mod & KMOD_CTRL) {	1870	} elsif ($mod & KMOD_CTRL) {
1511	$self->{ctrl}++;	1871	$self->{ctrl}++;
1512	$::CONN->send ("command run $DIR{$sym}[0]");	1872	$::CONN->user_send ("command run $DIR{$sym}[0]");
1513	} else {	1873	} else {
1514	$::CONN->send ("command $DIR{$sym}[1]");	1874	$::CONN->user_send ("command $DIR{$sym}[1]");
1515	}	1875	}
1516	}	1876	}
1517	}	1877	}
1518		1878
1519	sub key_up {	1879	sub key_up {
…		…
1521		1881
1522	my $mod = $ev->key_mod;	1882	my $mod = $ev->key_mod;
1523	my $sym = $ev->key_sym;	1883	my $sym = $ev->key_sym;
1524		1884
1525	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1885	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1526	$::CONN->send ("command fire_stop");	1886	$::CONN->user_send ("command fire_stop");
1527	}	1887	}
1528	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1888	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1529	$::CONN->send ("command run_stop");	1889	$::CONN->user_send ("command run_stop");
1530	}	1890	}
1531	}	1891	}
1532		1892
1533	#############################################################################	1893	#############################################################################
1534		1894
…		…
1572	glPopMatrix;	1932	glPopMatrix;
1573	}	1933	}
1574		1934
1575	#############################################################################	1935	#############################################################################
1576		1936
1577	package CFClient::UI::Toplevel;	1937	package CFClient::UI::Flopper;
		1938
		1939	our @ISA = CFClient::UI::Button::;
		1940
		1941	sub new {
		1942	my $class = shift;
		1943
		1944	my $self = $class->SUPER::new (
		1945	state => 0,
		1946	connect_activate => \&toggle_flopper,
		1947	@_
		1948	);
		1949
		1950	if ($self->{state}) {
		1951	$self->{state} = 0;
		1952	$self->toggle_flopper;
		1953	}
		1954
		1955	$self
		1956	}
		1957
		1958	sub toggle_flopper {
		1959	my ($self) = @_;
		1960
		1961	# TODO: use animation
		1962	if ($self->{state} = !$self->{state}) {
		1963	$CFClient::UI::ROOT->add ($self->{other});
		1964	$self->{other}->move ($self->coord2global (0, $self->{h}));
		1965	} else {
		1966	$CFClient::UI::ROOT->remove ($self->{other});
		1967	}
		1968	}
		1969
		1970	#############################################################################
		1971
		1972	package CFClient::UI::Root;
1578		1973
1579	our @ISA = CFClient::UI::Container::;	1974	our @ISA = CFClient::UI::Container::;
		1975
		1976	use SDL::OpenGL;
1580		1977
1581	sub size_request {	1978	sub size_request {
1582	($::WIDTH, $::HEIGHT)	1979	($::WIDTH, $::HEIGHT)
1583	}	1980	}
1584		1981
…		…
1589		1986
1590	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	1987	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1591	for @{$self->{children}};	1988	for @{$self->{children}};
1592	}	1989	}
1593		1990
1594	sub translate {	1991	sub _topleft {
1595	my ($self, $x, $y) = @_;	1992	my ($self, $x, $y) = @_;
1596		1993
1597	($x, $y)	1994	($x, $y)
1598	}	1995	}
1599		1996
…		…
1610	$self->SUPER::add ($widget);	2007	$self->SUPER::add ($widget);
1611		2008
1612	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2009	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1613	}	2010	}
1614		2011
		2012	sub on_refresh {
		2013	my ($self, $id, $cb) = @_;
		2014
		2015	$self->{refresh_hook}{$id} = $cb;
		2016	}
		2017
1615	sub draw {	2018	sub draw {
1616	my ($self) = @_;	2019	my ($self) = @_;
1617		2020
		2021	while (my $rcb = delete $self->{refresh_hook}) {
		2022	$_->() for values %$rcb;
		2023	}
		2024
		2025	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2026	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2027	glClear GL_COLOR_BUFFER_BIT;
		2028
		2029	glMatrixMode GL_PROJECTION;
		2030	glLoadIdentity;
		2031	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2032	glMatrixMode GL_MODELVIEW;
		2033	glLoadIdentity;
		2034
1618	$self->_draw;	2035	$self->_draw;
1619	}	2036	}
1620		2037
1621	#############################################################################	2038	#############################################################################
1622		2039
1623	package CFClient::UI;	2040	package CFClient::UI;
1624		2041
1625	$TOPLEVEL = new CFClient::UI::Toplevel;	2042	$ROOT = new CFClient::UI::Root;
1626		2043
1627	1	2044	1
1628		2045

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.85 by elmex, Wed Apr 12 12:55:56 2006 UTC vs. Revision 1.113 by root, Sat Apr 15 12:46:48 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.85 by elmex, Wed Apr 12 12:55:56 2006 UTC vs.
Revision 1.113 by root, Sat Apr 15 12:46:48 2006 UTC