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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.86 by root, Wed Apr 12 15:35:54 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 12:29:46 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	}
		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;
…		…
144		157
145	sub focus_in {	158	sub focus_in {
146	my ($self) = @_;	159	my ($self) = @_;
147		160
148	return if $FOCUS == $self;	161	return if $FOCUS == $self;
		162	return unless $self->{can_focus};
149		163
150	my $focus = $FOCUS; $FOCUS = $self;	164	my $focus = $FOCUS; $FOCUS = $self;
151	$focus->update if $focus;	165	$focus->update if $focus;
152	$FOCUS->update;	166	$FOCUS->update;
153	}	167	}
…		…
186	glPushMatrix;	200	glPushMatrix;
187	glTranslate $self->{x}, $self->{y}, 0;	201	glTranslate $self->{x}, $self->{y}, 0;
188	$self->_draw;	202	$self->_draw;
189	glPopMatrix;	203	glPopMatrix;
190		204
191	if ($self == $HOVER) {	205	if ($self == $HOVER && $self->{can_hover}) {
192	my ($x, $y) = @$self{qw(x y)};	206	my ($x, $y) = @$self{qw(x y)};
193		207
194	glColor 0, 0, 1, 0.2;	208	glColor 0, 0, 1, 0.2;
195	glEnable GL_BLEND;	209	glEnable GL_BLEND;
196	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	210	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
438	}	452	}
439		453
440	sub render_chld {	454	sub render_chld {
441	my ($self) = @_;	455	my ($self) = @_;
442		456
443	$self->{texture} =	457	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
444	CFClient::Texture->new_from_opengl (	458	glClearColor 0, 0, 0, 1;
445	$self->{w}, $self->{h}, sub { $self->child->draw }	459	glClear GL_COLOR_BUFFER_BIT;
446	);	460	$self->child->draw;
		461	};
447	}	462	}
448		463
449	sub size_allocate {	464	sub size_allocate {
450	my ($self, $x, $y, $w, $h) = @_;	465	my ($self, $x, $y, $w, $h) = @_;
451		466
…		…
529		544
530	my @tex =	545	my @tex =
531	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	546	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);	547	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533		548
		549	sub new {
		550	my $class = shift;
		551
		552	# TODO: user_x, user_y, overwrite moveto?
		553
		554	$class->SUPER::new (
		555	bg => [1, 1, 1, 1],
		556	border_bg => [1, 1, 1, 1],
		557	border => $::FONTSIZE * 0.8,
		558	@_
		559	)
		560	}
		561
534	sub size_request {	562	sub size_request {
535	my ($self) = @_;	563	my ($self) = @_;
536		564
537	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};	565	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538		566
539	my ($w, $h) = $self->SUPER::size_request;	567	my ($w, $h) = $self->SUPER::size_request;
540		568
541	$h += $tex[1]->{h};	569	(
542	$h += $tex[4]->{h};	570	$w + $self->{border} * 2,
543	$w += $tex[2]->{w};	571	$h + $self->{border} * 2,
544	$w += $tex[3]->{w};	572	)
545
546	($w, $h)
547	}	573	}
548		574
549	sub size_allocate {	575	sub size_allocate {
550	my ($self, $x, $y, $w, $h) = @_;	576	my ($self, $x, $y, $w, $h) = @_;
551		577
552	$self->_size_allocate ($x, $y, $w, $h) or return;	578	$self->_size_allocate ($x, $y, $w, $h) or return;
553		579
554	$h -= $tex[1]{h};	580	$h -= List::Util::max 0, $self->{border} * 2;
555	$h -= $tex[4]{h};	581	$w -= List::Util::max 0, $self->{border} * 2;
556	$w -= $tex[2]{w};
557	$w -= $tex[3]{w};
558		582
559	$h = $h < 0 ? 0 : $h;	583	$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	}	584	}
566		585
567	sub button_down {	586	sub button_down {
568	my ($self, $ev, $x, $y) = @_;	587	my ($self, $ev, $x, $y) = @_;
569		588
570	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}	589	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
571	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {	590	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
572		591
573	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	592	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574	my ($bw, $bh) = ($self->{w}, $self->{h});	593	my ($bw, $bh) = ($self->{w}, $self->{h});
575		594
576	$self->{motion} = sub {	595	$self->{motion} = sub {
…		…
582	$self->{user_h} = $bh + $y - $oy;	601	$self->{user_h} = $bh + $y - $oy;
583	$self->update;	602	$self->update;
584	};	603	};
585		604
586	} elsif ($x >= 0 && $x < $self->{w}	605	} elsif ($x >= 0 && $x < $self->{w}
587	&& $y >= 0 && $y < $tex[1]{h}) {	606	&& $y >= 0 && $y < $self->{border}) {
588		607
589	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	608	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590	my ($bx, $by) = ($self->{x}, $self->{y});	609	my ($bx, $by) = ($self->{x}, $self->{y});
591		610
592	$self->{motion} = sub {	611	$self->{motion} = sub {
…		…
613	}	632	}
614		633
615	sub _draw {	634	sub _draw {
616	my ($self) = @_;	635	my ($self) = @_;
617		636
618	my ($w, $h) = ($self->{w}, $self->{h});	637	my ($w, $h ) = ($self->{w}, $self->{h});
619	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	638	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620		639
621	glEnable GL_BLEND;	640	glEnable GL_BLEND;
622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	641	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623	glEnable GL_TEXTURE_2D;	642	glEnable GL_TEXTURE_2D;
624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	643	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625		644
626	my $top = $tex[1];	645	glColor @{ $self->{border_bg} };
627	$top->draw_quad (0, 0, $w, $top->{h});	646	$tex[1]->draw_quad (0, 0, $w, $self->{border});
628		647	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
629	my $left = $tex[3];	648	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
630	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	649	$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		650
638	my $bg = $tex[0];	651	my $bg = $tex[0];
639		652
640	glBindTexture GL_TEXTURE_2D, $bg->{name};	653	# TODO: repeat texture not scale
641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642
643	my $rep_x = $cw / $bg->{w};	654	my $rep_x = $cw / $bg->{w};
644	my $rep_y = $ch / $bg->{h};	655	my $rep_y = $ch / $bg->{h};
645		656
		657	glColor @{ $self->{bg} };
		658
		659	$bg->{s} = $rep_x;
		660	$bg->{t} = $rep_y;
		661	$bg->{wrap_mode} = 1;
646	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	662	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
647		663
648	glDisable GL_TEXTURE_2D;	664	glDisable GL_TEXTURE_2D;
649	glDisable GL_BLEND;	665	glDisable GL_BLEND;
650		666
651	$self->child->draw;	667	$self->child->draw;
652
653	}	668	}
654		669
655	#############################################################################	670	#############################################################################
656		671
657	package CFClient::UI::Table;	672	package CFClient::UI::Table;
…		…
730	my $col_expand = (sum @col_expand) \|\| 1;	745	my $col_expand = (sum @col_expand) \|\| 1;
731		746
732	# linearly scale sizes	747	# linearly scale sizes
733	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	748	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	749	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		750
		751	CFClient::UI::harmonize $ws;
		752	CFClient::UI::harmonize $hs;
735		753
736	my $y;	754	my $y;
737		755
738	for my $r (0 .. $#{$self->{children}}) {	756	for my $r (0 .. $#{$self->{children}}) {
739	my $row = $self->{children}[$r]	757	my $row = $self->{children}[$r]
…		…
827	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	845	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
828	$h[$_] = $alloc_h;	846	$h[$_] = $alloc_h;
829	}	847	}
830	}	848	}
831		849
		850	CFClient::UI::harmonize \@h;
		851
