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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.78 by root, Tue Apr 11 22:49:13 2006 UTC vs.
Revision 1.98 by root, Fri Apr 14 02:06:22 2006 UTC

…		…
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;
…		…
263		272
264	# range [value, low, high, page]	273	# range [value, low, high, page]
265		274
266	$class->SUPER::new (	275	$class->SUPER::new (
267	bg => [0, 0, 0, 0.2],	276	bg => [0, 0, 0, 0.2],
268	active_bg => [1, 1, 1],	277	active_bg => [1, 1, 1, 0.5],
269	@_	278	@_
270	)	279	)
271	}	280	}
272		281
273	sub _draw {	282	sub _draw {
…		…
521		530
522	my @tex =	531	my @tex =
523	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	532	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
524	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	533	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
525		534
		535	sub new {
		536	my $class = shift;
		537
		538	# TODO: user_x, user_y, overwrite moveto?
		539
		540	$class->SUPER::new (
		541	bg => [1, 1, 1, 1],
		542	border_bg => [1, 1, 1, 1],
		543	border => $::FONTSIZE * 0.8,
		544	@_
		545	)
		546	}
		547
526	sub size_request {	548	sub size_request {
527	my ($self) = @_;	549	my ($self) = @_;
528		550
529	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};	551	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
530		552
531	my ($w, $h) = $self->SUPER::size_request;	553	my ($w, $h) = $self->SUPER::size_request;
532		554
533	$h += $tex[1]->{h};	555	(
534	$h += $tex[4]->{h};	556	$w + $self->{border} * 2,
535	$w += $tex[2]->{w};	557	$h + $self->{border} * 2,
536	$w += $tex[3]->{w};	558	)
537
538	($w, $h)
539	}	559	}
540		560
541	sub size_allocate {	561	sub size_allocate {
542	my ($self, $x, $y, $w, $h) = @_;	562	my ($self, $x, $y, $w, $h) = @_;
543		563
544	$self->_size_allocate ($x, $y, $w, $h) or return;	564	$self->_size_allocate ($x, $y, $w, $h) or return;
545		565
546	$h -= $tex[1]{h};	566	$h -= List::Util::max 0, $self->{border} * 2;
547	$h -= $tex[4]{h};	567	$w -= List::Util::max 0, $self->{border} * 2;
548	$w -= $tex[2]{w};
549	$w -= $tex[3]{w};
550		568
551	$h = $h < 0 ? 0 : $h;	569	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
552	$w = $w < 0 ? 0 : $w;
553
554	my $child = $self->child;
555
556	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
557	}	570	}
558		571
559	sub button_down {	572	sub button_down {
560	my ($self, $ev, $x, $y) = @_;	573	my ($self, $ev, $x, $y) = @_;
561		574
562	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}	575	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
563	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {	576	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
564		577
565	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	578	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
566	my ($bw, $bh) = ($self->{w}, $self->{h});	579	my ($bw, $bh) = ($self->{w}, $self->{h});
567		580
568	$self->{motion} = sub {	581	$self->{motion} = sub {
…		…
574	$self->{user_h} = $bh + $y - $oy;	587	$self->{user_h} = $bh + $y - $oy;
575	$self->update;	588	$self->update;
576	};	589	};
577		590
578	} elsif ($x >= 0 && $x < $self->{w}	591	} elsif ($x >= 0 && $x < $self->{w}
579	&& $y >= 0 && $y < $tex[1]{h}) {	592	&& $y >= 0 && $y < $self->{border}) {
580		593
581	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	594	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
582	my ($bx, $by) = ($self->{x}, $self->{y});	595	my ($bx, $by) = ($self->{x}, $self->{y});
583		596
584	$self->{motion} = sub {	597	$self->{motion} = sub {
…		…
605	}	618	}
606		619
607	sub _draw {	620	sub _draw {
608	my ($self) = @_;	621	my ($self) = @_;
609		622
610	my ($w, $h) = ($self->{w}, $self->{h});	623	my ($w, $h ) = ($self->{w}, $self->{h});
611	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	624	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
612		625
613	glEnable GL_BLEND;	626	glEnable GL_BLEND;
614	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	627	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
615	glEnable GL_TEXTURE_2D;	628	glEnable GL_TEXTURE_2D;
616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	629	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
617		630
618	my $top = $tex[1];	631	glColor @{ $self->{border_bg} };
619	$top->draw_quad (0, 0, $w, $top->{h});	632	$tex[1]->draw_quad (0, 0, $w, $self->{border});
620		633	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
621	my $left = $tex[3];	634	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
622	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	635	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
623
624	my $right = $tex[2];
625	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
626
627	my $bottom = $tex[4];
628	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
629		636
630	my $bg = $tex[0];	637	my $bg = $tex[0];
631		638
632	glBindTexture GL_TEXTURE_2D, $bg->{name};	639	# TODO: repeat texture not scale
633	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
634	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
635	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
636
637	my $rep_x = $cw / $bg->{w};	640	my $rep_x = $cw / $bg->{w};
638	my $rep_y = $ch / $bg->{h};	641	my $rep_y = $ch / $bg->{h};
639		642
		643	glColor @{ $self->{bg} };
640	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	644	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
641		645
642	glDisable GL_TEXTURE_2D;	646	glDisable GL_TEXTURE_2D;
643	glDisable GL_BLEND;	647	glDisable GL_BLEND;
644		648
645	$self->child->draw;	649	$self->child->draw;
646
647	}	650	}
648		651
649	#############################################################################	652	#############################################################################
650		653
651	package CFClient::UI::Table;	654	package CFClient::UI::Table;
…		…
735		738
736	my $x = 0;	739	my $x = 0;
737	my $row_h = $hs->[$r];	740	my $row_h = $hs->[$r];
738		741
739	for my $c (0 .. $#$row) {	742	for my $c (0 .. $#$row) {
740	my $widget = $row->[$c]
741	or next;
742
743	my $col_w = $ws->[$c];	743	my $col_w = $ws->[$c];
744		744
		745	if (my $widget = $row->[$c]) {
745	$widget->size_allocate ($x, $y, $col_w, $row_h);	746	$widget->size_allocate ($x, $y, $col_w, $row_h);
		747	}
746		748
747	$x += $col_w;	749	$x += $col_w;
748	}	750	}
749		751
750	$y += $row_h;	752	$y += $row_h;
…		…
796	}	798	}
797		799
798	sub size_allocate {	800	sub size_allocate {
799	my ($self, $x, $y, $w, $h) = @_;	801	my ($self, $x, $y, $w, $h) = @_;
800		802
801	$self->_size_allocate ($x, $y, $w, $h) or return;	803	$self->_size_allocate ($x, $y, $w, $h);
802
803	return unless $self->{w};
804		804
805	($h, $w) = ($w, $h);	805	($h, $w) = ($w, $h);
806		806
807	my $children = $self->{children};	807	my $children = $self->{children};
808		808
…		…
856	}	856	}
857		857
858	sub size_allocate {	858	sub size_allocate {
859	my ($self, $x, $y, $w, $h) = @_;	859	my ($self, $x, $y, $w, $h) = @_;
860		860
861	$self->_size_allocate ($x, $y, $w, $h) or return;	861	$self->_size_allocate ($x, $y, $w, $h);
862
863	return unless $self->{h};
864		862
865	my $children = $self->{children};	863	my $children = $self->{children};
866		864
867	my @h = map +($_->size_request)[1], @$children;	865	my @h = map +($_->size_request)[1], @$children;
868		866
…		…
933		931
934	$self->{text} = $text;	932	$self->{text} = $text;
935	$self->{layout}->set_markup ($text);	933	$self->{layout}->set_markup ($text);
936		934
937	delete $self->{texture};	935	delete $self->{texture};
		936	# $self->{w} = $self->{h} = -1;
938	$self->update;	937	$self->update;
939	}	938	}
940		939
941	sub get_text {	940	sub get_text {
942	my ($self, $text) = @_;	941	my ($self, $text) = @_;
…		…
975	sub _draw {	974	sub _draw {
976	my ($self) = @_;	975	my ($self) = @_;
977		976
978	my $tex = $self->{texture} \|\|= do {	977	my $tex = $self->{texture} \|\|= do {
979	$self->{layout}->set_width ($self->{w});	978	$self->{layout}->set_width ($self->{w});
980	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{height});	979	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
981	new_from_layout CFClient::Texture $self->{layout}	980	new_from_layout CFClient::Texture $self->{layout}
982	};	981	};
983		982
984	glEnable GL_BLEND;	983	glEnable GL_BLEND;
985	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	984	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
991	my $x =	990	my $x =
992	$self->{align} < 0 ? $self->{padding}	991	$self->{align} < 0 ? $self->{padding}
993	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	992	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
994	: ($self->{w} - $tex->{w}) * 0.5;	993	: ($self->{w} - $tex->{w}) * 0.5;
995		994
996	$tex->draw_quad ($x, $self->{padding});	995	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
		996	$tex->draw_quad (0, 0);
997		997
998	glDisable GL_TEXTURE_2D;	998	glDisable GL_TEXTURE_2D;
999	glDisable GL_BLEND;	999	glDisable GL_BLEND;
1000	}	1000	}
1001		1001
…		…
1012	my $class = shift;	1012	my $class = shift;
1013		1013
1014	$class->SUPER::new (	1014	$class->SUPER::new (
1015	fg => [1, 1, 1],	1015	fg => [1, 1, 1],
1016	bg => [0, 0, 0, 0.2],	1016	bg => [0, 0, 0, 0.2],
1017	active_bg => [1, 1, 1],	1017	active_bg => [1, 1, 1, 0.5],
1018	active_fg => [0, 0, 0],	1018	active_fg => [0, 0, 0],
		1019	can_hover => 1,
		1020	can_focus => 1,
1019	@_	1021	@_
1020	)	1022	)
1021	}	1023	}
1022		1024
1023	sub _set_text {	1025	sub _set_text {
…		…
1025		1027
1026	$self->{last_activity} = $::NOW;	1028	$self->{last_activity} = $::NOW;
1027		1029
1028	$self->{text} = $text;	1030	$self->{text} = $text;
1029	$self->{layout}->set_width ($self->{w});	1031	$self->{layout}->set_width ($self->{w});
		1032	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1030		1033
1031	$text =~ s/./*/g if $self->{hidden};	1034	$text =~ s/./*/g if $self->{hidden};
1032		1035
1033	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1036	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
1034		1037
…		…
1155	}	1158	}
1156	}	1159	}
1157		1160
1158	#############################################################################	1161	#############################################################################
1159		1162
1160	package CFClient::UI::Slider;	1163	package CFClient::UI::Button;
1161		1164
1162	use strict;	1165	our @ISA = CFClient::UI::Label::;
1163		1166
		1167	use SDL;
