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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 19:35:20 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;
		709	$self->update;
		710	}
		711
		712	# TODO: move to container class maybe? send childs a signal on removal?
		713	sub clear {
		714	my ($self) = @_;
		715
		716	delete $self->{children};
681	$self->update;	717	$self->update;
682	}	718	}
683		719
684	sub get_wh {	720	sub get_wh {
685	my ($self) = @_;	721	my ($self) = @_;
…		…
730	my $col_expand = (sum @col_expand) \|\| 1;	766	my $col_expand = (sum @col_expand) \|\| 1;
731		767
732	# linearly scale sizes	768	# linearly scale sizes
733	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	769	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	770	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		771
		772	CFClient::UI::harmonize $ws;
		773	CFClient::UI::harmonize $hs;
735		774
736	my $y;	775	my $y;
737		776
738	for my $r (0 .. $#{$self->{children}}) {	777	for my $r (0 .. $#{$self->{children}}) {
739	my $row = $self->{children}[$r]	778	my $row = $self->{children}[$r]
…		…
827	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	866	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
828	$h[$_] = $alloc_h;	867	$h[$_] = $alloc_h;
829	}	868	}
830	}	869	}
831		870
		871	CFClient::UI::harmonize \@h;
		872
832	my $y = 0;	873	my $y = 0;
833	for (0 .. $#$children) {	874	for (0 .. $#$children) {
834	my $child = $children->[$_];	875	my $child = $children->[$_];
835	my $h = $h[$_];	876	my $h = $h[$_];
836	$child->size_allocate ($y, 0, $h, $w);	877	$child->size_allocate ($y, 0, $h, $w);
…		…
881		922
882	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	923	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
883	}	924	}
884	}	925	}
885		926
		927	CFClient::UI::harmonize \@h;
		928