832	my $y = 0;	852	my $y = 0;
833	for (0 .. $#$children) {	853	for (0 .. $#$children) {
834	my $child = $children->[$_];	854	my $child = $children->[$_];
835	my $h = $h[$_];	855	my $h = $h[$_];
836	$child->size_allocate ($y, 0, $h, $w);	856	$child->size_allocate ($y, 0, $h, $w);
…		…
881		901
882	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	902	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
883	}	903	}
884	}	904	}
885		905
		906	CFClient::UI::harmonize \@h;
		907
886	my $y = 0;	908	my $y = 0;
887	for (0 .. $#$children) {	909	for (0 .. $#$children) {
888	my $child = $children->[$_];	910	my $child = $children->[$_];
889	my $h = $h[$_];	911	my $h = $h[$_];
890	$child->size_allocate (0, $y, $w, $h);	912	$child->size_allocate (0, $y, $w, $h);
…		…
903		925
904	sub new {	926	sub new {
905	my ($class, %arg) = @_;	927	my ($class, %arg) = @_;
906		928
907	my $self = $class->SUPER::new (	929	my $self = $class->SUPER::new (
908	fg => [1, 1, 1],	930	fg => [1, 1, 1],
909	height => $::FONTSIZE,	931	fontsize => $::FONTSIZE,
910	text => "",	932	text => "",
911	align => -1,	933	align => -1,
912	padding => 2,	934	padding => 2,
913	layout => new CFClient::Layout,	935	layout => new CFClient::Layout,
914	%arg	936	%arg
915	);	937	);
916		938
917	$self->set_text ($self->{text});	939	$self->set_text ($self->{text});
918		940
…		…
948		970
949	sub size_request {	971	sub size_request {
950	my ($self) = @_;	972	my ($self) = @_;
951		973
952	$self->{layout}->set_width;	974	$self->{layout}->set_width;
953	$self->{layout}->set_height ($self->{height});	975	$self->{layout}->set_height ($self->{fontsize});
954	my ($w, $h) = $self->{layout}->size;	976	my ($w, $h) = $self->{layout}->size;
955		977
956	(	978	(
957	$w + $self->{padding} * 2,	979	$w + $self->{padding} * 2,
958	$h + $self->{padding} * 2,	980	$h + $self->{padding} * 2,
…		…
977	sub _draw {	999	sub _draw {
978	my ($self) = @_;	1000	my ($self) = @_;
979		1001
980	my $tex = $self->{texture} \|\|= do {	1002	my $tex = $self->{texture} \|\|= do {
981	$self->{layout}->set_width ($self->{w});	1003	$self->{layout}->set_width ($self->{w});
982	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1004	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
983	new_from_layout CFClient::Texture $self->{layout}	1005	new_from_layout CFClient::Texture $self->{layout}
984	};	1006	};
985		1007
986	glEnable GL_BLEND;	1008	glEnable GL_BLEND;
987	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1009	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
988	glEnable GL_TEXTURE_2D;	1010	glEnable GL_TEXTURE_2D;
989	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1011	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
990		1012
991	glColor @{$self->{fg}};	1013	glColor @{$self->{fg}};
992		1014
993	my $x =	1015	my $x =
994	$self->{align} < 0 ? $self->{padding}	1016	$self->{align} < 0 ? $self->{padding}
995	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1017	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996	: ($self->{w} - $tex->{w}) * 0.5;	1018	: ($self->{w} - $tex->{w}) * 0.5;
997		1019
998	glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;	1020	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
999	$tex->draw_quad (0, 0);
1000		1021
1001	glDisable GL_TEXTURE_2D;	1022	glDisable GL_TEXTURE_2D;
1002	glDisable GL_BLEND;	1023	glDisable GL_BLEND;
1003	}	1024	}
1004		1025
…		…
1017	$class->SUPER::new (	1038	$class->SUPER::new (
1018	fg => [1, 1, 1],	1039	fg => [1, 1, 1],
1019	bg => [0, 0, 0, 0.2],	1040	bg => [0, 0, 0, 0.2],
1020	active_bg => [1, 1, 1, 0.5],	1041	active_bg => [1, 1, 1, 0.5],
1021	active_fg => [0, 0, 0],	1042	active_fg => [0, 0, 0],
		1043	can_hover => 1,
		1044	can_focus => 1,
1022	@_	1045	@_
1023	)	1046	)
1024	}	1047	}
1025		1048
1026	sub _set_text {	1049	sub _set_text {
1027	my ($self, $text) = @_;	1050	my ($self, $text) = @_;
1028		1051
		1052	my $old_text = $self->{text};
		1053
1029	$self->{last_activity} = $::NOW;	1054	$self->{last_activity} = $::NOW;
1030		1055
1031	$self->{text} = $text;	1056	$self->{text} = $text;
1032	$self->{layout}->set_width ($self->{w});	1057	$self->{layout}->set_width ($self->{w});
1033	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1058	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1034		1059
1035	$text =~ s/./*/g if $self->{hidden};	1060	$text =~ s/./*/g if $self->{hidden};
1036		1061
1037	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1062	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
1038		1063
1039	$text = substr $text, 0, $self->{cursor};	1064	$text = substr $text, 0, $self->{cursor};
1040	utf8::encode $text;	1065	utf8::encode $text;
1041		1066
1042	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	1067	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1068
		1069	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
		1070	if $old_text ne $self->{text};
1043	}	1071	}
1044		1072
1045	sub size_request {	1073	sub size_request {
1046	my ($self) = @_;	1074	my ($self) = @_;
1047		1075
…		…
1086	++$self->{cursor} if $self->{cursor} < length $self->{text};	1114	++$self->{cursor} if $self->{cursor} < length $self->{text};
1087	} elsif ($sym == SDLK_HOME) {	1115	} elsif ($sym == SDLK_HOME) {
1088	$self->{cursor} = 0;	1116	$self->{cursor} = 0;
1089	} elsif ($sym == SDLK_END) {	1117	} elsif ($sym == SDLK_END) {
1090	$self->{cursor} = length $text;	1118	$self->{cursor} = length $text;
		1119	} elsif ($sym == SDLK_ESCAPE) {
		1120	$self->emit ('escape');
1091	} elsif ($uni) {	1121	} elsif ($uni) {
1092	substr $text, $self->{cursor}++, 0, chr $uni;	1122	substr $text, $self->{cursor}++, 0, chr $uni;
1093	}	1123	}
1094		1124
1095	$self->_set_text ($text);	1125	$self->_set_text ($text);
…		…
1157	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1187	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1158	glEnd;	1188	glEnd;
1159	}	1189	}
1160	}	1190	}
1161		1191
		1192	package CFClient::UI::LineEntry;
		1193
		1194	our @ISA = CFClient::UI::Entry::;
		1195
		1196	use SDL;
		1197	use SDL::OpenGL;
		1198
		1199	sub key_down {
		1200	my ($self, $ev) = @_;
		1201
		1202	my $sym = $ev->key_sym;
		1203
		1204	if ($sym == SDLK_RETURN) {
		1205	$self->emit (activate => $self->get_text);
		1206	$self->update;
		1207
		1208	} else {
		1209	$self->SUPER::key_down ($ev);
		1210	}
		1211
		1212	}
		1213
1162	#############################################################################	1214	#############################################################################
1163		1215
1164	package CFClient::UI::Button;	1216	package CFClient::UI::Button;
1165		1217
1166	our @ISA = CFClient::UI::Label::;	1218	our @ISA = CFClient::UI::Label::;
…		…
1178	$class->SUPER::new (	1230	$class->SUPER::new (
1179	padding => 4,	1231	padding => 4,
1180	fg => [1, 1, 1],	1232	fg => [1, 1, 1],
1181	bg => [1, 1, 1, 0.2],	1233	bg => [1, 1, 1, 0.2],
1182	active_fg => [1, 1, 0],	1234	active_fg => [1, 1, 0],
1183	# active_bg => [0, 0, 0, 0.5],	1235	can_hover => 1,
1184	# border_fg => [1, 1, 0],
1185	@_	1236	@_
1186	)	1237	)
1187	}	1238	}
1188		1239
1189	sub button_up {	1240	sub button_up {
…		…
1224		1275
1225	package CFClient::UI::CheckBox;	1276	package CFClient::UI::CheckBox;
1226		1277
1227	our @ISA = CFClient::UI::DrawBG::;	1278	our @ISA = CFClient::UI::DrawBG::;
1228		1279
		1280	my @tex =
		1281	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1282	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1283
1229	use SDL;	1284	use SDL;
1230	use SDL::OpenGL;	1285	use SDL::OpenGL;
1231		1286
1232	my @tex =
1233	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1234	qw(b1_button_active.png);
1235
1236	sub new {	1287	sub new {
1237	my $class = shift;	1288	my $class = shift;
1238		1289
1239	$class->SUPER::new (	1290	$class->SUPER::new (
1240	padding => 4,	1291	padding => 2,
1241	fg => [1, 1, 1],	1292	fg => [1, 1, 1],
1242	active_fg => [1, 1, 0],	1293	active_fg => [1, 1, 0],
1243	state => 0,	1294	state => 0,
		1295	can_hover => 1,
1244	@_	1296	@_
1245	)	1297	)
		1298	}
		1299
		1300	sub size_request {
		1301	my ($self) = @_;
		1302
		1303	($self->{padding} * 2 + 6) x 2
		1304	}
		1305
		1306	sub size_allocate {
		1307	my ($self, $x, $y, $w, $h) = @_;
		1308
		1309	$self->_size_allocate ($x, $y, $w, $h);
1246	}	1310	}
1247		1311
1248	sub button_down {	1312	sub button_down {
1249	my ($self, $ev, $x, $y) = @_;	1313	my ($self, $ev, $x, $y) = @_;
1250		1314
1251	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1315	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1252	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1316	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1253	$self->{state} = !$self->{state};	1317	$self->{state} = !$self->{state};
1254	$self->emit ("changed");	1318	$self->emit (changed => $self->{state});
1255	}	1319	}
1256	}	1320	}
1257		1321
1258	sub _draw {	1322	sub _draw {
1259	my ($self) = @_;	1323	my ($self) = @_;
1260		1324
1261	local $self->{fg} = $self->{fg};	1325	$self->SUPER::_draw;
1262	my $tex = $tex[0];	1326
		1327	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1328
		1329	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1330
		1331	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1263		1332
1264	glEnable GL_BLEND;	1333	glEnable GL_BLEND;
1265	glEnable GL_TEXTURE_2D;	1334	glEnable GL_TEXTURE_2D;
1266	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1335	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1267		1336
1268	if ($GRAB == $self) {	1337	my $tex = $self->{state} ? $tex[1] : $tex[0];
1269	$self->{fg} = $self->{active_fg};
1270	}
1271		1338
1272	glBindTexture GL_TEXTURE_2D, $tex->{name};
1273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1274
1275	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1339	$tex->draw_quad (0, 0, $s, $s);
1276		1340
1277	glDisable GL_TEXTURE_2D;	1341	glDisable GL_TEXTURE_2D;
1278	glDisable GL_BLEND;	1342	glDisable GL_BLEND;
1279
1280	$self->SUPER::_draw;
1281	}	1343	}
1282		1344
1283	#############################################################################	1345	#############################################################################
1284		1346
1285	package CFClient::UI::Slider;	1347	package CFClient::UI::Slider;
…		…
1287	use strict;	1349	use strict;
1288		1350
1289	use SDL::OpenGL;	1351	use SDL::OpenGL;
1290		1352
1291	our @ISA = CFClient::UI::DrawBG::;	1353	our @ISA = CFClient::UI::DrawBG::;
		1354
		1355	my @tex =
		1356	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1357	qw(s1_slider.png s1_slider_bg.png);