1164	use SDL::OpenGL;	1168	use SDL::OpenGL;
1165		1169
1166	our @ISA = CFClient::UI::DrawBG::;	1170	my @tex =
		1171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1172	qw(b1_button_active.png);
1167		1173
1168	sub new {	1174	sub new {
1169	my $class = shift;	1175	my $class = shift;
1170		1176
		1177	$class->SUPER::new (
		1178	padding => 4,
		1179	fg => [1, 1, 1],
		1180	bg => [1, 1, 1, 0.2],
		1181	active_fg => [1, 1, 0],
		1182	can_hover => 1,
		1183	@_
		1184	)
		1185	}
		1186
		1187	sub button_up {
		1188	my ($self, $ev, $x, $y) = @_;
		1189
		1190	if ($x >= 0 && $x < $self->{w}
		1191	&& $y >= 0 && $y < $self->{h}) {
		1192	$self->emit ("activate");
		1193	}
		1194	}
		1195
		1196	sub _draw {
		1197	my ($self) = @_;
		1198
		1199	local $self->{fg} = $self->{fg};
		1200	my $tex = $tex[0];
		1201
		1202	glEnable GL_BLEND;
		1203	glEnable GL_TEXTURE_2D;
		1204	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1205
		1206	if ($GRAB == $self) {
		1207	$self->{fg} = $self->{active_fg};
		1208	}
		1209
		1210	glBindTexture GL_TEXTURE_2D, $tex->{name};
		1211	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1212
		1213	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		1214
		1215	glDisable GL_TEXTURE_2D;
		1216	glDisable GL_BLEND;
		1217
		1218	$self->SUPER::_draw;
		1219	}
		1220
		1221	#############################################################################
		1222
		1223	package CFClient::UI::CheckBox;
		1224
		1225	our @ISA = CFClient::UI::DrawBG::;
		1226
		1227	use SDL;
		1228	use SDL::OpenGL;
		1229
		1230	sub new {
		1231	my $class = shift;
		1232
		1233	$class->SUPER::new (
		1234	padding => 2,
		1235	fg => [1, 1, 1],
		1236	active_fg => [1, 1, 0],
		1237	state => 0,
		1238	can_hover => 1,
		1239	@_
		1240	)
		1241	}
		1242
		1243	sub size_request {
		1244	my ($self) = @_;
		1245
		1246	($self->{padding} * 2 + 6) x 2
		1247	}
		1248
		1249	sub size_allocate {
		1250	my ($self, $x, $y, $w, $h) = @_;
		1251
		1252	$self->_size_allocate ($x, $y, $w, $h);
		1253	}
		1254
		1255	sub button_down {
		1256	my ($self, $ev, $x, $y) = @_;
		1257
		1258	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1259	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1260	$self->{state} = !$self->{state};
		1261	$self->emit (changed => $self->{state});
		1262	}
		1263	}
		1264
		1265	sub _draw {
		1266	my ($self) = @_;
		1267
		1268	$self->SUPER::_draw;
		1269
		1270	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1271
		1272	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1273
		1274	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1275
		1276	glBegin GL_LINE_LOOP;
		1277	glVertex 0 , 0;
		1278	glVertex 0 , $s;
		1279	glVertex $s, $s;
		1280	glVertex $s, 0;
		1281	glEnd;
		1282
		1283	if ($self->{state}) {
		1284	glBegin GL_LINES;
		1285	glVertex 0 , 0;
		1286	glVertex $s, $s;
		1287	glVertex $s, 0;
		1288	glVertex 0 , $s;
		1289	glEnd;
		1290	}
		1291	}
		1292
		1293	#############################################################################
		1294
		1295	package CFClient::UI::Slider;
		1296
		1297	use strict;
		1298
		1299	use SDL::OpenGL;
		1300
		1301	our @ISA = CFClient::UI::DrawBG::;
		1302
		1303	sub new {
		1304	my $class = shift;
		1305
1171	# range [value, low, high, page]	1306	# range [value, low, high, page]
1172		1307
		1308	# TODO: 0-width page
		1309	# TODO: req_w/h are wrong with vertical
		1310	# TODO: calculations are off
1173	my $self = $class->SUPER::new (	1311	my $self = $class->SUPER::new (
1174	fg => [1, 1, 1],	1312	fg => [1, 1, 1],
1175	active_fg => [0, 0, 0],	1313	active_fg => [0, 0, 0],
1176	range => [0, 0, 100, 10],	1314	range => [0, 0, 100, 10],
1177	req_w => 40,	1315	req_w => 40,
1178	req_h => 10,	1316	req_h => 13,
1179	vertical => 0,	1317	vertical => 0,
		1318	can_hover => 1,
1180	@_	1319	@_
1181	);	1320	);
1182		1321
1183	$self	1322	$self
1184	}	1323	}
…		…
1242	$value = int +($value - $lo) * $w / ($hi - $lo);	1381	$value = int +($value - $lo) * $w / ($hi - $lo);
1243		1382
1244	$w -= $page;	1383	$w -= $page;
1245	$page &= ~1;	1384	$page &= ~1;
1246	glTranslate $page * 0.5, 0, 0;	1385	glTranslate $page * 0.5, 0, 0;
		1386	$page \|\|= 2;