886	my $y = 0;	929	my $y = 0;
887	for (0 .. $#$children) {	930	for (0 .. $#$children) {
888	my $child = $children->[$_];	931	my $child = $children->[$_];
889	my $h = $h[$_];	932	my $h = $h[$_];
890	$child->size_allocate (0, $y, $w, $h);	933	$child->size_allocate (0, $y, $w, $h);
…		…
903		946
904	sub new {	947	sub new {
905	my ($class, %arg) = @_;	948	my ($class, %arg) = @_;
906		949
907	my $self = $class->SUPER::new (	950	my $self = $class->SUPER::new (
908	fg => [1, 1, 1],	951	fg => [1, 1, 1],
909	height => $::FONTSIZE,	952	fontsize => $::FONTSIZE,
910	text => "",	953	text => "",
911	align => -1,	954	align => -1,
912	padding => 2,	955	padding => 2,
913	layout => new CFClient::Layout,	956	layout => new CFClient::Layout,
914	%arg	957	%arg
915	);	958	);
916		959
917	$self->set_text ($self->{text});	960	$self->set_text ($self->{text});
918		961
…		…
948		991
949	sub size_request {	992	sub size_request {
950	my ($self) = @_;	993	my ($self) = @_;
951		994
952	$self->{layout}->set_width;	995	$self->{layout}->set_width;
953	$self->{layout}->set_height ($self->{height});	996	$self->{layout}->set_height ($self->{fontsize});
954	my ($w, $h) = $self->{layout}->size;	997	my ($w, $h) = $self->{layout}->size;
955		998
956	(	999	(
957	$w + $self->{padding} * 2,	1000	$w + $self->{padding} * 2,
958	$h + $self->{padding} * 2,	1001	$h + $self->{padding} * 2,
…		…
977	sub _draw {	1020	sub _draw {
978	my ($self) = @_;	1021	my ($self) = @_;
979		1022
980	my $tex = $self->{texture} \|\|= do {	1023	my $tex = $self->{texture} \|\|= do {
981	$self->{layout}->set_width ($self->{w});	1024	$self->{layout}->set_width ($self->{w});
982	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1025	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
983	new_from_layout CFClient::Texture $self->{layout}	1026	new_from_layout CFClient::Texture $self->{layout}
984	};	1027	};
985		1028
986	glEnable GL_BLEND;	1029	glEnable GL_BLEND;
987	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1030	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
988	glEnable GL_TEXTURE_2D;	1031	glEnable GL_TEXTURE_2D;
989	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1032	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
990		1033
991	glColor @{$self->{fg}};	1034	glColor @{$self->{fg}};
992		1035
993	my $x =	1036	my $x =
994	$self->{align} < 0 ? $self->{padding}	1037	$self->{align} < 0 ? $self->{padding}
995	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1038	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996	: ($self->{w} - $tex->{w}) * 0.5;	1039	: ($self->{w} - $tex->{w}) * 0.5;
997		1040
998	glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;	1041	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
999	$tex->draw_quad (0, 0);
1000		1042
1001	glDisable GL_TEXTURE_2D;	1043	glDisable GL_TEXTURE_2D;
1002	glDisable GL_BLEND;	1044	glDisable GL_BLEND;
1003	}	1045	}
1004		1046
…		…
1017	$class->SUPER::new (	1059	$class->SUPER::new (
1018	fg => [1, 1, 1],	1060	fg => [1, 1, 1],
1019	bg => [0, 0, 0, 0.2],	1061	bg => [0, 0, 0, 0.2],
1020	active_bg => [1, 1, 1, 0.5],	1062	active_bg => [1, 1, 1, 0.5],
1021	active_fg => [0, 0, 0],	1063	active_fg => [0, 0, 0],
		1064	can_hover => 1,
		1065	can_focus => 1,
1022	@_	1066	@_
1023	)	1067	)
1024	}	1068	}
1025		1069
1026	sub _set_text {	1070	sub _set_text {
1027	my ($self, $text) = @_;	1071	my ($self, $text) = @_;
1028		1072
		1073	my $old_text = $self->{text};
		1074
1029	$self->{last_activity} = $::NOW;	1075	$self->{last_activity} = $::NOW;
1030		1076
1031	$self->{text} = $text;	1077	$self->{text} = $text;
1032	$self->{layout}->set_width ($self->{w});	1078	$self->{layout}->set_width ($self->{w});
1033	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1079	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1034		1080
1035	$text =~ s/./*/g if $self->{hidden};	1081	$text =~ s/./*/g if $self->{hidden};
1036		1082
1037	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1083	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
1038		1084
1039	$text = substr $text, 0, $self->{cursor};	1085	$text = substr $text, 0, $self->{cursor};
1040	utf8::encode $text;	1086	utf8::encode $text;
1041		1087
1042	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	1088	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1089
		1090	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
		1091	if $old_text ne $self->{text};
1043	}	1092	}
1044		1093
1045	sub size_request {	1094	sub size_request {
1046	my ($self) = @_;	1095	my ($self) = @_;
1047		1096
…		…
1086	++$self->{cursor} if $self->{cursor} < length $self->{text};	1135	++$self->{cursor} if $self->{cursor} < length $self->{text};
1087	} elsif ($sym == SDLK_HOME) {	1136	} elsif ($sym == SDLK_HOME) {
1088	$self->{cursor} = 0;	1137	$self->{cursor} = 0;
1089	} elsif ($sym == SDLK_END) {	1138	} elsif ($sym == SDLK_END) {
1090	$self->{cursor} = length $text;	1139	$self->{cursor} = length $text;
		1140	} elsif ($sym == SDLK_ESCAPE) {
		1141	$self->emit ('escape');
1091	} elsif ($uni) {	1142	} elsif ($uni) {
1092	substr $text, $self->{cursor}++, 0, chr $uni;	1143	substr $text, $self->{cursor}++, 0, chr $uni;
1093	}	1144	}
1094		1145
1095	$self->_set_text ($text);	1146	$self->_set_text ($text);
…		…
1157	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1208	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1158	glEnd;	1209	glEnd;
1159	}	1210	}
1160	}	1211	}
1161		1212
		1213	package CFClient::UI::LineEntry;
		1214
		1215	our @ISA = CFClient::UI::Entry::;
		1216
		1217	use SDL;
		1218	use SDL::OpenGL;
		1219
		1220	sub key_down {
		1221	my ($self, $ev) = @_;
		1222
		1223	my $sym = $ev->key_sym;
		1224
		1225	if ($sym == SDLK_RETURN) {
		1226	$self->emit (activate => $self->get_text);
		1227	$self->update;
		1228
		1229	} else {
		1230	$self->SUPER::key_down ($ev);
		1231	}
		1232
		1233	}
		1234
1162	#############################################################################	1235	#############################################################################
1163		1236
1164	package CFClient::UI::Button;	1237	package CFClient::UI::Button;
1165		1238
1166	our @ISA = CFClient::UI::Label::;	1239	our @ISA = CFClient::UI::Label::;
…		…
1178	$class->SUPER::new (	1251	$class->SUPER::new (
1179	padding => 4,	1252	padding => 4,
1180	fg => [1, 1, 1],	1253	fg => [1, 1, 1],
1181	bg => [1, 1, 1, 0.2],	1254	bg => [1, 1, 1, 0.2],
1182	active_fg => [1, 1, 0],	1255	active_fg => [1, 1, 0],
1183	# active_bg => [0, 0, 0, 0.5],	1256	can_hover => 1,
1184	# border_fg => [1, 1, 0],
1185	@_	1257	@_
1186	)	1258	)
1187	}	1259	}
1188		1260
1189	sub button_up {	1261	sub button_up {
…		…
1223	#############################################################################	1295	#############################################################################
1224		1296
1225	package CFClient::UI::CheckBox;	1297	package CFClient::UI::CheckBox;
1226		1298
1227	our @ISA = CFClient::UI::DrawBG::;	1299	our @ISA = CFClient::UI::DrawBG::;
		1300
		1301	my @tex =
		1302	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1303	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1228		1304
1229	use SDL;	1305	use SDL;
1230	use SDL::OpenGL;	1306	use SDL::OpenGL;
1231		1307
1232	sub new {	1308	sub new {
…		…
1235	$class->SUPER::new (	1311	$class->SUPER::new (
1236	padding => 2,	1312	padding => 2,
1237	fg => [1, 1, 1],	1313	fg => [1, 1, 1],
1238	active_fg => [1, 1, 0],	1314	active_fg => [1, 1, 0],
1239	state => 0,	1315	state => 0,
		1316	can_hover => 1,
1240	@_	1317	@_
1241	)	1318	)
1242	}	1319	}
1243		1320
1244	sub size_request {	1321	sub size_request {
…		…
1269	$self->SUPER::_draw;	1346	$self->SUPER::_draw;
1270		1347
1271	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1348	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1272		1349
1273	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1350	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1274		1351
1275	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1352	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276		1353
1277	glBegin GL_LINE_LOOP;	1354	glEnable GL_BLEND;
1278	glVertex 0 , 0;	1355	glEnable GL_TEXTURE_2D;
1279	glVertex 0 , $s;	1356	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1280	glVertex $s, $s;
1281	glVertex $s, 0;
1282	glEnd;
1283		1357
1284	if ($self->{state}) {	1358	my $tex = $self->{state} ? $tex[1] : $tex[0];
1285	glBegin GL_LINES;	1359
1286	glVertex 0 , 0;	1360	$tex->draw_quad (0, 0, $s, $s);
1287	glVertex $s, $s;	1361
1288	glVertex $s, 0;	1362	glDisable GL_TEXTURE_2D;
1289	glVertex 0 , $s;	1363	glDisable GL_BLEND;
1290	glEnd;
1291	}
1292	}	1364	}
1293		1365
1294	#############################################################################	1366	#############################################################################
1295		1367
1296	package CFClient::UI::Slider;	1368	package CFClient::UI::Slider;
…		…
1298	use strict;	1370	use strict;
1299		1371
1300	use SDL::OpenGL;	1372	use SDL::OpenGL;
1301		1373
1302	our @ISA = CFClient::UI::DrawBG::;	1374	our @ISA = CFClient::UI::DrawBG::;
		1375
		1376	my @tex =
		1377	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1378	qw(s1_slider.png s1_slider_bg.png);
1303		1379
1304	sub new {	1380	sub new {
1305	my $class = shift;	1381	my $class = shift;
1306		1382
1307	# range [value, low, high, page]	1383	# range [value, low, high, page]
1308		1384
		1385	# TODO: 0-width page
		1386	# TODO: req_w/h are wrong with vertical
		1387	# TODO: calculations are off
1309	my $self = $class->SUPER::new (	1388	my $self = $class->SUPER::new (
1310	fg => [1, 1, 1],	1389	fg => [1, 1, 1],
1311	active_fg => [0, 0, 0],	1390	active_fg => [0, 0, 0],
1312	range => [0, 0, 100, 10],	1391	range => [0, 0, 100, 10],
1313	req_w => 40,	1392	req_w => 40,
1314	req_h => 10,	1393	req_h => 13,
1315	vertical => 0,	1394	vertical => 0,
		1395	can_hover => 1,
		1396	inner_pad => 5,
1316	@_	1397	@_
1317	);	1398	);
1318		1399
1319	$self	1400	$self
1320	}	1401	}
…		…
1341	if ($GRAB == $self) {	1422	if ($GRAB == $self) {
1342	my ($value, $lo, $hi, $page) = @{$self->{range}};	1423	my ($value, $lo, $hi, $page) = @{$self->{range}};
1343		1424
1344	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1425	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1345		1426
		1427	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1428	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1429
		1430	$x -= $inner_pad_px; # substract the padding
1346	$x = $x * ($hi - $lo) / $w + $lo;	1431	$x = $x * ($hi - $lo) / $inner_w + $lo;
1347	$x = $lo if $x < $lo;	1432	$x = $lo if $x < $lo;
1348	$x = $hi - $page if $x > $hi - $page;	1433	$x = $hi - $page if $x > $hi - $page;
1349	$self->{range}[0] = $x;	1434	$self->{range}[0] = $x;
1350		1435
1351	$self->emit (changed => $x);	1436	$self->emit (changed => $x);
1352	$self->update;	1437	$self->update;
1353	}	1438	}
		1439	}
		1440
		1441	# the inner_* stuff is for generating a padding for the slider handle,
		1442	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1443	# correct propably, but it does the job for now
		1444	sub _calc_inner_pad_px {
		1445	my ($self, $w) = @_;
		1446	($w / 100) * $self->{inner_pad} # % to pixels
1354	}	1447	}
1355		1448
1356	sub _draw {	1449	sub _draw {
1357	my ($self) = @_;	1450	my ($self) = @_;
1358		1451
…		…
1372	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1465	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1466	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374		1467
1375	my ($value, $lo, $hi, $page) = @{$self->{range}};	1468	my ($value, $lo, $hi, $page) = @{$self->{range}};
1376		1469
		1470	$hi = $value + 1 if $lo == $hi;
		1471
		1472	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1473	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1474
1377	$page = int $page * $w / ($hi - $lo);	1475	$page = int $page * $inner_w / ($hi - $lo);
1378	$value = int +($value - $lo) * $w / ($hi - $lo);	1476	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1379		1477
1380	$w -= $page;	1478	$w -= $page;
1381	$page &= ~1;	1479	$page &= ~1;
1382	glTranslate $page * 0.5, 0, 0;	1480	glTranslate $page * 0.5, 0, 0;
1383	$page \|\|= 2;	1481	$page \|\|= 2;
1384		1482
1385	glColor @$fg;
1386	glBegin GL_LINES;
1387	glVertex 0, 0; glVertex 0, $h;
1388	glVertex $w - 1, 0; glVertex $w - 1, $h;
1389	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390	glEnd;
1391
1392	my $knob_a = $value - $page * 0.5;	1483	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1393	my $knob_b = $value + $page * 0.5;	1484	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1394		1485
1395	glBegin GL_QUADS;	1486	glEnable GL_BLEND;
1396	glColor @$fg;	1487	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1397	glVertex $knob_a, 0;	1488	glEnable GL_TEXTURE_2D;
1398	glVertex $knob_a, $h;	1489	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1399	glVertex $knob_b, $h;
1400	glVertex $knob_b, 0;
1401		1490
1402	if ($knob_a < $knob_b - 2) {	1491	# draw background
1403	glColor @$bg;	1492	$tex[1]->draw_quad (0, 0, $w, $h);
1404	glVertex $knob_a + 1, 1;	1493
1405	glVertex $knob_a + 1, $h - 1;	1494	# draw handle
1406	glVertex $knob_b - 1, $h - 1;	1495	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1407	glVertex $knob_b - 1, 1;	1496
		1497	glDisable GL_BLEND;
		1498	glDisable GL_TEXTURE_2D;
		1499	}
		1500
		1501	#############################################################################
		1502
		1503	package CFClient::UI::TextView;
		1504
		1505	our @ISA = CFClient::UI::HBox::;
		1506
		1507	use SDL::OpenGL;
		1508
		1509	sub new {
		1510	my $class = shift;
		1511
		1512	my $self = $class->SUPER::new (
		1513	req_w => $::WIDTH / 6,
		1514	req_h => $::HEIGHT / 6,
		1515	fontsize => $::FONTSIZE,
		1516	@_,
		1517
		1518	layout => (new CFClient::Layout),
		1519	par => [],
		1520	height => 0,
		1521	children => [
		1522	(new CFClient::UI::Empty expand => 1),
		1523	(new CFClient::UI::Slider vertical => 1),
		1524	],
		1525	);
		1526
		1527	$self->{children}[1]->connect (changed => sub {
		1528	$self->update;
		1529	});
		1530
		1531	$self
		1532	}
		1533
		1534	sub set_fontsize {
		1535	my ($self, $fontsize) = @_;
		1536
		1537	$self->{fontsize} = $fontsize;
		1538	$self->reflow;
		1539	}
		1540
		1541	sub text_height {
		1542	my ($self, $text) = @_;
		1543
		1544	my $layout = $self->{layout};
		1545
		1546	$layout->set_height ($self->{fontsize});
		1547	$layout->set_width ($self->{w});
		1548	$layout->set_text ($text);
1408	}	1549
1409	glEnd;	1550	($layout->size)[1]
		1551	}
		1552
		1553	sub reflow {
		1554	my ($self) = @_;
		1555
		1556	$self->{need_reflow}++;
		1557	$self->update;
		1558	}
		1559
		1560	sub size_request {
		1561	my ($self) = @_;
		1562
		1563	($self->{req_w}, $self->{req_h})
		1564	}
		1565
		1566	sub size_allocate {
		1567	my ($self, $x, $y, $w, $h) = @_;
		1568
		1569	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1570
		1571	$self->{layout}->set_height ($self->{fontsize});
		1572	$self->{layout}->set_width ($self->{w});
		1573
		1574	$self->reflow;
		1575	}
		1576
		1577	sub add_paragraph {
		1578	my ($self, $color, $text) = @_;
		1579
		1580	#TODO: intelligently "reformat" paragraph
		1581
		1582	my $height = $self->text_height ($text);
		1583
		1584	$self->{height} += $height;
		1585
		1586	push @{$self->{par}}, [$height, $color, $text];
		1587
		1588	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1589	$self->{children}[1]->update;
		1590	}
		1591
		1592	sub update {
		1593	my ($self) = @_;
		1594
		1595	$self->SUPER::update;
		1596
		1597	return unless $self->{h} > 0;
		1598
		1599	delete $self->{texture};
		1600
		1601	$ROOT->on_refresh ($self, sub {
		1602	if (delete $self->{need_reflow}) {
		1603	my $height = 0;
		1604
		1605	$height += $_->[0] = $self->text_height ($_->[2])
		1606	for @{$self->{par}};
		1607
		1608	$self->{height} = $height;
		1609
		1610	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1611
		1612	delete $self->{texture};
		1613	}
		1614
		1615	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1616	glClearColor 0, 0, 0, 1;
		1617	glClear GL_COLOR_BUFFER_BIT;
		1618
		1619	glEnable GL_BLEND;
		1620	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1621	glEnable GL_TEXTURE_2D;
		1622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1623
		1624	my $top = int $self->{children}[1]{range}[0];
		1625
		1626	my $y0 = $top;
		1627	my $y1 = $top + $self->{h};
		1628
		1629	my $y = 0;
		1630
		1631	my $layout = $self->{layout};
		1632
		1633	for my $par (@{$self->{par}}) {
		1634	my $h = $par->[0];
		1635
		1636	if ($y0 < $y + $h && $y < $y1) {
		1637	$layout->set_text ($par->[2]);
		1638
		1639	glColor @{ $par->[1] };
		1640	my ($W, $H) = $layout->size;
		1641	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1642	}
		1643
		1644	$y += $h;
		1645	}
		1646
		1647	glDisable GL_TEXTURE_2D;
		1648	glDisable GL_BLEND;
		1649	};
		1650	});
		1651	}
		1652
		1653	sub _draw {
		1654	my ($self) = @_;
		1655
		1656	if ($self->{texture}) {
		1657	glEnable GL_TEXTURE_2D;
		1658	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1659	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1660	glDisable GL_TEXTURE_2D;
		1661	}
		1662
		1663	$self->{children}[1]->draw;
		1664
1410	}	1665	}
1411		1666
1412	#############################################################################	1667	#############################################################################
1413		1668
1414	package CFClient::UI::MapWidget;	1669	package CFClient::UI::MapWidget;
…		…
1424		1679
1425	sub new {	1680	sub new {
1426	my $class = shift;	1681	my $class = shift;
1427		1682
1428	$class->SUPER::new (	1683	$class->SUPER::new (
1429	z => -1,	1684	z => -1,
		1685	can_focus => 1,
1430	list => (glGenLists 1),	1686	list => (glGenLists 1),
1431	@_	1687	@_
1432	)	1688	)
1433	}	1689	}
1434		1690
1435	sub key_down {	1691	sub key_down {
1436	print "MAPKEYDOWN\n";	1692	print "MAPKEYDOWN\n";
1437	}	1693	}
1438		1694
1439	sub key_up {	1695	sub key_up {
		1696	}
		1697
		1698	sub button_down {
		1699	my ($self, $ev, $x, $y) = @_;
		1700
		1701	$self->focus_in;
		1702
		1703	if ($ev->button == 2) {
		1704	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1705	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1706
		1707	$self->{motion} = sub {
		1708	my ($ev, $x, $y) = @_;
		1709
		1710	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1711
		1712	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1713	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1714
		1715	$self->update;
		1716	};
		1717	}
		1718	}
		1719
		1720	sub button_up {
		1721	my ($self, $ev, $x, $y) = @_;
		1722
		1723	delete $self->{motion};
		1724	}
		1725
		1726	sub mouse_motion {
		1727	my ($self, $ev, $x, $y) = @_;
		1728
		1729	$self->{motion}->($ev, $x, $y) if $self->{motion};
1440	}	1730	}
1441		1731
1442	sub size_request {	1732	sub size_request {
1443	(	1733	(
1444	1 + 32 * int $::WIDTH / 32,	1734	1 + 32 * int $::WIDTH / 32,
…		…
1457	my ($self) = @_;	1747	my ($self) = @_;
1458		1748
1459	if (delete $self->{need_update}) {	1749	if (delete $self->{need_update}) {
1460	glNewList $self->{list}, GL_COMPILE;	1750	glNewList $self->{list}, GL_COMPILE;
1461		1751
1462	my $mx = $::CONN->{mapx};	1752	if ($::MAP) {
1463	my $my = $::CONN->{mapy};
1464
1465	my $map = $::CONN->{map};
1466
1467	my ($xofs, $yofs);
1468
1469	my $sw = 1 + int $::WIDTH / 32;	1753	my $sw = int $::WIDTH / 32;
1470	my $sh = 1 + int $::HEIGHT / 32;	1754	my $sh = int $::HEIGHT / 32;
1471		1755
1472	if ($::CONN->{mapw} > $sw) {	1756	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1473	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1757	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1474	} else {	1758
1475	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1759	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1760
		1761	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		1762
		1763	if ($::CFG->{fow_enable}) {
		1764	if ($::CFG->{fow_smooth}) { # smooth fog of war
		1765	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
		1766	glConvolutionFilter2D
		1767	GL_CONVOLUTION_2D,
		1768	GL_ALPHA,
		1769	3, 3,
		1770	GL_ALPHA, GL_FLOAT,
		1771	pack "f*",
		1772	0.1, 0.1, 0.1,
		1773	0.1, 0.2, 0.1,
		1774	0.1, 0.1, 0.1,
		1775	;
		1776	glEnable GL_CONVOLUTION_2D;
		1777	}
		1778
		1779	my $tex = new CFClient::Texture
		1780	w => $w,
		1781	h => $h,
		1782	data => $data,
		1783	internalformat => GL_ALPHA,
		1784	format => GL_ALPHA;
		1785
		1786	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1787
		1788	glEnable GL_BLEND;
		1789	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1790	glEnable GL_TEXTURE_2D;
		1791	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1792
		1793	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1794	$tex->draw_quad (0, 0, $w * 32, $h * 32);
		1795
		1796	glDisable GL_TEXTURE_2D;
		1797	glDisable GL_BLEND;
		1798	}
		1799
		1800	# HACK BEGIN
		1801	{
		1802	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1803	my ($w, $h) = (250, 250);
		1804
		1805	glEnable GL_BLEND;
		1806	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1807	glEnable GL_TEXTURE_2D;
		1808	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1809
		1810	CFClient::Texture->new (
		1811	w => $w,
		1812	h => $h,
		1813	data => $::MAP->mapmap ($w, $h),
		1814	type => GL_UNSIGNED_INT_8_8_8_8_REV
		1815	)->draw_quad (100, 100);
		1816
		1817	glDisable GL_TEXTURE_2D;
		1818	glDisable GL_BLEND;
		1819	}
		1820	# HACK END
1476	}	1821	}
1477		1822
1478	if ($::CONN->{maph} > $sh) {
1479	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1480	} else {
1481	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1482	}
1483
1484	glEnable GL_TEXTURE_2D;
1485	glEnable GL_BLEND;
1486	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1487	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1488	glColor 1, 1, 1, 1;
1489
1490	my $sw4 = ($sw + 3) & ~3;
1491	my $darkness = "\x00" x ($sw4 * $sh);
1492
1493	for my $x (0 .. $sw - 1) {
1494	my $row = $map->[$x + $xofs];
1495	for my $y (0 .. $sh - 1) {
1496
1497	my $cell = $row->[$y + $yofs]
1498	or next;
1499
1500	my $dark = $cell->[0];
1501	if ($dark < 0) {
1502	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1503	} else {
1504	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1505	}
1506
1507	for my $num (grep $_, @$cell[1,2,3]) {
1508	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
1509
1510	my ($w, $h) = @$tex{qw(w h)};
1511
1512	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1513	}
1514	}
1515	}
1516
1517	# if (1) { # higher quality darkness
1518	# $lighting =~ s/(.)/$1$1$1/gs;
1519	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1520	#
1521	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1522	#
1523	# $lighting = $pb->get_pixels;
1524	# $lighting =~ s/(.)../$1/gs;
1525	# }
1526
1527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1528
1529	$darkness = new CFClient::Texture
1530	w => $sw4,
1531	h => $sh,
1532	data => $darkness,
1533	internalformat => GL_ALPHA,
1534	format => GL_ALPHA;
1535
1536	glColor +($::CFG->{fow_intensity}) x 3, 1;
1537	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1538
1539	glDisable GL_TEXTURE_2D;
1540	glDisable GL_BLEND;
1541
1542	glEndList;	1823	glEndList;
1543	}	1824	}
1544		1825
		1826	glPushMatrix;
1545	glCallList $self->{list};	1827	glCallList $self->{list};
		1828	glPopMatrix;
1546		1829
1547	if ($FOCUS != $self) {	1830	if ($FOCUS != $self) {
1548	glEnable GL_BLEND;	1831	glColor 64/255, 64/255, 64/255;
1549	glColor 0, 0, 1, 0.4;	1832	glLogicOp GL_AND;
		1833	glEnable GL_COLOR_LOGIC_OP;
1550	glBegin GL_QUADS;	1834	glBegin GL_QUADS;
1551	glVertex 0, 0;	1835	glVertex 0, 0;
1552	glVertex 0, $::HEIGHT;	1836	glVertex 0, $::HEIGHT;
1553	glVertex $::WIDTH, $::HEIGHT;	1837	glVertex $::WIDTH, $::HEIGHT;
1554	glVertex $::WIDTH, 0;	1838	glVertex $::WIDTH, 0;
1555	glEnd;	1839	glEnd;
1556	glDisable GL_BLEND;	1840	glDisable GL_COLOR_LOGIC_OP;
1557	}	1841	}
1558	}	1842	}
1559		1843
1560	my %DIR = (	1844	my %DIR = (
1561	SDLK_KP8, [1, "north"],	1845	SDLK_KP8, [1, "north"],
…		…
1581		1865
1582	if ($sym == SDLK_KP5) {	1866	if ($sym == SDLK_KP5) {
1583	$::CONN->user_send ("command stay fire");	1867	$::CONN->user_send ("command stay fire");
1584	} elsif ($sym == SDLK_a) {	1868	} elsif ($sym == SDLK_a) {
1585	$::CONN->user_send ("command apply");	1869	$::CONN->user_send ("command apply");
		1870	} elsif ($sym == SDLK_QUOTE) {
		1871	$self->emit ('activate_console');
		1872	} elsif ($sym == SDLK_SLASH) {
		1873	$self->emit ('activate_console' => '/');
1586	} elsif (exists $DIR{$sym}) {	1874	} elsif (exists $DIR{$sym}) {
1587	if ($mod & KMOD_SHIFT) {	1875	if ($mod & KMOD_SHIFT) {
1588	$self->{shft}++;	1876	$self->{shft}++;
1589	$::CONN->user_send ("command fire $DIR{$sym}[0]");	1877	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1590	} elsif ($mod & KMOD_CTRL) {	1878	} elsif ($mod & KMOD_CTRL) {
…		…
1652	glPopMatrix;	1940	glPopMatrix;
1653	}	1941	}
1654		1942
1655	#############################################################################	1943	#############################################################################
1656		1944
1657	package CFClient::UI::Toplevel;	1945	package CFClient::UI::Flopper;
		1946
		1947	our @ISA = CFClient::UI::Button::;
		1948
		1949	sub new {
		1950	my $class = shift;
		1951
		1952	my $self = $class->SUPER::new (
		1953	state => 0,
		1954	connect_activate => \&toggle_flopper,
		1955	@_
		1956	);
		1957
		1958	if ($self->{state}) {
		1959	$self->{state} = 0;
		1960	$self->toggle_flopper;
		1961	}
		1962
		1963	$self
		1964	}
		1965
		1966	sub toggle_flopper {
		1967	my ($self) = @_;
		1968
		1969	# TODO: use animation
		1970	if ($self->{state} = !$self->{state}) {
		1971	$CFClient::UI::ROOT->add ($self->{other});
		1972	$self->{other}->move ($self->coord2global (0, $self->{h}));
		1973	$self->emit ("open");
		1974	} else {
		1975	$CFClient::UI::ROOT->remove ($self->{other});
		1976	$self->emit ("close");
		1977	}
		1978
		1979	$self->emit (changed => $self->{state});
		1980	}
		1981
		1982	#############################################################################
		1983
		1984	package CFClient::UI::Root;
1658		1985
1659	our @ISA = CFClient::UI::Container::;	1986	our @ISA = CFClient::UI::Container::;
		1987
		1988	use SDL::OpenGL;
1660		1989
1661	sub size_request {	1990	sub size_request {
1662	($::WIDTH, $::HEIGHT)	1991	($::WIDTH, $::HEIGHT)
1663	}	1992	}
1664		1993
…		…
1669		1998
1670	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	1999	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1671	for @{$self->{children}};	2000	for @{$self->{children}};
1672	}	2001	}
1673		2002
1674	sub translate {	2003	sub _topleft {
1675	my ($self, $x, $y) = @_;	2004	my ($self, $x, $y) = @_;
1676		2005
1677	($x, $y)	2006	($x, $y)
1678	}	2007	}
1679		2008
…		…
1690	$self->SUPER::add ($widget);	2019	$self->SUPER::add ($widget);
1691		2020
1692	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2021	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1693	}	2022	}
1694		2023
		2024	sub on_refresh {
		2025	my ($self, $id, $cb) = @_;
		2026
		2027	$self->{refresh_hook}{$id} = $cb;
		2028	}
		2029
1695	sub draw {	2030	sub draw {
1696	my ($self) = @_;	2031	my ($self) = @_;
1697		2032
		2033	while (my $rcb = delete $self->{refresh_hook}) {
		2034	$_->() for values %$rcb;
		2035	}
		2036
		2037	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2038	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2039	glClear GL_COLOR_BUFFER_BIT;
		2040
		2041	glMatrixMode GL_PROJECTION;
		2042	glLoadIdentity;
		2043	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2044	glMatrixMode GL_MODELVIEW;
		2045	glLoadIdentity;
		2046
1698	$self->_draw;	2047	$self->_draw;
1699	}	2048	}
1700		2049
1701	#############################################################################	2050	#############################################################################
1702		2051
1703	package CFClient::UI;	2052	package CFClient::UI;
1704		2053
1705	$TOPLEVEL = new CFClient::UI::Toplevel;	2054	$ROOT = new CFClient::UI::Root;
1706		2055
1707	1	2056	1
1708		2057

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC vs. Revision 1.115 by root, Sat Apr 15 19:35:20 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 19:35:20 2006 UTC