1292		1358
1293	sub new {	1359	sub new {
1294	my $class = shift;	1360	my $class = shift;
1295		1361
1296	# range [value, low, high, page]	1362	# range [value, low, high, page]
1297		1363
		1364	# TODO: 0-width page
		1365	# TODO: req_w/h are wrong with vertical
		1366	# TODO: calculations are off
1298	my $self = $class->SUPER::new (	1367	my $self = $class->SUPER::new (
1299	fg => [1, 1, 1],	1368	fg => [1, 1, 1],
1300	active_fg => [0, 0, 0],	1369	active_fg => [0, 0, 0],
1301	range => [0, 0, 100, 10],	1370	range => [0, 0, 100, 10],
1302	req_w => 40,	1371	req_w => 40,
1303	req_h => 10,	1372	req_h => 13,
1304	vertical => 0,	1373	vertical => 0,
		1374	can_hover => 1,
		1375	inner_pad => 5,
1305	@_	1376	@_
1306	);	1377	);
1307		1378
1308	$self	1379	$self
1309	}	1380	}
…		…
1330	if ($GRAB == $self) {	1401	if ($GRAB == $self) {
1331	my ($value, $lo, $hi, $page) = @{$self->{range}};	1402	my ($value, $lo, $hi, $page) = @{$self->{range}};
1332		1403
1333	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1404	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1334		1405
		1406	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1407	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1408
		1409	$x -= $inner_pad_px; # substract the padding
1335	$x = $x * ($hi - $lo) / $w + $lo;	1410	$x = $x * ($hi - $lo) / $inner_w + $lo;
1336	$x = $lo if $x < $lo;	1411	$x = $lo if $x < $lo;
1337	$x = $hi - $page if $x > $hi - $page;	1412	$x = $hi - $page if $x > $hi - $page;
1338	$self->{range}[0] = $x;	1413	$self->{range}[0] = $x;
1339		1414
1340	$self->emit (changed => $x);	1415	$self->emit (changed => $x);
1341	$self->update;	1416	$self->update;
1342	}	1417	}
		1418	}
		1419
		1420	# the inner_* stuff is for generating a padding for the slider handle,
		1421	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1422	# correct propably, but it does the job for now
		1423	sub _calc_inner_pad_px {
		1424	my ($self, $w) = @_;
		1425	($w / 100) * $self->{inner_pad} # % to pixels
1343	}	1426	}
1344		1427
1345	sub _draw {	1428	sub _draw {
1346	my ($self) = @_;	1429	my ($self) = @_;
1347		1430
…		…
1361	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1444	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1362	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1445	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1363		1446
1364	my ($value, $lo, $hi, $page) = @{$self->{range}};	1447	my ($value, $lo, $hi, $page) = @{$self->{range}};
1365		1448
		1449	$hi = $value + 1 if $lo == $hi;
		1450
		1451	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1452	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1453
1366	$page = int $page * $w / ($hi - $lo);	1454	$page = int $page * $inner_w / ($hi - $lo);
1367	$value = int +($value - $lo) * $w / ($hi - $lo);	1455	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1368		1456
1369	$w -= $page;	1457	$w -= $page;
1370	$page &= ~1;	1458	$page &= ~1;
1371	glTranslate $page * 0.5, 0, 0;	1459	glTranslate $page * 0.5, 0, 0;
1372	$page \|\|= 2;	1460	$page \|\|= 2;
1373		1461
1374	glColor @$fg;
1375	glBegin GL_LINES;
1376	glVertex 0, 0; glVertex 0, $h;
1377	glVertex $w - 1, 0; glVertex $w - 1, $h;
1378	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1379	glEnd;
1380
1381	my $knob_a = $value - $page * 0.5;	1462	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1382	my $knob_b = $value + $page * 0.5;	1463	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1383		1464
1384	glBegin GL_QUADS;	1465	glEnable GL_BLEND;
1385	glColor @$fg;	1466	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1386	glVertex $knob_a, 0;	1467	glEnable GL_TEXTURE_2D;
1387	glVertex $knob_a, $h;	1468	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1388	glVertex $knob_b, $h;
1389	glVertex $knob_b, 0;
1390		1469
1391	if ($knob_a < $knob_b - 2) {	1470	# draw background
1392	glColor @$bg;	1471	$tex[1]->draw_quad (0, 0, $w, $h);
1393	glVertex $knob_a + 1, 1;	1472
1394	glVertex $knob_a + 1, $h - 1;	1473	# draw handle
1395	glVertex $knob_b - 1, $h - 1;	1474	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1396	glVertex $knob_b - 1, 1;	1475
		1476	glDisable GL_BLEND;
		1477	glDisable GL_TEXTURE_2D;
		1478	}
		1479
		1480	#############################################################################
		1481
		1482	package CFClient::UI::TextView;
		1483
		1484	our @ISA = CFClient::UI::HBox::;
		1485
		1486	use SDL::OpenGL;
		1487
		1488	sub new {
		1489	my $class = shift;
		1490
		1491	my $self = $class->SUPER::new (
		1492	req_w => $::WIDTH / 6,
		1493	req_h => $::HEIGHT / 6,
		1494	fontsize => $::FONTSIZE,
		1495	@_,
		1496
		1497	layout => (new CFClient::Layout),
		1498	par => [],
		1499	height => 0,
		1500	children => [
		1501	(new CFClient::UI::Empty expand => 1),
		1502	(new CFClient::UI::Slider vertical => 1),
		1503	],
		1504	);
		1505
		1506	$self->{children}[1]->connect (changed => sub {
		1507	$self->update;
		1508	});
		1509
		1510	$self
		1511	}
		1512
		1513	sub set_fontsize {
		1514	my ($self, $fontsize) = @_;
		1515
		1516	$self->{fontsize} = $fontsize;
		1517	$self->reflow;
		1518	}
		1519
		1520	sub text_height {
		1521	my ($self, $text) = @_;
		1522
		1523	my $layout = $self->{layout};
		1524
		1525	$layout->set_height ($self->{fontsize});
		1526	$layout->set_width ($self->{w});
		1527	$layout->set_text ($text);
1397	}	1528
1398	glEnd;	1529	($layout->size)[1]
		1530	}
		1531
		1532	sub reflow {
		1533	my ($self) = @_;
		1534
		1535	$self->{need_reflow}++;
		1536	$self->update;
		1537	}
		1538
		1539	sub size_request {
		1540	my ($self) = @_;
		1541
		1542	($self->{req_w}, $self->{req_h})
		1543	}
		1544
		1545	sub size_allocate {
		1546	my ($self, $x, $y, $w, $h) = @_;
		1547
		1548	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1549
		1550	$self->{layout}->set_height ($self->{fontsize});
		1551	$self->{layout}->set_width ($self->{w});
		1552
		1553	$self->reflow;
		1554	}
		1555
		1556	sub add_paragraph {
		1557	my ($self, $color, $text) = @_;
		1558
		1559	#TODO: intelligently "reformat" paragraph
		1560
		1561	my $height = $self->text_height ($text);
		1562
		1563	$self->{height} += $height;
		1564
		1565	push @{$self->{par}}, [$height, $color, $text];
		1566
		1567	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1568	$self->{children}[1]->update;
		1569	}
		1570
		1571	sub update {
		1572	my ($self) = @_;
		1573
		1574	$self->SUPER::update;
		1575
		1576	return unless $self->{h} > 0;
		1577
		1578	delete $self->{texture};
		1579
		1580	$TOPLEVEL->on_refresh ($self, sub {
		1581	if (delete $self->{need_reflow}) {
		1582	my $height = 0;
		1583
		1584	$height += $_->[0] = $self->text_height ($_->[2])
		1585	for @{$self->{par}};
		1586
		1587	$self->{height} = $height;
		1588
		1589	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1590
		1591	delete $self->{texture};
		1592	}
		1593
		1594	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1595	glClearColor 0, 0, 0, 1;
		1596	glClear GL_COLOR_BUFFER_BIT;
		1597
		1598	glEnable GL_BLEND;
		1599	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1600	glEnable GL_TEXTURE_2D;
		1601	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1602
		1603	my $top = int $self->{children}[1]{range}[0];
		1604
		1605	my $y0 = $top;
		1606	my $y1 = $top + $self->{h};
		1607
		1608	my $y = 0;
		1609
		1610	my $layout = $self->{layout};
		1611
		1612	for my $par (@{$self->{par}}) {
		1613	my $h = $par->[0];
		1614
		1615	if ($y0 < $y + $h && $y < $y1) {
		1616	$layout->set_text ($par->[2]);
		1617
		1618	glColor @{ $par->[1] };
		1619	my ($W, $H) = $layout->size;
		1620	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1621	}
		1622
		1623	$y += $h;
		1624	}
		1625
		1626	glDisable GL_TEXTURE_2D;
		1627	glDisable GL_BLEND;
		1628	};
		1629	});
		1630	}
		1631
		1632	sub _draw {
		1633	my ($self) = @_;
		1634
		1635	if ($self->{texture}) {
		1636	glEnable GL_TEXTURE_2D;
		1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1638	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1639	glDisable GL_TEXTURE_2D;
		1640	}
		1641
		1642	$self->{children}[1]->draw;
		1643
1399	}	1644	}
1400		1645
1401	#############################################################################	1646	#############################################################################
1402		1647
1403	package CFClient::UI::MapWidget;	1648	package CFClient::UI::MapWidget;
…		…
1413		1658
1414	sub new {	1659	sub new {
1415	my $class = shift;	1660	my $class = shift;
1416		1661
1417	$class->SUPER::new (	1662	$class->SUPER::new (
1418	z => -1,	1663	z => -1,
		1664	can_focus => 1,
1419	list => (glGenLists 1),	1665	list => (glGenLists 1),
1420	@_	1666	@_
1421	)	1667	)
1422	}	1668	}
1423		1669
1424	sub key_down {	1670	sub key_down {
1425	print "MAPKEYDOWN\n";	1671	print "MAPKEYDOWN\n";
1426	}	1672	}
1427		1673
1428	sub key_up {	1674	sub key_up {
		1675	}
		1676
		1677	sub button_down {
		1678	my ($self, $ev, $x, $y) = @_;
		1679
		1680	$self->focus_in;
		1681
		1682	if ($ev->button == 2) {
		1683	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1684	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1685
		1686	$self->{motion} = sub {
		1687	my ($ev, $x, $y) = @_;
		1688
		1689	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1690
		1691	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1692	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1693
		1694	$self->update;
		1695	};
		1696	}
		1697	}
		1698
		1699	sub button_up {
		1700	my ($self, $ev, $x, $y) = @_;
		1701
		1702	delete $self->{motion};
		1703	}
		1704
		1705	sub mouse_motion {
		1706	my ($self, $ev, $x, $y) = @_;
		1707
		1708	$self->{motion}->($ev, $x, $y) if $self->{motion};
1429	}	1709	}
1430		1710
1431	sub size_request {	1711	sub size_request {
1432	(	1712	(
1433	1 + 32 * int $::WIDTH / 32,	1713	1 + 32 * int $::WIDTH / 32,
…		…
1446	my ($self) = @_;	1726	my ($self) = @_;
1447		1727
1448	if (delete $self->{need_update}) {	1728	if (delete $self->{need_update}) {
1449	glNewList $self->{list}, GL_COMPILE;	1729	glNewList $self->{list}, GL_COMPILE;
1450		1730
1451	my $mx = $::CONN->{mapx};	1731	if ($::MAP) {
1452	my $my = $::CONN->{mapy};
1453
1454	my $map = $::CONN->{map};
1455
1456	my ($xofs, $yofs);
1457
1458	my $sw = 1 + int $::WIDTH / 32;	1732	my $sw = int $::WIDTH / 32;
1459	my $sh = 1 + int $::HEIGHT / 32;	1733	my $sh = int $::HEIGHT / 32;
1460		1734
1461	if ($::CONN->{mapw} > $sw) {	1735	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1462	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1736	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1463	} else {	1737
1464	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1738	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1739
		1740	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		1741
		1742	if ($::CFG->{fow_enable}) {
		1743	if ($::CFG->{fow_smooth}) { # smooth fog of war
		1744	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
		1745	glConvolutionFilter2D
		1746	GL_CONVOLUTION_2D,
		1747	GL_ALPHA,
		1748	3, 3,
		1749	GL_ALPHA, GL_FLOAT,
		1750	pack "f*",
		1751	0.1, 0.1, 0.1,
		1752	0.1, 0.2, 0.1,
		1753	0.1, 0.1, 0.1,
		1754	;
		1755	glEnable GL_CONVOLUTION_2D;
		1756	}
		1757
		1758	my $tex = new CFClient::Texture
		1759	w => $w,
		1760	h => $h,
		1761	data => $data,
		1762	internalformat => GL_ALPHA,
		1763	format => GL_ALPHA;
		1764
		1765	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1766
		1767	glEnable GL_BLEND;
		1768	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1769	glEnable GL_TEXTURE_2D;
		1770	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1771
		1772	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1773	$tex->draw_quad (0, 0, $w * 32, $h * 32);
		1774
		1775	glDisable GL_TEXTURE_2D;
		1776	glDisable GL_BLEND;
		1777	}
		1778
		1779	# HACK BEGIN
		1780	{
		1781	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1782	my ($w, $h) = (250, 250);
		1783
		1784	glEnable GL_BLEND;
		1785	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1786	glEnable GL_TEXTURE_2D;
		1787	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1788
		1789	CFClient::Texture->new (
		1790	w => $w,
		1791	h => $h,
		1792	data => $::MAP->mapmap ($w, $h),
		1793	type => GL_UNSIGNED_INT_8_8_8_8_REV
		1794	)->draw_quad (100, 100);
		1795
		1796	glDisable GL_TEXTURE_2D;
		1797	glDisable GL_BLEND;
		1798	}
		1799	# HACK END
1465	}	1800	}
1466		1801
1467	if ($::CONN->{maph} > $sh) {
1468	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1469	} else {
1470	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1471	}
1472
1473	glEnable GL_TEXTURE_2D;
1474	glEnable GL_BLEND;
1475	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1476	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1477
1478	my $sw4 = ($sw + 3) & ~3;
1479	my $darkness = "\x00" x ($sw4 * $sh);
1480
1481	for my $x (0 .. $sw - 1) {
1482	my $row = $map->[$x + $xofs];
1483	for my $y (0 .. $sh - 1) {
1484
1485	my $cell = $row->[$y + $yofs]
1486	or next;
1487
1488	my $dark = $cell->[0];
1489	if ($dark < 0) {
1490	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1491	} else {
1492	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1493	}
1494
1495	for my $num (grep $_, @$cell[1,2,3]) {
1496	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
1497
1498	my ($w, $h) = @$tex{qw(w h)};
1499
1500	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1501	}
1502	}
1503	}
1504
1505	# if (1) { # higher quality darkness
1506	# $lighting =~ s/(.)/$1$1$1/gs;
1507	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1508	#
1509	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1510	#
1511	# $lighting = $pb->get_pixels;
1512	# $lighting =~ s/(.)../$1/gs;
1513	# }
1514
1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1516
1517	$darkness = new CFClient::Texture
1518	w => $sw4,
1519	h => $sh,
1520	data => $darkness,
1521	internalformat => GL_ALPHA,
1522	format => GL_ALPHA;
1523
1524	glColor 0.45, 0.45, 0.45, 1;
1525	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1526
1527	glDisable GL_TEXTURE_2D;
1528	glDisable GL_BLEND;
1529
1530	glEndList;	1802	glEndList;
1531	}	1803	}
1532		1804
		1805	glPushMatrix;
1533	glCallList $self->{list};	1806	glCallList $self->{list};
		1807	glPopMatrix;
		1808
		1809	if ($FOCUS != $self) {
		1810	glColor 64/255, 64/255, 64/255;
		1811	glLogicOp GL_AND;
		1812	glEnable GL_COLOR_LOGIC_OP;
		1813	glBegin GL_QUADS;
		1814	glVertex 0, 0;
		1815	glVertex 0, $::HEIGHT;
		1816	glVertex $::WIDTH, $::HEIGHT;
		1817	glVertex $::WIDTH, 0;
		1818	glEnd;
		1819	glDisable GL_COLOR_LOGIC_OP;
		1820	}
1534	}	1821	}
1535		1822
1536	my %DIR = (	1823	my %DIR = (
1537	SDLK_KP8, [1, "north"],	1824	SDLK_KP8, [1, "north"],
1538	SDLK_KP9, [2, "northeast"],	1825	SDLK_KP9, [2, "northeast"],
…		…
1554		1841
1555	my $mod = $ev->key_mod;	1842	my $mod = $ev->key_mod;
1556	my $sym = $ev->key_sym;	1843	my $sym = $ev->key_sym;
1557		1844
1558	if ($sym == SDLK_KP5) {	1845	if ($sym == SDLK_KP5) {
1559	$::CONN->send ("command stay fire");	1846	$::CONN->user_send ("command stay fire");
1560	} elsif ($sym == SDLK_a) {	1847	} elsif ($sym == SDLK_a) {
1561	$::CONN->send ("command apply");	1848	$::CONN->user_send ("command apply");
		1849	} elsif ($sym == SDLK_QUOTE) {
		1850	$self->emit ('activate_console');
		1851	} elsif ($sym == SDLK_SLASH) {
		1852	$self->emit ('activate_console' => '/');
1562	} elsif (exists $DIR{$sym}) {	1853	} elsif (exists $DIR{$sym}) {
1563	if ($mod & KMOD_SHIFT) {	1854	if ($mod & KMOD_SHIFT) {
1564	$self->{shft}++;	1855	$self->{shft}++;
1565	$::CONN->send ("command fire $DIR{$sym}[0]");	1856	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1566	} elsif ($mod & KMOD_CTRL) {	1857	} elsif ($mod & KMOD_CTRL) {
1567	$self->{ctrl}++;	1858	$self->{ctrl}++;
1568	$::CONN->send ("command run $DIR{$sym}[0]");	1859	$::CONN->user_send ("command run $DIR{$sym}[0]");
1569	} else {	1860	} else {
1570	$::CONN->send ("command $DIR{$sym}[1]");	1861	$::CONN->user_send ("command $DIR{$sym}[1]");
1571	}	1862	}
1572	}	1863	}
1573	}	1864	}
1574		1865
1575	sub key_up {	1866	sub key_up {
…		…
1577		1868
1578	my $mod = $ev->key_mod;	1869	my $mod = $ev->key_mod;
1579	my $sym = $ev->key_sym;	1870	my $sym = $ev->key_sym;
1580		1871
1581	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1872	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1582	$::CONN->send ("command fire_stop");	1873	$::CONN->user_send ("command fire_stop");
1583	}	1874	}
1584	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1875	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1585	$::CONN->send ("command run_stop");	1876	$::CONN->user_send ("command run_stop");
1586	}	1877	}
1587	}	1878	}
1588		1879
1589	#############################################################################	1880	#############################################################################
1590		1881
…		…
1628	glPopMatrix;	1919	glPopMatrix;
1629	}	1920	}
1630		1921
1631	#############################################################################	1922	#############################################################################
1632		1923
		1924	package CFClient::UI::Flopper;
		1925
		1926	our @ISA = CFClient::UI::Button::;
		1927
		1928	sub new {
		1929	my $class = shift;
		1930
		1931	my $self = $class->SUPER::new (
		1932	state => 0,
		1933	connect_activate => \&toggle_flopper,
		1934	@_
		1935	);
		1936
		1937	if ($self->{state}) {
		1938	$self->{state} = 0;
		1939	$self->toggle_flopper;
		1940	}
		1941
		1942	$self
		1943	}
		1944
		1945	sub toggle_flopper {
		1946	my ($self) = @_;
		1947
		1948	# TODO: use animation
		1949	if ($self->{state} = !$self->{state}) {
		1950	$CFClient::UI::TOPLEVEL->add ($self->{other});
		1951	$self->{other}->move (
		1952	($::WIDTH - $self->{other}{w}) * 0.5,
		1953	($::HEIGHT - $self->{other}{h}) * 0.5,
		1954	);
		1955	} else {
		1956	$CFClient::UI::TOPLEVEL->remove ($self->{other});
		1957	}
		1958	}
		1959
		1960	#############################################################################
		1961