1247		1387
1248	glColor @$fg;	1388	glColor @$fg;
1249	glBegin GL_LINES;	1389	glBegin GL_LINES;
1250	glVertex 0, 0; glVertex 0, $h;	1390	glVertex 0, 0; glVertex 0, $h;
1251	glVertex $w - 1, 0; glVertex $w - 1, $h;	1391	glVertex $w - 1, 0; glVertex $w - 1, $h;
…		…
1272	glEnd;	1412	glEnd;
1273	}	1413	}
1274		1414
1275	#############################################################################	1415	#############################################################################
1276		1416
		1417	package CFClient::UI::TextView;
		1418
		1419	our @ISA = CFClient::UI::HBox::;
		1420
		1421	use SDL::OpenGL;
		1422
		1423	sub new {
		1424	my $class = shift;
		1425
		1426	my $self = $class->SUPER::new (
		1427	par => [],
		1428	@_,
		1429	children => [
		1430	(new CFClient::UI::Empty expand => 1),
		1431	(new CFClient::UI::Slider vertical => 1),
		1432	],
		1433	);
		1434
		1435	$self
		1436	}
		1437
		1438	sub add_paragraph {
		1439	my ($self, $color, $text) = @_;
		1440
		1441	push @{$self->{par}}, [$color, $text];
		1442	my $count = scalar @{$self->{par}};
		1443	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];
		1444	$self->{children}[1]->update;
		1445	}
		1446
		1447	sub _draw {
		1448	my ($self) = @_;
		1449
		1450	my $par = $self->{par};
		1451
		1452	my $bottom = (scalar @$par) - 1;
		1453
		1454	my $w = $self->{children}[0]{w};
		1455	my $y = $self->{h};
		1456
		1457	glEnable GL_BLEND;
		1458	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1459	glEnable GL_TEXTURE_2D;
		1460	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1461
		1462	# TODO: everything!
		1463	while ($y > 0 && $bottom >= 0) {
		1464	my $par = $par->[$bottom--];
		1465
		1466	my $layout = new CFClient::Layout;
		1467
		1468	$layout->set_height ($::FONTSIZE);
		1469	$layout->set_width ($w);
		1470	$layout->set_text ($par->[1]);
		1471	my $tex = new_from_layout CFClient::Texture $layout;
		1472	$y -= $tex->{h};
		1473
		1474	glColor @{ $par->[0] };
		1475	$tex->draw_quad (0, $y);
		1476	}
		1477
		1478	glDisable GL_TEXTURE_2D;
		1479	glDisable GL_BLEND;
		1480	}
		1481
		1482	#############################################################################
		1483
