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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.77 by root, Tue Apr 11 22:14:13 2006 UTC vs.
Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC

…		…
61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB \|\| $TOPLEVEL->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->translate ($x, $y)) if $HOVER;
71	}	71	}
72		72
…		…
79	use SDL::OpenGL;	79	use SDL::OpenGL;
80		80
81	sub new {	81	sub new {
82	my $class = shift;	82	my $class = shift;
83		83
84	bless {	84	my $self = bless {
85	x => 0,	85	x => 0,
86	y => 0,	86	y => 0,
87	z => 0,	87	z => 0,
88	w => -1,	88	w => -1,
89	h => -1,	89	h => -1,
90	@_	90	@_
91	}, $class	91	}, $class;
		92
		93	for (keys %$self) {
		94	if (/^connect_(.*)$/) {
		95	$self->connect ($1 => delete $self->{$_});
		96	}
		97	}
		98
		99	$self
92	}	100	}
93		101
94	sub move {	102	sub move {
95	my ($self, $x, $y, $z) = @_;	103	my ($self, $x, $y, $z) = @_;
96	$self->{x} = $x;	104	$self->{x} = $x;
…		…
125	my ($self, $x, $y, $w, $h) = @_;	133	my ($self, $x, $y, $w, $h) = @_;
126		134
127	$self->_size_allocate ($x, $y, $w, $h);	135	$self->_size_allocate ($x, $y, $w, $h);
128	}	136	}
129		137
130	# translate global koordinates to local coordinate system	138	# translate global coordinates to local coordinate system
131	sub translate {	139	sub translate {
132	my ($self, $x, $y) = @_;	140	my ($self, $x, $y) = @_;
133		141
134	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
135	}	143	}
136		144
137	sub focus_in {	145	sub focus_in {
138	my ($self) = @_;	146	my ($self) = @_;
139		147
140	return if $FOCUS == $self;	148	return if $FOCUS == $self;
		149	return unless $self->{can_focus};
141		150
142	my $focus = $FOCUS; $FOCUS = $self;	151	my $focus = $FOCUS; $FOCUS = $self;
143	$focus->update if $focus;	152	$focus->update if $focus;
144	$FOCUS->update;	153	$FOCUS->update;
145	}	154	}
…		…
178	glPushMatrix;	187	glPushMatrix;
179	glTranslate $self->{x}, $self->{y}, 0;	188	glTranslate $self->{x}, $self->{y}, 0;
180	$self->_draw;	189	$self->_draw;
181	glPopMatrix;	190	glPopMatrix;
182		191
183	if ($self == $HOVER) {	192	if ($self == $HOVER && $self->{can_hover}) {
184	my ($x, $y) = @$self{qw(x y)};	193	my ($x, $y) = @$self{qw(x y)};
185		194
186	glColor 0, 0, 1, 0.2;	195	glColor 0, 0, 1, 0.2;
187	glEnable GL_BLEND;	196	glEnable GL_BLEND;
188	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	197	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
200	my ($self) = @_;	209	my ($self) = @_;
201		210
202	warn "no draw defined for $self\n";	211	warn "no draw defined for $self\n";
203	}	212	}
204		213
205	sub bbox {
206	my ($self) = @_;
207	my ($w, $h) = $self->size_request;
208	(
209	$self->{x},
210	$self->{y},
211	$self->{x} = $w,
212	$self->{y} = $h
213	)
214	}
215
216	sub find_widget {	214	sub find_widget {
217	my ($self, $x, $y) = @_;	215	my ($self, $x, $y) = @_;
218		216
219	return $self	217	return $self
220	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	218	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	219	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
222		220
223	()	221	()
224	}	222	}
225		223
226	sub del_parent { $_[0]->{parent} = undef }
227
228	sub set_parent {	224	sub set_parent {
229	my ($self, $par) = @_;	225	my ($self, $par) = @_;
230		226
231	$self->{parent} = $par;	227	$self->{parent} = $par;
232	Scalar::Util::weaken $self->{parent};	228	Scalar::Util::weaken $self->{parent};
…		…
276		272
277	# range [value, low, high, page]	273	# range [value, low, high, page]
278		274
279	$class->SUPER::new (	275	$class->SUPER::new (
280	bg => [0, 0, 0, 0.2],	276	bg => [0, 0, 0, 0.2],
281	active_bg => [1, 1, 1],	277	active_bg => [1, 1, 1, 0.5],
282	@_	278	@_
283	)	279	)
284	}	280	}
285		281
286	sub _draw {	282	sub _draw {
…		…
443	}	439	}
444		440
445	sub render_chld {	441	sub render_chld {
446	my ($self) = @_;	442	my ($self) = @_;
447		443
448	$self->{texture} =	444	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
449	CFClient::Texture->new_from_opengl (	445	glClearColor 0, 0, 0, 1;
450	$self->{w}, $self->{h}, sub { $self->child->draw }	446	glClear GL_COLOR_BUFFER_BIT;
451	);	447	$self->child->draw;
		448	};
452	}	449	}
453		450
454	sub size_allocate {	451	sub size_allocate {
455	my ($self, $x, $y, $w, $h) = @_;	452	my ($self, $x, $y, $w, $h) = @_;
456		453
…		…
534		531
535	my @tex =	532	my @tex =
536	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	533	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
537	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	534	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
538		535
		536	sub new {
		537	my $class = shift;
		538
		539	# TODO: user_x, user_y, overwrite moveto?
		540
		541	$class->SUPER::new (
		542	bg => [1, 1, 1, 1],
		543	border_bg => [1, 1, 1, 1],
		544	border => $::FONTSIZE * 0.8,
		545	@_
		546	)
		547	}
		548
539	sub size_request {	549	sub size_request {
540	my ($self) = @_;	550	my ($self) = @_;
541		551
542	my ($w, $h) =	552	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
543	$self->{user_w} && $self->{user_h}	553
544	? ($self->{user_w}, $self->{user_h})
545	: ($self->SUPER::size_request);	554	my ($w, $h) = $self->SUPER::size_request;
546		555
547	$h += $tex[1]->{h};	556	(
548	$h += $tex[4]->{h};	557	$w + $self->{border} * 2,
549	$w += $tex[2]->{w};	558	$h + $self->{border} * 2,
550	$w += $tex[3]->{w};	559	)
551
552	($w, $h)
553	}	560	}
554		561
555	sub size_allocate {	562	sub size_allocate {
556	my ($self, $x, $y, $w, $h) = @_;	563	my ($self, $x, $y, $w, $h) = @_;
557		564
558	$self->_size_allocate ($x, $y, $w, $h) or return;	565	$self->_size_allocate ($x, $y, $w, $h) or return;
559		566
560	$h -= $tex[1]{h};	567	$h -= List::Util::max 0, $self->{border} * 2;
561	$h -= $tex[4]{h};	568	$w -= List::Util::max 0, $self->{border} * 2;
562	$w -= $tex[2]{w};
563	$w -= $tex[3]{w};
564		569
565	$h = $h < 0 ? 0 : $h;	570	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
566	$w = $w < 0 ? 0 : $w;
567
568	my $child = $self->child;
569
570	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
571	}	571	}
572		572
573	sub button_down {	573	sub button_down {
574	my ($self, $ev, $x, $y) = @_;	574	my ($self, $ev, $x, $y) = @_;
575		575
576	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}	576	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
577	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {	577	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
578		578
579	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	579	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
580	my ($bw, $bh) = ($self->{w}, $self->{h});	580	my ($bw, $bh) = ($self->{w}, $self->{h});
581		581
582	$self->{motion} = sub {	582	$self->{motion} = sub {
…		…
588	$self->{user_h} = $bh + $y - $oy;	588	$self->{user_h} = $bh + $y - $oy;
589	$self->update;	589	$self->update;
590	};	590	};
591		591
592	} elsif ($x >= 0 && $x < $self->{w}	592	} elsif ($x >= 0 && $x < $self->{w}
593	&& $y >= 0 && $y < $tex[1]{h}) {	593	&& $y >= 0 && $y < $self->{border}) {
594		594
595	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	595	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
596	my ($bx, $by) = ($self->{x}, $self->{y});	596	my ($bx, $by) = ($self->{x}, $self->{y});
597		597
598	$self->{motion} = sub {	598	$self->{motion} = sub {
…		…
619	}	619	}
620		620
621	sub _draw {	621	sub _draw {
622	my ($self) = @_;	622	my ($self) = @_;
623		623
624	my ($w, $h) = ($self->{w}, $self->{h});	624	my ($w, $h ) = ($self->{w}, $self->{h});
625	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	625	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
626		626
627	glEnable GL_BLEND;	627	glEnable GL_BLEND;
628	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	628	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629	glEnable GL_TEXTURE_2D;	629	glEnable GL_TEXTURE_2D;
630	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	630	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631		631
632	my $top = $tex[1];	632	glColor @{ $self->{border_bg} };
633	$top->draw_quad (0, 0, $w, $top->{h});	633	$tex[1]->draw_quad (0, 0, $w, $self->{border});
634		634	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
635	my $left = $tex[3];	635	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
636	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	636	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
637
638	my $right = $tex[2];
639	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
640
641	my $bottom = $tex[4];
642	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
643		637
644	my $bg = $tex[0];	638	my $bg = $tex[0];
645		639
646	glBindTexture GL_TEXTURE_2D, $bg->{name};	640	# TODO: repeat texture not scale
647	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
648	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
649	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
650
651	my $rep_x = $cw / $bg->{w};	641	my $rep_x = $cw / $bg->{w};
652	my $rep_y = $ch / $bg->{h};	642	my $rep_y = $ch / $bg->{h};
653		643
		644	glColor @{ $self->{bg} };
		645
		646	$bg->{s} = $rep_x;
		647	$bg->{t} = $rep_y;
		648	$bg->{wrap_mode} = 1;
654	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	649	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
655		650
656	glDisable GL_TEXTURE_2D;	651	glDisable GL_TEXTURE_2D;
657	glDisable GL_BLEND;	652	glDisable GL_BLEND;
658		653
659	$self->child->draw;	654	$self->child->draw;
660
661	}	655	}
662		656
663	#############################################################################	657	#############################################################################
664		658
665	package CFClient::UI::Table;	659	package CFClient::UI::Table;
…		…
667	our @ISA = CFClient::UI::Base::;	661	our @ISA = CFClient::UI::Base::;
668		662
669	use List::Util qw(max sum);	663	use List::Util qw(max sum);
670		664
671	use SDL::OpenGL;	665	use SDL::OpenGL;
		666
		667	sub new {
		668	my $class = shift;
		669
		670	$class->SUPER::new (
		671	col_expand => [],
		672	@_
		673	)
		674	}
672		675
673	sub add {	676	sub add {
674	my ($self, $x, $y, $chld) = @_;	677	my ($self, $x, $y, $chld) = @_;
675		678
676	$self->{children}[$y][$x] = $chld;	679	$self->{children}[$y][$x] = $chld;
…		…
706	my ($self) = @_;	709	my ($self) = @_;
707		710
708	my ($ws, $hs) = $self->get_wh;	711	my ($ws, $hs) = $self->get_wh;
709		712
710	(	713	(
711	(List::Util::sum @$ws),	714	(sum @$ws),
712	(List::Util::sum @$hs),	715	(sum @$hs),
713	)	716	)
714	}	717	}
715		718
716	sub size_allocate {	719	sub size_allocate {
717	my ($self, $x, $y, $w, $h) = @_;	720	my ($self, $x, $y, $w, $h) = @_;
718		721
719	$self->_size_allocate ($x, $y, $w, $h) or return;	722	$self->_size_allocate ($x, $y, $w, $h) or return;
720		723
721	my ($ws, $hs) = $self->get_wh;	724	my ($ws, $hs) = $self->get_wh;
722		725
723	my $req_w = List::Util::sum @$ws;	726	my $req_w = sum @$ws;
724	my $req_h = List::Util::sum @$hs;	727	my $req_h = sum @$hs;
		728
		729	# TODO: nicer code && do row_expand
		730	my @col_expand = @{$self->{col_expand}};
		731	@col_expand = (1) x @$ws unless @col_expand;
		732	my $col_expand = (sum @col_expand) \|\| 1;
725		733
726	# linearly scale sizes	734	# linearly scale sizes
727	$_ *= $w / $req_w for @$ws;	735	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728	$_ *= $h / $req_h for @$hs;	736	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
729		737
730	my $y;	738	my $y;
731		739
732	for my $r (0 .. $#{$self->{children}}) {	740	for my $r (0 .. $#{$self->{children}}) {
733	my $row = $self->{children}[$r]	741	my $row = $self->{children}[$r]
…		…
735		743
736	my $x = 0;	744	my $x = 0;
737	my $row_h = $hs->[$r];	745	my $row_h = $hs->[$r];
738		746
739	for my $c (0 .. $#$row) {	747	for my $c (0 .. $#$row) {
740	my $widget = $row->[$c]
741	or next;
742
743	my $col_w = $ws->[$c];	748	my $col_w = $ws->[$c];
744		749
		750	if (my $widget = $row->[$c]) {
745	$widget->size_allocate ($x, $y, $col_w, $row_h);	751	$widget->size_allocate ($x, $y, $col_w, $row_h);
		752	}
746		753
747	$x += $col_w;	754	$x += $col_w;
748	}	755	}
749		756
750	$y += $row_h;	757	$y += $row_h;
…		…
796	}	803	}
797		804
798	sub size_allocate {	805	sub size_allocate {
799	my ($self, $x, $y, $w, $h) = @_;	806	my ($self, $x, $y, $w, $h) = @_;
800		807
801	$self->_size_allocate ($x, $y, $w, $h) or return;	808	$self->_size_allocate ($x, $y, $w, $h);
802
803	return unless $self->{w};
804		809
805	($h, $w) = ($w, $h);	810	($h, $w) = ($w, $h);
806		811
807	my $children = $self->{children};	812	my $children = $self->{children};
808		813
…		…
810		815
811	my $req_h = List::Util::sum @h;	816	my $req_h = List::Util::sum @h;
812		817
813	if ($req_h > $h) {	818	if ($req_h > $h) {
814	# ah well, not enough space	819	# ah well, not enough space
815	$_ = $h[$_] * $h / $req_h for @h;	820	$_ *= $h / $req_h for @h;
816	} else {	821	} else {
817	my $exp = List::Util::sum map $_->{expand}, @$children;	822	my $exp = List::Util::sum map $_->{expand}, @$children;
818	$exp \|\|= 1;	823	$exp \|\|= 1;
819		824
820	for (0 .. $#$children) {	825	for (0 .. $#$children) {
…		…
827	}	832	}
828		833
829	my $y = 0;	834	my $y = 0;
830	for (0 .. $#$children) {	835	for (0 .. $#$children) {
831	my $child = $children->[$_];	836	my $child = $children->[$_];
832	my $h = $h[$_];	837	my $h = int $h[$_];
833	$child->size_allocate ($y, 0, $h, $w);	838	$child->size_allocate ($y, 0, $h, $w);
834		839
835	$y += $h;	840	$y += $h;
836	}	841	}
837	}	842	}
…		…
856	}	861	}
857		862
858	sub size_allocate {	863	sub size_allocate {
859	my ($self, $x, $y, $w, $h) = @_;	864	my ($self, $x, $y, $w, $h) = @_;
860		865
861	$self->_size_allocate ($x, $y, $w, $h) or return;	866	$self->_size_allocate ($x, $y, $w, $h);
862
863	return unless $self->{h};
864		867
865	my $children = $self->{children};	868	my $children = $self->{children};
866		869
867	my @h = map +($_->size_request)[1], @$children;	870	my @h = map +($_->size_request)[1], @$children;
868		871
869	my $req_h = List::Util::sum @h;	872	my $req_h = List::Util::sum @h;
870		873
871	if ($req_h > $h) {	874	if ($req_h > $h) {
872	# ah well, not enough space	875	# ah well, not enough space
873	$_ = $h[$_] * $h / $req_h for @h;	876	$_ *= $h / $req_h for @h;
874	} else {	877	} else {
875	my $exp = List::Util::sum map $_->{expand}, @$children;	878	my $exp = List::Util::sum map $_->{expand}, @$children;
876	$exp \|\|= 1;	879	$exp \|\|= 1;
877		880
878	for (0 .. $#$children) {	881	for (0 .. $#$children) {
…		…
883	}	886	}
884		887
885	my $y = 0;	888	my $y = 0;
886	for (0 .. $#$children) {	889	for (0 .. $#$children) {
887	my $child = $children->[$_];	890	my $child = $children->[$_];
888	my $h = $h[$_];	891	my $h = int $h[$_];
889	$child->size_allocate (0, $y, $w, $h);	892	$child->size_allocate (0, $y, $w, $h);
890		893
891	$y += $h;	894	$y += $h;
892	}	895	}
893	}	896	}
…		…
902		905
903	sub new {	906	sub new {
904	my ($class, %arg) = @_;	907	my ($class, %arg) = @_;
905		908
906	my $self = $class->SUPER::new (	909	my $self = $class->SUPER::new (
907	fg => [1, 1, 1],	910	fg => [1, 1, 1],
908	height => $::FONTSIZE,	911	fontsize => $::FONTSIZE,
909	text => "",	912	text => "",
910	align => -1,	913	align => -1,
911	padding => 2,	914	padding => 2,
912	layout => new CFClient::Layout,	915	layout => new CFClient::Layout,
913	%arg	916	%arg
914	);	917	);
915		918
916	$self->set_text ($self->{text});	919	$self->set_text ($self->{text});
917		920
…		…
933		936
934	$self->{text} = $text;	937	$self->{text} = $text;
935	$self->{layout}->set_markup ($text);	938	$self->{layout}->set_markup ($text);
936		939
937	delete $self->{texture};	940	delete $self->{texture};
		941	# $self->{w} = $self->{h} = -1;
938	$self->update;	942	$self->update;
939	}	943	}
940		944
941	sub get_text {	945	sub get_text {
942	my ($self, $text) = @_;	946	my ($self, $text) = @_;
…		…
946		950
947	sub size_request {	951	sub size_request {
948	my ($self) = @_;	952	my ($self) = @_;
949		953
950	$self->{layout}->set_width;	954	$self->{layout}->set_width;
951	$self->{layout}->set_height ($self->{height});	955	$self->{layout}->set_height ($self->{fontsize});
952	my ($w, $h) = $self->{layout}->size;	956	my ($w, $h) = $self->{layout}->size;
953		957
954	(	958	(
955	$w + $self->{padding} * 2,	959	$w + $self->{padding} * 2,
956	$h + $self->{padding} * 2,	960	$h + $self->{padding} * 2,
…		…
975	sub _draw {	979	sub _draw {
976	my ($self) = @_;	980	my ($self) = @_;
977		981
978	my $tex = $self->{texture} \|\|= do {	982	my $tex = $self->{texture} \|\|= do {
979	$self->{layout}->set_width ($self->{w});	983	$self->{layout}->set_width ($self->{w});
		984	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
980	new_from_layout CFClient::Texture $self->{layout}	985	new_from_layout CFClient::Texture $self->{layout}
981	};	986	};
982		987
983	glEnable GL_BLEND;	988	glEnable GL_BLEND;
984	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	989	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985	glEnable GL_TEXTURE_2D;	990	glEnable GL_TEXTURE_2D;
986	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987		992
988	glColor @{$self->{fg}};	993	glColor @{$self->{fg}};
989		994
990	my $x =	995	my $x =
991	$self->{align} < 0 ? $self->{padding}	996	$self->{align} < 0 ? $self->{padding}
992	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	997	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993	: ($self->{w} - $tex->{w}) * 0.5;	998	: ($self->{w} - $tex->{w}) * 0.5;
994		999
995	$tex->draw_quad ($x, $self->{padding});	1000	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
996		1001
997	glDisable GL_TEXTURE_2D;	1002	glDisable GL_TEXTURE_2D;
998	glDisable GL_BLEND;	1003	glDisable GL_BLEND;
999	}	1004	}
1000		1005
…		…
1011	my $class = shift;	1016	my $class = shift;
1012		1017
1013	$class->SUPER::new (	1018	$class->SUPER::new (
1014	fg => [1, 1, 1],	1019	fg => [1, 1, 1],
1015	bg => [0, 0, 0, 0.2],	1020	bg => [0, 0, 0, 0.2],
1016	active_bg => [1, 1, 1],	1021	active_bg => [1, 1, 1, 0.5],
1017	active_fg => [0, 0, 0],	1022	active_fg => [0, 0, 0],
		1023	can_hover => 1,
		1024	can_focus => 1,
1018	@_	1025	@_
1019	)	1026	)
1020	}	1027	}
1021		1028
1022	sub _set_text {	1029	sub _set_text {
1023	my ($self, $text) = @_;	1030	my ($self, $text) = @_;
1024		1031
		1032	my $old_text = $self->{text};
		1033
1025	$self->{last_activity} = $::NOW;	1034	$self->{last_activity} = $::NOW;
1026		1035
1027	$self->{text} = $text;	1036	$self->{text} = $text;
1028	$self->{layout}->set_width ($self->{w});	1037	$self->{layout}->set_width ($self->{w});
		1038	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1029		1039
1030	$text =~ s/./*/g if $self->{hidden};	1040	$text =~ s/./*/g if $self->{hidden};
1031		1041
1032	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1042	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
1033		1043
1034	$text = substr $text, 0, $self->{cursor};	1044	$text = substr $text, 0, $self->{cursor};
1035	utf8::encode $text;	1045	utf8::encode $text;
1036		1046
1037	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	1047	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1048
		1049	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
		1050	if $old_text ne $self->{text};
1038	}	1051	}
1039		1052
1040	sub size_request {	1053	sub size_request {
1041	my ($self) = @_;	1054	my ($self) = @_;
1042		1055
…		…
1081	++$self->{cursor} if $self->{cursor} < length $self->{text};	1094	++$self->{cursor} if $self->{cursor} < length $self->{text};
1082	} elsif ($sym == SDLK_HOME) {	1095	} elsif ($sym == SDLK_HOME) {
1083	$self->{cursor} = 0;	1096	$self->{cursor} = 0;
1084	} elsif ($sym == SDLK_END) {	1097	} elsif ($sym == SDLK_END) {
1085	$self->{cursor} = length $text;	1098	$self->{cursor} = length $text;
		1099	} elsif ($sym == SDLK_ESCAPE) {
		1100	$self->emit ('escape');
1086	} elsif ($uni) {	1101	} elsif ($uni) {
1087	substr $text, $self->{cursor}++, 0, chr $uni;	1102	substr $text, $self->{cursor}++, 0, chr $uni;
1088	}	1103	}
1089		1104
1090	$self->_set_text ($text);	1105	$self->_set_text ($text);
…		…
1152	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1167	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1153	glEnd;	1168	glEnd;
1154	}	1169	}
1155	}	1170	}
1156		1171
1157	#############################################################################
1158
1159	package CFClient::UI::Slider;	1172	package CFClient::UI::LineEntry;
1160		1173
1161	use strict;	1174	our @ISA = CFClient::UI::Entry::;
1162		1175
		1176	use SDL;
1163	use SDL::OpenGL;	1177	use SDL::OpenGL;
1164		1178
		1179	sub key_down {
		1180	my ($self, $ev) = @_;
		1181
		1182	my $sym = $ev->key_sym;
		1183
		1184	if ($sym == SDLK_RETURN) {
		1185	$self->emit (activate => $self->get_text);
		1186	$self->update;
		1187
		1188	} else {
		1189	$self->SUPER::key_down ($ev);
		1190	}
		1191
		1192	}
		1193
		1194	#############################################################################
		1195
		1196	package CFClient::UI::Button;
		1197
1165	our @ISA = CFClient::UI::DrawBG::;	1198	our @ISA = CFClient::UI::Label::;
		1199
		1200	use SDL;
		1201	use SDL::OpenGL;
		1202
		1203	my @tex =
		1204	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1205	qw(b1_button_active.png);
1166		1206
1167	sub new {	1207	sub new {
1168	my $class = shift;	1208	my $class = shift;
1169		1209
		1210	$class->SUPER::new (
		1211	padding => 4,
		1212	fg => [1, 1, 1],
		1213	bg => [1, 1, 1, 0.2],
		1214	active_fg => [1, 1, 0],
		1215	can_hover => 1,
		1216	@_
		1217	)
		1218	}
		1219
		1220	sub button_up {
		1221	my ($self, $ev, $x, $y) = @_;
		1222
		1223	if ($x >= 0 && $x < $self->{w}
		1224	&& $y >= 0 && $y < $self->{h}) {
		1225	$self->emit ("activate");
		1226	}
		1227	}
		1228
		1229	sub _draw {
		1230	my ($self) = @_;
		1231
		1232	local $self->{fg} = $self->{fg};
		1233	my $tex = $tex[0];
		1234
		1235	glEnable GL_BLEND;
		1236	glEnable GL_TEXTURE_2D;
		1237	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1238
		1239	if ($GRAB == $self) {
		1240	$self->{fg} = $self->{active_fg};
		1241	}
		1242
		1243	glBindTexture GL_TEXTURE_2D, $tex->{name};
		1244	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1245
		1246	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		1247
		1248	glDisable GL_TEXTURE_2D;
		1249	glDisable GL_BLEND;
		1250
		1251	$self->SUPER::_draw;
		1252	}
		1253
		1254	#############################################################################
		1255
		1256	package CFClient::UI::CheckBox;
		1257
		1258	our @ISA = CFClient::UI::DrawBG::;
		1259
		1260	my @tex =
		1261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1262	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1263
		1264	use SDL;
		1265	use SDL::OpenGL;
		1266
		1267	sub new {
		1268	my $class = shift;
		1269
		1270	$class->SUPER::new (
		1271	padding => 2,
		1272	fg => [1, 1, 1],
		1273	active_fg => [1, 1, 0],
		1274	state => 0,
		1275	can_hover => 1,
		1276	@_
		1277	)
		1278	}
		1279
		1280	sub size_request {
		1281	my ($self) = @_;
		1282
		1283	($self->{padding} * 2 + 6) x 2
		1284	}
		1285
		1286	sub size_allocate {
		1287	my ($self, $x, $y, $w, $h) = @_;
		1288
		1289	$self->_size_allocate ($x, $y, $w, $h);
		1290	}
		1291
		1292	sub button_down {
		1293	my ($self, $ev, $x, $y) = @_;
		1294
		1295	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1296	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1297	$self->{state} = !$self->{state};
		1298	$self->emit (changed => $self->{state});
		1299	}
		1300	}
		1301
		1302	sub _draw {
		1303	my ($self) = @_;
		1304
		1305	$self->SUPER::_draw;
		1306
		1307	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1308
		1309	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1310
		1311	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1312
		1313	glEnable GL_BLEND;
		1314	glEnable GL_TEXTURE_2D;
		1315	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1316
		1317	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1318
		1319	$tex->draw_quad (0, 0, $s, $s);
		1320
		1321	glDisable GL_TEXTURE_2D;
		1322	glDisable GL_BLEND;
		1323	}
		1324
		1325	#############################################################################
		1326
		1327	package CFClient::UI::Slider;
		1328
		1329	use strict;
		1330
		1331	use SDL::OpenGL;
		1332
		1333	our @ISA = CFClient::UI::DrawBG::;
		1334
		1335	my @tex =
		1336	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1337	qw(s1_slider.png s1_slider_bg.png);
		1338
		1339	sub new {
		1340	my $class = shift;
		1341
1170	# range [value, low, high, page]	1342	# range [value, low, high, page]
1171		1343
		1344	# TODO: 0-width page
		1345	# TODO: req_w/h are wrong with vertical
		1346	# TODO: calculations are off
1172	my $self = $class->SUPER::new (	1347	my $self = $class->SUPER::new (
1173	fg => [1, 1, 1],	1348	fg => [1, 1, 1],
1174	active_fg => [0, 0, 0],	1349	active_fg => [0, 0, 0],
1175	range => [0, 0, 100, 10],	1350	range => [0, 0, 100, 10],
1176	req_w => 40,	1351	req_w => 40,
1177	req_h => 10,	1352	req_h => 13,
1178	vertical => 0,	1353	vertical => 0,
		1354	can_hover => 1,
		1355	inner_pad => 5,
1179	@_	1356	@_
1180	);	1357	);
1181		1358
1182	$self	1359	$self
1183	}	1360	}
…		…
1204	if ($GRAB == $self) {	1381	if ($GRAB == $self) {
1205	my ($value, $lo, $hi, $page) = @{$self->{range}};	1382	my ($value, $lo, $hi, $page) = @{$self->{range}};
1206		1383
1207	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1384	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1208		1385
		1386	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1387	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1388
		1389	$x -= $inner_pad_px; # substract the padding
1209	$x = $x * ($hi - $lo) / $w + $lo;	1390	$x = $x * ($hi - $lo) / $inner_w + $lo;
1210	$x = $lo if $x < $lo;	1391	$x = $lo if $x < $lo;
1211	$x = $hi - $page if $x > $hi - $page;	1392	$x = $hi - $page if $x > $hi - $page;
1212	$self->{range}[0] = $x;	1393	$self->{range}[0] = $x;
1213		1394
1214	$self->emit (changed => $x);	1395	$self->emit (changed => $x);
1215	$self->update;	1396	$self->update;
1216	}	1397	}
		1398	}
		1399
		1400	# the inner_* stuff is for generating a padding for the slider handle,
		1401	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1402	# correct propably, but it does the job for now
		1403	sub _calc_inner_pad_px {
		1404	my ($self, $w) = @_;
		1405	($w / 100) * $self->{inner_pad} # % to pixels
1217	}	1406	}
1218		1407
1219	sub _draw {	1408	sub _draw {
1220	my ($self) = @_;	1409	my ($self) = @_;
1221		1410
…		…
1235	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1424	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1236	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1425	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1237		1426
1238	my ($value, $lo, $hi, $page) = @{$self->{range}};	1427	my ($value, $lo, $hi, $page) = @{$self->{range}};
1239		1428
		1429	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1430	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1431
1240	$page = int $page * $w / ($hi - $lo);	1432	$page = int $page * $inner_w / ($hi - $lo);
1241	$value = int +($value - $lo) * $w / ($hi - $lo);	1433	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1242		1434
1243	$w -= $page;	1435	$w -= $page;
1244	$page &= ~1;	1436	$page &= ~1;
1245	glTranslate $page * 0.5, 0, 0;	1437	glTranslate $page * 0.5, 0, 0;
		1438	$page \|\|= 2;
1246		1439
1247	glColor @$fg;
1248	glBegin GL_LINES;
1249	glVertex 0, 0; glVertex 0, $h;
1250	glVertex $w - 1, 0; glVertex $w - 1, $h;
1251	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1252	glEnd;
1253
1254	my $knob_a = $value - $page * 0.5;	1440	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1255	my $knob_b = $value + $page * 0.5;	1441	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1256		1442
1257	glBegin GL_QUADS;	1443	glEnable GL_BLEND;
1258	glColor @$fg;	1444	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1259	glVertex $knob_a, 0;	1445	glEnable GL_TEXTURE_2D;
1260	glVertex $knob_a, $h;	1446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1261	glVertex $knob_b, $h;
1262	glVertex $knob_b, 0;
1263		1447
1264	if ($knob_a < $knob_b - 2) {	1448	# draw background
1265	glColor @$bg;	1449	$tex[1]->draw_quad (0, 0, $w, $h);
1266	glVertex $knob_a + 1, 1;	1450
1267	glVertex $knob_a + 1, $h - 1;	1451	# draw handle
1268	glVertex $knob_b - 1, $h - 1;	1452	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1269	glVertex $knob_b - 1, 1;	1453
		1454	glDisable GL_BLEND;
		1455	glDisable GL_TEXTURE_2D;
		1456	}
		1457
		1458	#############################################################################
		1459
		1460	package CFClient::UI::TextView;
		1461
		1462	our @ISA = CFClient::UI::HBox::;
		1463
		1464	use SDL::OpenGL;
		1465
		1466	sub new {
		1467	my $class = shift;
		1468
		1469	my $self = $class->SUPER::new (
		1470	req_w => $::WIDTH / 6,
		1471	req_h => $::HEIGHT / 6,
		1472	fontsize => $::FONTSIZE,
		1473	@_,
		1474
		1475	layout => (new CFClient::Layout),
		1476	par => [],
		1477	height => 0,
		1478	children => [
		1479	(new CFClient::UI::Empty expand => 1),
		1480	(new CFClient::UI::Slider vertical => 1),
		1481	],
		1482	);
		1483
		1484	$self
		1485	}
		1486
		1487	sub text_height {
		1488	my ($self, $text) = @_;
		1489
		1490	my $layout = $self->{layout};
		1491
		1492	$layout->set_height ($self->{fontsize});
		1493	$layout->set_width ($self->{w});
		1494	$layout->set_text ($text);
		1495
		1496	($layout->size)[1]
		1497	}
		1498
		1499	sub reflow {
		1500	my ($self) = @_;
		1501
		1502	my $height = 0;
		1503
		1504	for (@{$self->{par}}) {
		1505	$height += $_->[0] = $self->text_height ($_->[2]);
		1506	}
		1507
		1508	$self->{height} = $height;
		1509
		1510	$self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1511	}
		1512
		1513	sub size_request {
		1514	my ($self) = @_;
		1515
		1516	($self->{req_w}, $self->{req_h})
		1517	}
		1518
		1519	sub size_allocate {
		1520	my ($self, $x, $y, $w, $h) = @_;
		1521
		1522	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1523
		1524	$self->{layout}->set_height ($self->{fontsize});
		1525	$self->{layout}->set_width ($self->{w});
		1526
		1527	$self->reflow;
		1528	$self->update;
		1529	}
		1530
		1531	sub add_paragraph {
		1532	my ($self, $color, $text) = @_;
		1533
		1534	#TODO: intelligently "reformat" paragraph
		1535
		1536	my $height = $self->text_height ($text);
		1537
		1538	$self->{height} += $height;
		1539
		1540	push @{$self->{par}}, [$height, $color, $text];
		1541
		1542	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1543	$self->{children}[1]->update;
		1544	}
		1545
		1546	sub update {
		1547	my ($self) = @_;
		1548
		1549	$self->SUPER::update;
		1550
		1551	return unless $self->{h} > 0;
		1552
		1553	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1554	glClearColor 0, 0, 0, 1;
		1555	glClear GL_COLOR_BUFFER_BIT;
		1556
		1557	my $y0 = $self->{height} - $self->{h};
		1558	my $y1 = $self->{height};
		1559
		1560	glEnable GL_BLEND;
		1561	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1562	glEnable GL_TEXTURE_2D;
		1563	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1564
		1565	my $y = 0;
		1566
		1567	my $layout = $self->{layout};
		1568
		1569	for my $par (@{$self->{par}}) {
		1570	my $h = $par->[0];
		1571
		1572	if ($y0 < $y + $h && $y < $y1) {
		1573	$layout->set_text ($par->[2]);
		1574
		1575	glColor @{ $par->[1] };
		1576	my ($W, $H) = $layout->size;
		1577	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1578	}
		1579
		1580	$y += $h;
		1581	}
		1582
		1583	glDisable GL_TEXTURE_2D;
		1584	glDisable GL_BLEND;
1270	}	1585	};
1271	glEnd;	1586	}
		1587
		1588	sub _draw {
		1589	my ($self) = @_;
		1590
		1591	if ($self->{texture}) {
		1592	glEnable GL_TEXTURE_2D;
		1593	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1594	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1595	glDisable GL_TEXTURE_2D;
		1596	}
		1597
1272	}	1598	}
1273		1599
1274	#############################################################################	1600	#############################################################################
1275		1601
1276	package CFClient::UI::MapWidget;	1602	package CFClient::UI::MapWidget;
…		…
1286		1612
1287	sub new {	1613	sub new {
1288	my $class = shift;	1614	my $class = shift;
1289		1615
1290	$class->SUPER::new (	1616	$class->SUPER::new (
1291	z => -1,	1617	z => -1,
		1618	can_focus => 1,
1292	list => (glGenLists 1),	1619	list => (glGenLists 1),
1293	@_	1620	@_
1294	)	1621	)
1295	}	1622	}
1296		1623
1297	sub key_down {	1624	sub key_down {
…		…
1316	}	1643	}
1317		1644
1318	sub draw {	1645	sub draw {
1319	my ($self) = @_;	1646	my ($self) = @_;
1320		1647
		1648	$self->{need_update}++;#d#
1321	if (delete $self->{need_update}) {	1649	if (delete $self->{need_update}) {
1322	glNewList $self->{list}, GL_COMPILE;	1650	glNewList $self->{list}, GL_COMPILE;
1323		1651
1324	my $mx = $::CONN->{mapx};
1325	my $my = $::CONN->{mapy};
1326
1327	my $map = $::CONN->{map};
1328
1329	my ($xofs, $yofs);
1330
1331	my $sw = 1 + int $::WIDTH / 32;	1652	my $sw = int $::WIDTH / 32;
1332	my $sh = 1 + int $::HEIGHT / 32;	1653	my $sh = int $::HEIGHT / 32;
1333		1654
1334	if ($::CONN->{mapw} > $sw) {	1655	if ($::MAP) {
1335	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1656	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1336	} else {
1337	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1338	}
1339		1657
1340	if ($::CONN->{maph} > $sh) {	1658	if ($::CFG->{fow_enable}) {
1341	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	1659	if ($::CFG->{fow_smooth}) { # smooth fog of war
1342	} else {	1660	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1343	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	1661	glConvolutionFilter2D
1344	}	1662	GL_CONVOLUTION_2D,
1345		1663	GL_ALPHA,
1346	glEnable GL_TEXTURE_2D;	1664	3, 3,
1347	glEnable GL_BLEND;	1665	GL_ALPHA, GL_FLOAT,
1348	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1666	pack "f*",
1349	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1667	0.1, 0.1, 0.1,
1350		1668	0.1, 0.2, 0.1,
1351	my $sw4 = ($sw + 3) & ~3;	1669	0.1, 0.1, 0.1,
1352	my $darkness = "\x00" x ($sw4 * $sh);
1353
1354	for my $x (0 .. $sw - 1) {
1355	my $row = $map->[$x + $xofs];
1356	for my $y (0 .. $sh - 1) {
1357
1358	my $cell = $row->[$y + $yofs]
1359	or next;	1670	;
1360		1671	glEnable GL_CONVOLUTION_2D;
1361	my $dark = $cell->[0];
1362	if ($dark < 0) {
1363	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1364	} else {
1365	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1366	}	1672	}
1367		1673
1368	for my $num (grep $_, @$cell[1,2,3]) {	1674	my $tex = new CFClient::Texture
1369	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	1675	w => $w,
1370		1676	h => $h,
1371	my ($w, $h) = @$tex{qw(w h)};	1677	data => $data,
		1678	internalformat => GL_ALPHA,
		1679	format => GL_ALPHA;
1372		1680
1373	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);	1681	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1374	}	1682
		1683	glEnable GL_BLEND;
		1684	glEnable GL_TEXTURE_2D;
		1685	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1686
		1687	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1688	$tex->draw_quad (0, 0, $w * 32, $h * 32);
		1689
		1690	glDisable GL_TEXTURE_2D;
		1691	glDisable GL_BLEND;
1375	}	1692	}
1376	}	1693	}
1377		1694
1378	# if (1) { # higher quality darkness
1379	# $lighting =~ s/(.)/$1$1$1/gs;
1380	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1381	#
1382	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1383	#
1384	# $lighting = $pb->get_pixels;
1385	# $lighting =~ s/(.)../$1/gs;
1386	# }
1387
1388	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1389
1390	$darkness = new CFClient::Texture
1391	w => $sw4,
1392	h => $sh,
1393	data => $darkness,
1394	internalformat => GL_ALPHA,
1395	format => GL_ALPHA;
1396
1397	glColor 0.45, 0.45, 0.45, 1;
1398	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1399
1400	glDisable GL_TEXTURE_2D;
1401	glDisable GL_BLEND;
1402
1403	glEndList;	1695	glEndList;
1404	}	1696	}
1405		1697
1406	glCallList $self->{list};	1698	glCallList $self->{list};
		1699
		1700	if ($FOCUS != $self) {
		1701	glColor 64/255, 64/255, 64/255;
		1702	glLogicOp GL_AND;
		1703	glEnable GL_COLOR_LOGIC_OP;
		1704	glBegin GL_QUADS;
		1705	glVertex 0, 0;
		1706	glVertex 0, $::HEIGHT;
		1707	glVertex $::WIDTH, $::HEIGHT;
		1708	glVertex $::WIDTH, 0;
		1709	glEnd;
		1710	glDisable GL_COLOR_LOGIC_OP;
		1711	}
1407	}	1712	}
1408		1713
1409	my %DIR = (	1714	my %DIR = (
1410	SDLK_KP8, [1, "north"],	1715	SDLK_KP8, [1, "north"],
1411	SDLK_KP9, [2, "northeast"],	1716	SDLK_KP9, [2, "northeast"],
…		…
1427		1732
1428	my $mod = $ev->key_mod;	1733	my $mod = $ev->key_mod;
1429	my $sym = $ev->key_sym;	1734	my $sym = $ev->key_sym;
1430		1735
1431	if ($sym == SDLK_KP5) {	1736	if ($sym == SDLK_KP5) {
1432	$::CONN->send ("command stay fire");	1737	$::CONN->user_send ("command stay fire");
		1738	} elsif ($sym == SDLK_a) {
		1739	$::CONN->user_send ("command apply");
		1740	} elsif ($sym == SDLK_QUOTE) {
		1741	$self->emit ('activate_console');
		1742	} elsif ($sym == SDLK_SLASH) {
		1743	$self->emit ('activate_console' => '/');
1433	} elsif (exists $DIR{$sym}) {	1744	} elsif (exists $DIR{$sym}) {
1434	if ($mod & KMOD_SHIFT) {	1745	if ($mod & KMOD_SHIFT) {
1435	$self->{shft}++;	1746	$self->{shft}++;
1436	$::CONN->send ("command fire $DIR{$sym}[0]");	1747	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1437	} elsif ($mod & KMOD_CTRL) {	1748	} elsif ($mod & KMOD_CTRL) {
1438	$self->{ctrl}++;	1749	$self->{ctrl}++;
1439	$::CONN->send ("command run $DIR{$sym}[0]");	1750	$::CONN->user_send ("command run $DIR{$sym}[0]");
1440	} else {	1751	} else {
1441	$::CONN->send ("command $DIR{$sym}[1]");	1752	$::CONN->user_send ("command $DIR{$sym}[1]");
1442	}	1753	}
1443	}	1754	}
1444	}	1755	}
1445		1756
1446	sub key_up {	1757	sub key_up {
…		…
1448		1759
1449	my $mod = $ev->key_mod;	1760	my $mod = $ev->key_mod;
1450	my $sym = $ev->key_sym;	1761	my $sym = $ev->key_sym;
1451		1762
1452	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1763	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1453	$::CONN->send ("command fire_stop");	1764	$::CONN->user_send ("command fire_stop");
1454	}	1765	}
1455	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1766	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1456	$::CONN->send ("command run_stop");	1767	$::CONN->user_send ("command run_stop");
1457	}	1768	}
1458	}	1769	}
1459		1770
1460	#############################################################################	1771	#############################################################################
1461		1772
…		…
1499	glPopMatrix;	1810	glPopMatrix;
1500	}	1811	}
1501		1812
1502	#############################################################################	1813	#############################################################################
1503		1814
		1815	package CFClient::UI::Flopper;
		1816
		1817	our @ISA = CFClient::UI::Button::;
		1818
		1819	sub new {
		1820	my $class = shift;
		1821
		1822	my $self = $class->SUPER::new (
		1823	state => 0,
		1824	connect_activate => \&toggle_flopper,
		1825	@_
		1826	);
		1827
		1828	if ($self->{state}) {
		1829	$self->{state} = 0;
		1830	$self->toggle_flopper;
		1831	}
		1832
		1833	$self
		1834	}
		1835
		1836	sub toggle_flopper {
		1837	my ($self) = @_;
		1838
		1839	# TODO: use animation
		1840	if ($self->{state} = !$self->{state}) {
		1841	$CFClient::UI::TOPLEVEL->add ($self->{other});
		1842	$self->{other}->move (
		1843	($::WIDTH - $self->{other}{w}) * 0.5,
		1844	($::HEIGHT - $self->{other}{h}) * 0.5,
		1845	);
		1846	} else {
		1847	$CFClient::UI::TOPLEVEL->remove ($self->{other});
		1848	}
		1849	}
		1850
		1851	#############################################################################
		1852
1504	package CFClient::UI::Toplevel;	1853	package CFClient::UI::Toplevel;
1505		1854
1506	our @ISA = CFClient::UI::Container::;	1855	our @ISA = CFClient::UI::Container::;
1507		1856
1508	sub size_request {	1857	sub size_request {

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.77 by root, Tue Apr 11 22:14:13 2006 UTC vs. Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.77 by root, Tue Apr 11 22:14:13 2006 UTC vs.
Revision 1.105 by root, Fri Apr 14 14:55:28 2006 UTC