1633	package CFClient::UI::Toplevel;	1962	package CFClient::UI::Toplevel;
1634		1963
1635	our @ISA = CFClient::UI::Container::;	1964	our @ISA = CFClient::UI::Container::;
		1965
		1966	use SDL::OpenGL;
1636		1967
1637	sub size_request {	1968	sub size_request {
1638	($::WIDTH, $::HEIGHT)	1969	($::WIDTH, $::HEIGHT)
1639	}	1970	}
1640		1971
…		…
1666	$self->SUPER::add ($widget);	1997	$self->SUPER::add ($widget);
1667		1998
1668	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	1999	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1669	}	2000	}
1670		2001
		2002	sub on_refresh {
		2003	my ($self, $id, $cb) = @_;
		2004
		2005	$self->{refresh_hook}{$id} = $cb;
		2006	}
		2007
1671	sub draw {	2008	sub draw {
1672	my ($self) = @_;	2009	my ($self) = @_;
1673		2010
		2011	while (my $rcb = delete $self->{refresh_hook}) {
		2012	$_->() for values %$rcb;
		2013	}
		2014
		2015	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2016	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2017	glClear GL_COLOR_BUFFER_BIT;
		2018
		2019	glMatrixMode GL_PROJECTION;
		2020	glLoadIdentity;
		2021	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2022	glMatrixMode GL_MODELVIEW;
		2023	glLoadIdentity;
		2024
1674	$self->_draw;	2025	$self->_draw;
1675	}	2026	}
1676		2027
1677	#############################################################################	2028	#############################################################################
1678		2029

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.86 by root, Wed Apr 12 15:35:54 2006 UTC vs. Revision 1.112 by root, Sat Apr 15 12:29:46 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.86 by root, Wed Apr 12 15:35:54 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 12:29:46 2006 UTC