1277	package CFClient::UI::MapWidget;	1484	package CFClient::UI::MapWidget;
1278		1485
1279	use strict;	1486	use strict;
1280		1487
1281	use List::Util qw(min max);	1488	use List::Util qw(min max);
…		…
1287		1494
1288	sub new {	1495	sub new {
1289	my $class = shift;	1496	my $class = shift;
1290		1497
1291	$class->SUPER::new (	1498	$class->SUPER::new (
1292	z => -1,	1499	z => -1,
		1500	can_focus => 1,
1293	list => (glGenLists 1),	1501	list => (glGenLists 1),
1294	@_	1502	@_
1295	)	1503	)
1296	}	1504	}
1297		1505
1298	sub key_down {	1506	sub key_down {
…		…
1317	}	1525	}
1318		1526
1319	sub draw {	1527	sub draw {
1320	my ($self) = @_;	1528	my ($self) = @_;
1321		1529
		1530	$self->{need_update}++;#d#
1322	if (delete $self->{need_update}) {	1531	if (delete $self->{need_update}) {
1323	glNewList $self->{list}, GL_COMPILE;	1532	glNewList $self->{list}, GL_COMPILE;
1324		1533
1325	my $mx = $::CONN->{mapx};
1326	my $my = $::CONN->{mapy};
1327
1328	my $map = $::CONN->{map};
1329
1330	my ($xofs, $yofs);
1331
1332	my $sw = 1 + int $::WIDTH / 32;	1534	my $sw = int $::WIDTH / 32;
1333	my $sh = 1 + int $::HEIGHT / 32;	1535	my $sh = int $::HEIGHT / 32;
1334		1536
1335	if ($::CONN->{mapw} > $sw) {	1537	if ($::MAP) {
1336	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1538	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1337	} else {
1338	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1339	}
1340		1539
1341	if ($::CONN->{maph} > $sh) {	1540	if ($::CFG->{fow_enable}) {
1342	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	1541	if ($::CFG->{fow_smooth}) { # smooth fog of war
1343	} else {	1542	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1344	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	1543	glConvolutionFilter2D
1345	}	1544	GL_CONVOLUTION_2D,
1346		1545	GL_ALPHA,
1347	glEnable GL_TEXTURE_2D;	1546	3, 3,
1348	glEnable GL_BLEND;	1547	GL_ALPHA, GL_FLOAT,
1349	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1548	pack "f*",
1350	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1549	0.1, 0.1, 0.1,
1351		1550	0.1, 0.2, 0.1,
1352	my $sw4 = ($sw + 3) & ~3;	1551	0.1, 0.1, 0.1,
1353	my $darkness = "\x00" x ($sw4 * $sh);
1354
1355	for my $x (0 .. $sw - 1) {
1356	my $row = $map->[$x + $xofs];
1357	for my $y (0 .. $sh - 1) {
1358
1359	my $cell = $row->[$y + $yofs]
1360	or next;	1552	;
1361		1553	glEnable GL_CONVOLUTION_2D;
1362	my $dark = $cell->[0];
1363	if ($dark < 0) {
1364	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1365	} else {
1366	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1367	}	1554	}
1368		1555
1369	for my $num (grep $_, @$cell[1,2,3]) {	1556	my $tex = new CFClient::Texture
1370	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	1557	w => $w,
1371		1558	h => $h,
1372	my ($w, $h) = @$tex{qw(w h)};	1559	data => $data,
		1560	internalformat => GL_ALPHA,
		1561	format => GL_ALPHA;
1373		1562
1374	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);	1563	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1375	}	1564
		1565	glEnable GL_BLEND;
		1566	glEnable GL_TEXTURE_2D;
		1567	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1568
		1569	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1570	$tex->draw_quad (0, 0, $w * 32, $h * 32);
		1571
		1572	glDisable GL_TEXTURE_2D;
		1573	glDisable GL_BLEND;
1376	}	1574	}
1377	}	1575	}
1378		1576
1379	# if (1) { # higher quality darkness
1380	# $lighting =~ s/(.)/$1$1$1/gs;
1381	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1382	#
1383	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1384	#
1385	# $lighting = $pb->get_pixels;
1386	# $lighting =~ s/(.)../$1/gs;
1387	# }
1388
1389	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1390
1391	$darkness = new CFClient::Texture
1392	w => $sw4,
1393	h => $sh,
1394	data => $darkness,
1395	internalformat => GL_ALPHA,
1396	format => GL_ALPHA;
1397
1398	glColor 0.45, 0.45, 0.45, 1;
1399	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1400
1401	glDisable GL_TEXTURE_2D;
1402	glDisable GL_BLEND;
1403
1404	glEndList;	1577	glEndList;
1405	}	1578	}
1406		1579
1407	glCallList $self->{list};	1580	glCallList $self->{list};
		1581
		1582	if ($FOCUS != $self) {
		1583	glColor 64/255, 64/255, 64/255;
		1584	glLogicOp GL_AND;
		1585	glEnable GL_COLOR_LOGIC_OP;
		1586	glBegin GL_QUADS;
		1587	glVertex 0, 0;
		1588	glVertex 0, $::HEIGHT;
		1589	glVertex $::WIDTH, $::HEIGHT;
		1590	glVertex $::WIDTH, 0;
		1591	glEnd;
		1592	glDisable GL_COLOR_LOGIC_OP;
		1593	}
1408	}	1594	}
1409		1595
1410	my %DIR = (	1596	my %DIR = (
1411	SDLK_KP8, [1, "north"],	1597	SDLK_KP8, [1, "north"],
1412	SDLK_KP9, [2, "northeast"],	1598	SDLK_KP9, [2, "northeast"],
…		…
1428		1614
1429	my $mod = $ev->key_mod;	1615	my $mod = $ev->key_mod;
1430	my $sym = $ev->key_sym;	1616	my $sym = $ev->key_sym;
1431		1617
1432	if ($sym == SDLK_KP5) {	1618	if ($sym == SDLK_KP5) {
1433	$::CONN->send ("command stay fire");	1619	$::CONN->user_send ("command stay fire");
		1620	} elsif ($sym == SDLK_a) {
		1621	$::CONN->user_send ("command apply");
1434	} elsif (exists $DIR{$sym}) {	1622	} elsif (exists $DIR{$sym}) {
1435	if ($mod & KMOD_SHIFT) {	1623	if ($mod & KMOD_SHIFT) {
1436	$self->{shft}++;	1624	$self->{shft}++;
1437	$::CONN->send ("command fire $DIR{$sym}[0]");	1625	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1438	} elsif ($mod & KMOD_CTRL) {	1626	} elsif ($mod & KMOD_CTRL) {
1439	$self->{ctrl}++;	1627	$self->{ctrl}++;
1440	$::CONN->send ("command run $DIR{$sym}[0]");	1628	$::CONN->user_send ("command run $DIR{$sym}[0]");
1441	} else {	1629	} else {
1442	$::CONN->send ("command $DIR{$sym}[1]");	1630	$::CONN->user_send ("command $DIR{$sym}[1]");
1443	}	1631	}
1444	}	1632	}
1445	}	1633	}
1446		1634
1447	sub key_up {	1635	sub key_up {
…		…
1449		1637
1450	my $mod = $ev->key_mod;	1638	my $mod = $ev->key_mod;
1451	my $sym = $ev->key_sym;	1639	my $sym = $ev->key_sym;
1452		1640
1453	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1641	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1454	$::CONN->send ("command fire_stop");	1642	$::CONN->user_send ("command fire_stop");
1455	}	1643	}
1456	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1644	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1457	$::CONN->send ("command run_stop");	1645	$::CONN->user_send ("command run_stop");
1458	}	1646	}
1459	}	1647	}
1460		1648
1461	#############################################################################	1649	#############################################################################
1462		1650
…		…
1500	glPopMatrix;	1688	glPopMatrix;
1501	}	1689	}
1502		1690
1503	#############################################################################	1691	#############################################################################
1504		1692
		1693	package CFClient::UI::Flopper;
		1694
		1695	our @ISA = CFClient::UI::Button::;
		1696
		1697	sub new {
		1698	my $class = shift;
		1699
		1700	my $self = $class->SUPER::new (
		1701	state => 0,
		1702	connect_activate => \&toggle_flopper,
		1703	@_
		1704	);
		1705
		1706	if ($self->{state}) {
		1707	$self->{state} = 0;
		1708	$self->toggle_flopper;
		1709	}
		1710
		1711	$self
		1712	}
		1713
		1714	sub toggle_flopper {
		1715	my ($self) = @_;
		1716
		1717	# TODO: use animation
		1718	if ($self->{state} = !$self->{state}) {
		1719	$CFClient::UI::TOPLEVEL->add ($self->{other});
		1720	$self->{other}->move (
		1721	($::WIDTH - $self->{other}{w}) * 0.5,
		1722	($::HEIGHT - $self->{other}{h}) * 0.5,
		1723	);
		1724	} else {
		1725	$CFClient::UI::TOPLEVEL->remove ($self->{other});
		1726	}
		1727	}
		1728
		1729	#############################################################################
		1730
1505	package CFClient::UI::Toplevel;	1731	package CFClient::UI::Toplevel;
1506		1732
1507	our @ISA = CFClient::UI::Container::;	1733	our @ISA = CFClient::UI::Container::;
1508		1734
1509	sub size_request {	1735	sub size_request {

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.78 by root, Tue Apr 11 22:49:13 2006 UTC vs. Revision 1.98 by root, Fri Apr 14 02:06:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.78 by root, Tue Apr 11 22:49:13 2006 UTC vs.
Revision 1.98 by root, Fri Apr 14 02:06:22 2006 UTC