ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.292 by root, Tue Jun 6 03:02:15 2006 UTC vs.
Revision 1.314 by root, Mon Jun 26 21:59:04 2006 UTC

…		…
272		272
273	return unless $self->{visible};	273	return unless $self->{visible};
274		274
275	$_->set_invisible for $self->children;	275	$_->set_invisible for $self->children;
276		276
		277	delete $self->{visible};
277	delete $self->{root};	278	delete $self->{root};
278	delete $self->{visible};
279		279
280	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
282		282
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
285		285
286	$self->focus_out;	286	$self->emit ("focus_out");
287
288	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
289	}	288	}
290		289
291	sub set_visibility {	290	sub set_visibility {
292	my ($self, $visible) = @_;	291	my ($self, $visible) = @_;
…		…
315	}	314	}
316		315
317	sub move_abs {	316	sub move_abs {
318	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
319		318
320	$self->{x} = List::Util::max 0, int $x;	319	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321	$self->{y} = List::Util::max 0, int $y;	320	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
323		322
324	$self->update;	323	$self->update;
325	}	324	}
326		325
…		…
334	}	333	}
335		334
336	sub size_request {	335	sub size_request {
337	require Carp;	336	require Carp;
338	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
		338	}
		339
		340	sub baseline_shift {
		341	0
339	}	342	}
340		343
341	sub configure {	344	sub configure {
342	my ($self, $x, $y, $w, $h) = @_;	345	my ($self, $x, $y, $w, $h) = @_;
343		346
…		…
367		370
368	$self->{root}{size_alloc}{$self+0} = $self;	371	$self->{root}{size_alloc}{$self+0} = $self;
369	}	372	}
370	}	373	}
371		374
372	sub size_allocate {
373	# nothing to be done
374	}
375
376	sub children {	375	sub children {
377	# nop	376	# nop
378	}	377	}
379		378
380	sub visible_children {	379	sub visible_children {
…		…
418	my ($self, $x, $y) = @_;	417	my ($self, $x, $y) = @_;
419		418
420	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421	}	420	}
422		421
423	sub focus_in {	422	sub invoke_focus_in {
424	my ($self) = @_;	423	my ($self) = @_;
425		424
426	return if $FOCUS == $self;	425	return if $FOCUS == $self;
427	return unless $self->{can_focus};	426	return unless $self->{can_focus};
428		427
429	my $focus = $FOCUS; $FOCUS = $self;	428	my $focus = $FOCUS; $FOCUS = $self;
430		429
431	$self->_emit (focus_in => $focus);
432
433	$focus->update if $focus;	430	$focus->update if $focus;
434	$FOCUS->update;	431	$FOCUS->update;
435	}
436		432
		433	0
		434	}
		435
437	sub focus_out {	436	sub invoke_focus_out {
438	my ($self) = @_;	437	my ($self) = @_;
439		438
440	return unless $FOCUS == $self;	439	return unless $FOCUS == $self;
441		440
442	my $focus = $FOCUS; undef $FOCUS;	441	my $focus = $FOCUS; undef $FOCUS;
443		442
444	$self->_emit (focus_out => $focus);
445
446	$focus->update if $focus; #?	443	$focus->update if $focus; #?
447		444
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	446	unless $FOCUS;
450	}
451		447
		448	0
		449	}
		450
		451	sub grab_focus {
		452	my ($self) = @_;
		453
		454	$self->emit ("focus_in");
		455	}
		456
452	sub mouse_motion { 0 }	457	sub invoke_mouse_motion { 1 }
453	sub button_up { 0 }	458	sub invoke_button_up { 1 }
454	sub key_down { 0 }	459	sub invoke_key_down { 1 }
455	sub key_up { 0 }	460	sub invoke_key_up { 1 }
456		461
457	sub button_down {	462	sub invoke_button_down {
458	my ($self, $ev, $x, $y) = @_;	463	my ($self, $ev, $x, $y) = @_;
459		464
460	$self->focus_in;	465	$self->grab_focus;
461		466
462	0	467	1
		468	}
		469
		470	sub connect {
		471	my ($self, $signal, $cb) = @_;
		472
		473	push @{ $self->{signal_cb}{$signal} }, $cb;
		474	}
		475
		476	sub emit {
		477	my ($self, $signal, @args) = @_;
		478
		479	#d##TODO# stop propagating at first true, do not use sum
		480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
		481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
		482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463	}	483	}
464		484
465	sub find_widget {	485	sub find_widget {
466	my ($self, $x, $y) = @_;	486	my ($self, $x, $y) = @_;
467		487
…		…
477	sub set_parent {	497	sub set_parent {
478	my ($self, $parent) = @_;	498	my ($self, $parent) = @_;
479		499
480	Scalar::Util::weaken ($self->{parent} = $parent);	500	Scalar::Util::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	501	$self->set_visible if $parent->{visible};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub visibility_change {
504	#my ($self, $visible) = @_;
505	}	502	}
506		503
507	sub realloc {	504	sub realloc {
508	my ($self) = @_;	505	my ($self) = @_;
509		506
…		…
542	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
543		540
544	# update screen rectangle	541	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	542	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	543	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		544
550	# skip widgets that are entirely outside the drawing area	545	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	546	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	547	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		548
…		…
593		588
594	sub DESTROY {	589	sub DESTROY {
595	my ($self) = @_;	590	my ($self) = @_;
596		591
597	delete $WIDGET{$self+0};	592	delete $WIDGET{$self+0};
598	#$self->deactivate;	593
		594	eval { $self->destroy };
		595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599	}	596	}
600		597
601	#############################################################################	598	#############################################################################
602		599
603	package CFClient::UI::DrawBG;	600	package CFClient::UI::DrawBG;
…		…
768	}	765	}
769		766
770	sub add {	767	sub add {
771	my ($self, $child) = @_;	768	my ($self, $child) = @_;
772		769
773	$self->{children} = [];	770	$self->SUPER::remove ($_) for @{ $self->{children} };
774
775	$self->SUPER::add ($child);	771	$self->SUPER::add ($child);
776	}	772	}
777		773
778	sub remove {	774	sub remove {
779	my ($self, $widget) = @_;	775	my ($self, $widget) = @_;
…		…
788		784
789	sub size_request {	785	sub size_request {
790	$_[0]{children}[0]->size_request	786	$_[0]{children}[0]->size_request
791	}	787	}
792		788
793	sub size_allocate {	789	sub invoke_size_allocate {
794	my ($self, $w, $h) = @_;	790	my ($self, $w, $h) = @_;
795		791
796	$self->{children}[0]->configure (0, 0, $w, $h);	792	$self->{children}[0]->configure (0, 0, $w, $h);
		793
		794	1
797	}	795	}
798		796
799	#############################################################################	797	#############################################################################
800		798
801	# back-buffered drawing area	799	# back-buffered drawing area
…		…
817		815
818	$ROOT->on_post_alloc ($self => sub { $self->render_child });	816	$ROOT->on_post_alloc ($self => sub { $self->render_child });
819	$self->SUPER::update;	817	$self->SUPER::update;
820	}	818	}
821		819
822	sub size_allocate {	820	sub invoke_size_allocate {
823	my ($self, $w, $h) = @_;	821	my ($self, $w, $h) = @_;
824		822
825	$self->SUPER::size_allocate ($w, $h);
826	$self->update;	823	$self->update;
		824
		825	$self->SUPER::invoke_size_allocate ($w, $h)
827	}	826	}
828		827
829	sub _render {	828	sub _render {
830	my ($self) = @_;	829	my ($self) = @_;
831		830
…		…
892	$h = 10 if $self->{scroll_y};	891	$h = 10 if $self->{scroll_y};
893		892
894	($w, $h)	893	($w, $h)
895	}	894	}
896		895
897	sub size_allocate {	896	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	897	my ($self, $w, $h) = @_;
899		898
900	my $child = $self->child;	899	my $child = $self->child;
901		900
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	901	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	902	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		903
905	$self->child->configure (0, 0, $w, $h);	904	$self->child->configure (0, 0, $w, $h);
906	$self->update;	905	$self->update;
		906
		907	1
907	}	908	}
908		909
909	sub set_offset {	910	sub set_offset {
910	my ($self, $x, $y) = @_;	911	my ($self, $x, $y) = @_;
911		912
…		…
985	$self->add ($child) if $child;	986	$self->add ($child) if $child;
986		987
987	$self	988	$self
988	}	989	}
989		990
		991	#TODO# update range on size_allocate depending on child
		992
990	sub add {	993	sub add {
991	my ($self, $widget) = @_;	994	my ($self, $widget) = @_;
992		995
993	$self->{vp}->add ($self->{child} = $widget);	996	$self->{vp}->add ($self->{child} = $widget);
994	}	997	}
995		998
		999	sub update_slider {
		1000	my ($self) = @_;
		1001
		1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1003	}
		1004
996	sub update {	1005	sub update {
997	my ($self) = @_;	1006	my ($self) = @_;
998		1007
999	$self->SUPER::update;	1008	$self->SUPER::update;
1000		1009
1001	# todo: overwrite size_allocate of child	1010	$self->update_slider;
1002	my $child = $self->{vp}->child;
1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004	}	1011	}
1005		1012
1006	sub size_allocate {	1013	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1014	my ($self, $w, $h) = @_;
1008		1015
		1016	$self->update_slider;
		1017
1009	$self->SUPER::size_allocate ($w, $h);	1018	$self->SUPER::invoke_size_allocate ($w, $h)
1010
1011	my $child = $self->{vp}->child;
1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013	}	1019	}
1014
1015	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll
1017		1020
1018	#############################################################################	1021	#############################################################################
1019		1022
1020	package CFClient::UI::Frame;	1023	package CFClient::UI::Frame;
1021		1024
…		…
1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073		1076
1074	sub new {	1077	sub new {
1075	my ($class, %arg) = @_;	1078	my ($class, %arg) = @_;
1076
1077	my $title = delete $arg{title};
1078		1079
1079	my $self = $class->SUPER::new (	1080	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1081	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1082	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1083	border => 0.6,
…		…
1084	min_w => 16,	1085	min_w => 16,
1085	min_h => 16,	1086	min_h => 16,
1086	%arg,	1087	%arg,
1087	);	1088	);
1088		1089
1089	$self->{title} = new CFClient::UI::Label	1090	$self->{title_widget} = new CFClient::UI::Label
1090	align => 0,	1091	align => 0,
1091	valign => 1,	1092	valign => 1,
1092	text => $title,	1093	text => $self->{title},
1093	fontsize => $self->{border}	1094	fontsize => $self->{border},
1094	if defined $title;	1095	if exists $self->{title};
		1096
		1097	if ($self->{has_close_button}) {
		1098	$self->{close_button} =
		1099	new CFClient::UI::ImageButton
		1100	path => 'x1_close.png',
		1101	on_activate => sub { $self->hide };
		1102
		1103	$self->CFClient::UI::Container::add ($self->{close_button});
		1104	}
1095		1105
1096	$self	1106	$self
1097	}	1107	}
1098		1108
1099	sub add {	1109	sub add {
1100	my ($self, @widgets) = @_;	1110	my ($self, @widgets) = @_;
1101		1111
1102	$self->SUPER::add (@widgets);	1112	$self->SUPER::add (@widgets);
		1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1115	}
1105		1116
1106	sub border {	1117	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1118	int $_[0]{border} * $::FONTSIZE
1108	}	1119	}
1109		1120
1110	sub size_request {	1121	sub size_request {
1111	my ($self) = @_;	1122	my ($self) = @_;
1112		1123
1113	$self->{title}->size_request	1124	$self->{title_widget}->size_request
1114	if $self->{title};	1125	if $self->{title_widget};
		1126
		1127	$self->{close_button}->size_request
		1128	if $self->{close_button};
1115		1129
1116	my ($w, $h) = $self->SUPER::size_request;	1130	my ($w, $h) = $self->SUPER::size_request;
1117		1131
1118	(	1132	(
1119	$w + $self->border * 2,	1133	$w + $self->border * 2,
1120	$h + $self->border * 2,	1134	$h + $self->border * 2,
1121	)	1135	)
1122	}	1136	}
1123		1137
1124	sub size_allocate {	1138	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1139	my ($self, $w, $h) = @_;
1126		1140
1127	if ($self->{title}) {	1141	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1142	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1143	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1144	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1145	}
1132		1146
1133	my $border = $self->border;	1147	my $border = $self->border;
1134		1148
1135	$h -= List::Util::max 0, $border * 2;	1149	$h -= List::Util::max 0, $border * 2;
1136	$w -= List::Util::max 0, $border * 2;	1150	$w -= List::Util::max 0, $border * 2;
1137		1151
1138	$self->child->configure ($border, $border, $w, $h);	1152	$self->child->configure ($border, $border, $w, $h);
1139	}
1140		1153
		1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1155	if $self->{close_button};
		1156
		1157	1
		1158	}
		1159
1141	sub button_down {	1160	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1161	my ($self, $ev, $x, $y) = @_;
1143		1162
1144	my ($w, $h) = @$self{qw(w h)};	1163	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1164	my $border = $self->border;
1146		1165
…		…
1177		1196
1178	($x, $y) = ($ev->{x}, $ev->{y});	1197	($x, $y) = ($ev->{x}, $ev->{y});
1179		1198
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1199	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1200	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1201	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1202	};
1184	} else {	1203	} else {
1185	return 0;	1204	return 0;
1186	}	1205	}
1187		1206
1188	1	1207	1
1189	}	1208	}
1190		1209
1191	sub button_up {	1210	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1211	my ($self, $ev, $x, $y) = @_;
1193		1212
1194	!!delete $self->{motion}	1213	! ! delete $self->{motion}
1195	}	1214	}
1196		1215
1197	sub mouse_motion {	1216	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1217	my ($self, $ev, $x, $y) = @_;
1199		1218
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1219	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1220
1202	!!$self->{motion}	1221	! ! $self->{motion}
1203	}	1222	}
1204		1223
1205	sub _draw {	1224	sub _draw {
1206	my ($self) = @_;	1225	my ($self) = @_;
1207		1226
…		…
1233		1252
1234	glDisable GL_TEXTURE_2D;	1253	glDisable GL_TEXTURE_2D;
1235		1254
1236	$child->draw;	1255	$child->draw;
1237		1256
1238	if ($self->{title}) {	1257	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1258	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1259	$self->{title_widget}->_draw;
		1260
		1261	glTranslate 0, - ($border - $self->{h});
1241	}	1262	}
		1263
		1264	$self->{close_button}->draw
		1265	if $self->{close_button};
1242	}	1266	}
1243		1267
1244	#############################################################################	1268	#############################################################################
1245		1269
1246	package CFClient::UI::Table;	1270	package CFClient::UI::Table;
…		…
1269		1293
1270	$child->set_parent ($self);	1294	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1295	$self->{children}[$y][$x] = $child;
1272		1296
1273	$self->realloc;	1297	$self->realloc;
		1298	}
		1299
		1300	sub remove {
		1301	my ($self, $child) = @_;
		1302
		1303	# TODO: not yet implemented
1274	}	1304	}
1275		1305
1276	# TODO: move to container class maybe? send children a signal on removal?	1306	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1307	sub clear {
1278	my ($self) = @_;	1308	my ($self) = @_;
…		…
1319	(sum @$ws),	1349	(sum @$ws),
1320	(sum @$hs),	1350	(sum @$hs),
1321	)	1351	)
1322	}	1352	}
1323		1353
1324	sub size_allocate {	1354	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1355	my ($self, $w, $h) = @_;
1326		1356
1327	my ($ws, $hs) = $self->get_wh;	1357	my ($ws, $hs) = $self->get_wh;
1328		1358
1329	my $req_w = (sum @$ws) || 1;	1359	my $req_w = (sum @$ws) || 1;
…		…
1361	}	1391	}
1362		1392
1363	$y += $row_h;	1393	$y += $row_h;
1364	}	1394	}
1365		1395
		1396	1
1366	}	1397	}
1367		1398
1368	sub find_widget {	1399	sub find_widget {
1369	my ($self, $x, $y) = @_;	1400	my ($self, $x, $y) = @_;
1370		1401
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1438	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1439	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1440	)
1410	}	1441	}
1411		1442
1412	sub size_allocate {	1443	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1444	my ($self, $w, $h) = @_;
1414		1445
1415	my $space = $self->{vertical} ? $h : $w;	1446	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1447	my @children = $self->visible_children;
1417		1448
1418	my @req;	1449	my @req;
1419		1450
1420	if ($self->{homogeneous}) {	1451	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1452	@req = ($space / (@children || 1)) x @children;
1422	} else {	1453	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1454	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1455	my $req = List::Util::sum @req;
1425		1456
1426	if ($req > $space) {	1457	if ($req > $space) {
1427	# ah well, not enough space	1458	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1459	$_ *= $space / $req for @req;
1429	} else {	1460	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1461	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1462
1432	$space = ($space - $req) / $expand; # remaining space to give away	1463	$space = ($space - $req) / $expand; # remaining space to give away
1433		1464
1434	$req[$_] += $space * $children->[$_]{expand}	1465	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1466	for 0 .. $#children;
1436	}	1467	}
1437	}	1468	}
1438		1469
1439	CFClient::UI::harmonize \@req;	1470	CFClient::UI::harmonize \@req;
1440		1471
1441	my $pos = 0;	1472	my $pos = 0;
1442	for (0 .. $#$children) {	1473	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1474	my $alloc = $req[$_];
1444	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445		1476
1446	$pos += $alloc;	1477	$pos += $alloc;
1447	}	1478	}
1448		1479
1449	1	1480	1
…		…
1604	};	1635	};
1605		1636
1606	@{ $self->{size_req} }	1637	@{ $self->{size_req} }
1607	}	1638	}
1608		1639
		1640	sub baseline_shift {
		1641	$_[0]{layout}->descent
		1642	}
		1643
1609	sub size_allocate {	1644	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1645	my ($self, $w, $h) = @_;
1611		1646
1612	delete $self->{ox};	1647	delete $self->{ox};
1613		1648
1614	delete $self->{texture}	1649	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1650	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1651
		1652	1
1616	}	1653	}
1617		1654
1618	sub set_fontsize {	1655	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1656	my ($self, $fontsize) = @_;
1620		1657
…		…
1658	: ($self->{h} - $tex->{h}) * 0.5);	1695	: ($self->{h} - $tex->{h}) * 0.5);
1659	};	1696	};
1660		1697
1661	glEnable GL_TEXTURE_2D;	1698	glEnable GL_TEXTURE_2D;
1662		1699
		1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};
		1702
1663	if ($tex->{format} == GL_ALPHA) {	1703	if ($tex->{format} == GL_ALPHA) {
1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665	glColor @{$self->{fg}};	1705	glColor @{$self->{fg}};
1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1667	} else {	1707	} else {
1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1670	}	1710	}
1671		1711
1672	glDisable GL_TEXTURE_2D;	1712	glDisable GL_TEXTURE_2D;
1673	}	1713	}
1674		1714
…		…
1710		1750
1711	$text =~ s/./*/g if $self->{hidden};	1751	$text =~ s/./*/g if $self->{hidden};
1712	$self->{layout}->set_text ("$text ");	1752	$self->{layout}->set_text ("$text ");
1713	delete $self->{size_req};	1753	delete $self->{size_req};
1714		1754
1715	$self->_emit (changed => $self->{text});	1755	$self->emit (changed => $self->{text});
1716		1756
1717	$self->realloc;	1757	$self->realloc;
1718	$self->update;	1758	$self->update;
1719	}	1759	}
1720		1760
…		…
1735	my ($w, $h) = $self->SUPER::size_request;	1775	my ($w, $h) = $self->SUPER::size_request;
1736		1776
1737	($w + 1, $h) # add 1 for cursor	1777	($w + 1, $h) # add 1 for cursor
1738	}	1778	}
1739		1779
1740	sub key_down {	1780	sub invoke_key_down {
1741	my ($self, $ev) = @_;	1781	my ($self, $ev) = @_;
1742		1782
1743	my $mod = $ev->{mod};	1783	my $mod = $ev->{mod};
1744	my $sym = $ev->{sym};	1784	my $sym = $ev->{sym};
1745	my $uni = $ev->{unicode};	1785	my $uni = $ev->{unicode};
…		…
1757	} elsif ($sym == CFClient::SDLK_HOME) {	1797	} elsif ($sym == CFClient::SDLK_HOME) {
1758	$self->{cursor} = 0;	1798	$self->{cursor} = 0;
1759	} elsif ($sym == CFClient::SDLK_END) {	1799	} elsif ($sym == CFClient::SDLK_END) {
1760	$self->{cursor} = length $text;	1800	$self->{cursor} = length $text;
1761	} elsif ($uni == 27) {	1801	} elsif ($uni == 27) {
1762	$self->_emit ('escape');	1802	$self->emit ('escape');
1763	} elsif ($uni) {	1803	} elsif ($uni) {
1764	substr $text, $self->{cursor}++, 0, chr $uni;	1804	substr $text, $self->{cursor}++, 0, chr $uni;
1765	} else {	1805	} else {
1766	return 0;	1806	return 0;
1767	}	1807	}
…		…
1771	$self->realloc;	1811	$self->realloc;
1772		1812
1773	1	1813	1
1774	}	1814	}
1775		1815
1776	sub focus_in {	1816	sub invoke_focus_in {
1777	my ($self) = @_;	1817	my ($self) = @_;
1778		1818
1779	$self->{last_activity} = $::NOW;	1819	$self->{last_activity} = $::NOW;
1780		1820
1781	$self->SUPER::focus_in;	1821	$self->SUPER::invoke_focus_in
1782	}	1822	}
1783		1823
1784	sub button_down {	1824	sub invoke_button_down {
1785	my ($self, $ev, $x, $y) = @_;	1825	my ($self, $ev, $x, $y) = @_;
1786		1826
1787	$self->SUPER::button_down ($ev, $x, $y);	1827	$self->SUPER::invoke_button_down ($ev, $x, $y);
1788		1828
1789	my $idx = $self->{layout}->xy_to_index ($x, $y);	1829	my $idx = $self->{layout}->xy_to_index ($x, $y);
1790		1830
1791	# byte-index to char-index	1831	# byte-index to char-index
1792	my $text = $self->{text};	1832	my $text = $self->{text};
…		…
1797	$self->update;	1837	$self->update;
1798		1838
1799	1	1839	1
1800	}	1840	}
1801		1841
1802	sub mouse_motion {	1842	sub invoke_mouse_motion {
1803	my ($self, $ev, $x, $y) = @_;	1843	my ($self, $ev, $x, $y) = @_;
1804	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1844	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805		1845
1806	0	1846	1
1807	}	1847	}
1808		1848
1809	sub _draw {	1849	sub _draw {
1810	my ($self) = @_;	1850	my ($self) = @_;
1811		1851
…		…
1852		1892
1853	our @ISA = CFClient::UI::EntryBase::;	1893	our @ISA = CFClient::UI::EntryBase::;
1854		1894
1855	use CFClient::OpenGL;	1895	use CFClient::OpenGL;
1856		1896
1857	sub key_down {	1897	sub invoke_key_down {
1858	my ($self, $ev) = @_;	1898	my ($self, $ev) = @_;
1859		1899
1860	my $sym = $ev->{sym};	1900	my $sym = $ev->{sym};
1861		1901
1862	if ($sym == 13) {	1902	if ($sym == 13) {
1863	unshift @{$self->{history}},	1903	unshift @{$self->{history}},
1864	my $txt = $self->get_text;	1904	my $txt = $self->get_text;
		1905
1865	$self->{history_pointer} = -1;	1906	$self->{history_pointer} = -1;
1866	$self->{history_saveback} = '';	1907	$self->{history_saveback} = '';
1867	$self->_emit (activate => $txt);	1908	$self->emit (activate => $txt);
1868	$self->update;	1909	$self->update;
1869		1910
1870	} elsif ($sym == CFClient::SDLK_UP) {	1911	} elsif ($sym == CFClient::SDLK_UP) {
1871	if ($self->{history_pointer} < 0) {	1912	if ($self->{history_pointer} < 0) {
1872	$self->{history_saveback} = $self->get_text;	1913	$self->{history_saveback} = $self->get_text;
…		…
1888	} else {	1929	} else {
1889	$self->set_text ($self->{history_saveback});	1930	$self->set_text ($self->{history_saveback});
1890	}	1931	}
1891		1932
1892	} else {	1933	} else {
1893	return $self->SUPER::key_down ($ev)	1934	return $self->SUPER::invoke_key_down ($ev)
1894	}	1935	}
1895		1936
1896	1	1937	1
1897	}	1938	}
1898		1939
…		…
1922	can_events => 1,	1963	can_events => 1,
1923	@_	1964	@_
1924	)	1965	)
1925	}	1966	}
1926		1967
1927	sub activate { }
1928
1929	sub button_up {	1968	sub invoke_button_up {
1930	my ($self, $ev, $x, $y) = @_;	1969	my ($self, $ev, $x, $y) = @_;
1931		1970
1932	$self->emit ("activate")	1971	$self->emit ("activate")
1933	if $x >= 0 && $x < $self->{w}	1972	if $x >= 0 && $x < $self->{w}
1934	&& $y >= 0 && $y < $self->{h};	1973	&& $y >= 0 && $y < $self->{h};
…		…
1948	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1987	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1949		1988
1950	glDisable GL_TEXTURE_2D;	1989	glDisable GL_TEXTURE_2D;
1951		1990
1952	$self->SUPER::_draw;	1991	$self->SUPER::_draw;
		1992	}
		1993
		1994	#############################################################################
		1995
		1996	package CFClient::UI::ImageButton;
		1997
		1998	our @ISA = CFClient::UI::Image::;
		1999
		2000	use CFClient::OpenGL;
		2001
		2002	my %textures;
		2003
		2004	sub new {
		2005	my $class = shift;
		2006
		2007	my $self = $class->SUPER::new (
		2008	padding_x => 4,
		2009	padding_y => 4,
		2010	fg => [1, 1, 1],
		2011	active_fg => [0, 0, 1],
		2012	can_hover => 1,
		2013	align => 0,
		2014	valign => 0,
		2015	can_events => 1,
		2016	@_
		2017	);
		2018	}
		2019
		2020	sub invoke_button_up {
		2021	my ($self, $ev, $x, $y) = @_;
		2022
		2023	$self->emit ("activate")
		2024	if $x >= 0 && $x < $self->{w}
		2025	&& $y >= 0 && $y < $self->{h};
		2026
		2027	1
1953	}	2028	}
1954		2029
1955	#############################################################################	2030	#############################################################################
1956		2031
1957	package CFClient::UI::CheckBox;	2032	package CFClient::UI::CheckBox;
…		…
1984	my ($self) = @_;	2059	my ($self) = @_;
1985		2060
1986	(6) x 2	2061	(6) x 2
1987	}	2062	}
1988		2063
1989	sub button_down {	2064	sub invoke_button_down {
1990	my ($self, $ev, $x, $y) = @_;	2065	my ($self, $ev, $x, $y) = @_;
1991		2066
1992	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994	$self->{state} = !$self->{state};	2069	$self->{state} = !$self->{state};
1995	$self->_emit (changed => $self->{state});	2070	$self->emit (changed => $self->{state});
1996	} else {	2071	} else {
1997	return 0	2072	return 0
1998	}	2073	}
1999		2074
2000	1	2075	1
…		…
2025	package CFClient::UI::Image;	2100	package CFClient::UI::Image;
2026		2101
2027	our @ISA = CFClient::UI::Base::;	2102	our @ISA = CFClient::UI::Base::;
2028		2103
2029	use CFClient::OpenGL;	2104	use CFClient::OpenGL;
2030	use Carp qw/confess/;
2031		2105
2032	our %loaded_images;	2106	our %texture_cache;
2033		2107
2034	sub new {	2108	sub new {
2035	my $class = shift;	2109	my $class = shift;
2036		2110
2037	my $self = $class->SUPER::new (can_events => 0, @_);	2111	my $self = $class->SUPER::new (
		2112	can_events => 0,
		2113	@_,
		2114	);
2038		2115
2039	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2116	$self->{path}
		2117	or Carp::croak "required attribute 'path' not set";
2040		2118
2041	$loaded_images{$self->{image}} ||=	2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2042	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2120	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2043		2121
2044	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2045		2123
2046	Scalar::Util::weaken $loaded_images{$self->{image}};	2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048	$self->{aspect} = $tex->{w} / $tex->{h};
2049		2125
2050	$self	2126	$self
2051	}	2127	}
2052		2128
2053	sub size_request {	2129	sub size_request {
2054	my ($self) = @_;	2130	my ($self) = @_;
2055		2131
2056	($self->{tex}->{w}, $self->{tex}->{h})	2132	($self->{tex}{w}, $self->{tex}{h})
2057	}	2133	}
2058		2134
2059	sub _draw {	2135	sub _draw {
2060	my ($self) = @_;	2136	my ($self) = @_;
2061		2137
…		…
2297	$self->update;	2373	$self->update;
2298		2374
2299	$self	2375	$self
2300	}	2376	}
2301		2377
2302	sub changed { }
2303
2304	sub set_range {	2378	sub set_range {
2305	my ($self, $range) = @_;	2379	my ($self, $range) = @_;
2306		2380
2307	($range, $self->{range}) = ($self->{range}, $range);	2381	($range, $self->{range}) = ($self->{range}, $range);
2308		2382
2309	$self->update
2310	if "@$range" ne "@{$self->{range}}";	2383	if ("@$range" ne "@{$self->{range}}") {
		2384	$self->update;
		2385	$self->set_value ($self->{range}[0]);
		2386	}
2311	}	2387	}
2312		2388
2313	sub set_value {	2389	sub set_value {
2314	my ($self, $value) = @_;	2390	my ($self, $value) = @_;
2315		2391
…		…
2326	if $unit;	2402	if $unit;
2327		2403
2328	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2404	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329		2405
2330	if ($value != $old_value) {	2406	if ($value != $old_value) {
2331	$self->_emit (changed => $value);	2407	$self->emit (changed => $value);
2332	$self->update;	2408	$self->update;
2333	}	2409	}
2334	}	2410	}
2335		2411
2336	sub size_request {	2412	sub size_request {
2337	my ($self) = @_;	2413	my ($self) = @_;
2338		2414
2339	($self->{req_w}, $self->{req_h})	2415	($self->{req_w}, $self->{req_h})
2340	}	2416	}
2341		2417
2342	sub button_down {	2418	sub invoke_button_down {
2343	my ($self, $ev, $x, $y) = @_;	2419	my ($self, $ev, $x, $y) = @_;
2344		2420
2345	$self->SUPER::button_down ($ev, $x, $y);	2421	$self->SUPER::invoke_button_down ($ev, $x, $y);
2346		2422
2347	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2423	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348		2424
2349	$self->mouse_motion ($ev, $x, $y)	2425	$self->invoke_mouse_motion ($ev, $x, $y)
2350	}	2426	}
2351		2427
2352	sub mouse_motion {	2428	sub invoke_mouse_motion {
2353	my ($self, $ev, $x, $y) = @_;	2429	my ($self, $ev, $x, $y) = @_;
2354		2430
2355	if ($GRAB == $self) {	2431	if ($GRAB == $self) {
2356	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2432	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357		2433
…		…
2462	sub set_range { shift->{slider}->set_range (@_) }	2538	sub set_range { shift->{slider}->set_range (@_) }
2463	sub set_value { shift->{slider}->set_value (@_) }	2539	sub set_value { shift->{slider}->set_value (@_) }
2464		2540
2465	#############################################################################	2541	#############################################################################
2466		2542
2467	package CFClient::UI::TextView;	2543	package CFClient::UI::TextScroller;
2468		2544
2469	our @ISA = CFClient::UI::HBox::;	2545	our @ISA = CFClient::UI::HBox::;
2470		2546
2471	use CFClient::OpenGL;	2547	use CFClient::OpenGL;
2472		2548
…		…
2474	my $class = shift;	2550	my $class = shift;
2475		2551
2476	my $self = $class->SUPER::new (	2552	my $self = $class->SUPER::new (
2477	fontsize => 1,	2553	fontsize => 1,
2478	can_events => 0,	2554	can_events => 0,
		2555	indent => 0,
2479	#font => default_font	2556	#font => default_font
2480	@_,	2557	@_,
2481		2558
2482	layout => (new CFClient::Layout 1),	2559	layout => (new CFClient::Layout 1),
2483	par => [],	2560	par => [],
…		…
2498		2575
2499	$self->{fontsize} = $fontsize;	2576	$self->{fontsize} = $fontsize;
2500	$self->reflow;	2577	$self->reflow;
2501	}	2578	}
2502		2579
		2580	sub size_request {
		2581	my ($self) = @_;
		2582
		2583	my ($empty, $slider) = @{ $self->{children} };
		2584
		2585	local $self->{children} = [$empty, $slider];
		2586	$self->SUPER::size_request
		2587	}
		2588
2503	sub size_allocate {	2589	sub invoke_size_allocate {
2504	my ($self, $w, $h) = @_;	2590	my ($self, $w, $h) = @_;
2505		2591
2506	$self->SUPER::size_allocate ($w, $h);	2592	my ($empty, $slider, @other) = @{ $self->{children} };
		2593	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2507		2594
2508	$self->{layout}->set_font ($self->{font}) if $self->{font};	2595	$self->{layout}->set_font ($self->{font}) if $self->{font};
2509	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2596	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510	$self->{layout}->set_width ($self->{children}[0]{w});	2597	$self->{layout}->set_width ($empty->{w});
2511	$self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);	2598	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512		2599
2513	$self->reflow;	2600	$self->reflow;
2514	}
2515		2601
2516	sub text_size {	2602	local $self->{children} = [$empty, $slider];
2517	my ($self, $text, $indent) = @_;	2603	$self->SUPER::invoke_size_allocate ($w, $h)
		2604	}
		2605
		2606	sub get_layout {
		2607	my ($self, $para) = @_;
2518		2608
2519	my $layout = $self->{layout};	2609	my $layout = $self->{layout};
2520		2610
		2611	$layout->set_font ($self->{font}) if $self->{font};
		2612	$layout->set_foreground (@{$para->{fg}});
2521	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2613	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2522	$layout->set_width ($self->{children}[0]{w} - $indent);	2614	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2523	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);	2615	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2524	$layout->set_markup ($text);	2616	$layout->set_markup ($para->{markup});
		2617
		2618	$layout->set_shapes (
		2619	map
		2620	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2621	@{$para->{widget}}
2525		2622	);
		2623
2526	$layout->size	2624	$layout
2527	}	2625	}
2528		2626
2529	sub reflow {	2627	sub reflow {
2530	my ($self) = @_;	2628	my ($self) = @_;
2531		2629
…		…
2540	$self->{children}[1]->set_value ($offset);	2638	$self->{children}[1]->set_value ($offset);
2541	}	2639	}
2542		2640
2543	sub clear {	2641	sub clear {
2544	my ($self) = @_;	2642	my ($self) = @_;
		2643
		2644	my (undef, undef, @other) = @{ $self->{children} };
		2645	$self->remove ($_) for @other;
2545		2646
2546	$self->{par} = [];	2647	$self->{par} = [];
2547	$self->{height} = 0;	2648	$self->{height} = 0;
2548	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2649	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2549	}	2650	}
2550		2651
2551	sub add_paragraph {	2652	sub add_paragraph {
2552	my ($self, $color, $text, $indent) = @_;	2653	my ($self, $color, $para, $indent) = @_;
2553		2654
2554	for my $line (split /\n/, $text) {	2655	my ($text, @w) = ref $para ? @$para : $para;
2555	my ($w, $h) = $self->text_size ($line);	2656
2556	$self->{height} += $h;	2657	$para = {
2557	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2658	w => 1e10,
		2659	wrapped => 1,
		2660	fg => $color,
		2661	indent => $indent,
		2662	markup => $text,
		2663	widget => \@w,
2558	}	2664	};
2559		2665
2560	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2666	$self->add (@w) if @w;
		2667	push @{$self->{par}}, $para;
		2668
		2669	$self->{need_reflow}++;
		2670	$self->update;
		2671	}
		2672
		2673	sub scroll_to_bottom {
		2674	my ($self) = @_;
		2675
		2676	$self->{scroll_to_bottom} = 1;
		2677	$self->update;
2561	}	2678	}
2562		2679
2563	sub update {	2680	sub update {
2564	my ($self) = @_;	2681	my ($self) = @_;
2565		2682
…		…
2567		2684
2568	return unless $self->{h} > 0;	2685	return unless $self->{h} > 0;
2569		2686
2570	delete $self->{texture};	2687	delete $self->{texture};
2571		2688
2572	$ROOT->on_post_alloc ($self, sub {	2689	$ROOT->on_post_alloc ($self => sub {
2573	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2690	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2574		2691
2575	if (delete $self->{need_reflow}) {	2692	if (delete $self->{need_reflow}) {
2576	my $height = 0;	2693	my $height = 0;
2577		2694
2578	my $layout = $self->{layout};
2579
2580	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2581
2582	for (@{$self->{par}}) {	2695	for my $para (@{$self->{par}}) {
2583	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2696	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2584	$layout->set_width ($W - $_->[3]);	2697	my $layout = $self->get_layout ($para);
2585	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2586	$layout->set_markup ($_->[4]);
2587	my ($w, $h) = $layout->size;	2698	my ($w, $h) = $layout->size;
2588	$_->[0] = $w + $_->[3];	2699
2589	$_->[1] = $h;	2700	$para->{w} = $w + $para->{indent};
		2701	$para->{h} = $h;
		2702	$para->{wrapped} = $layout->has_wrapped;
2590	}	2703	}
2591		2704
2592	$height += $_->[1];	2705	$height += $para->{h};
2593	}	2706	}
2594		2707
2595	$self->{height} = $height;	2708	$self->{height} = $height;
2596		2709
2597	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2710	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2598		2711
2599	delete $self->{texture};	2712	delete $self->{texture};
		2713	}
		2714
		2715	if (delete $self->{scroll_to_bottom}) {
		2716	$self->{children}[1]->set_value (1e10);
2600	}	2717	}
2601		2718
2602	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2719	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2603	glClearColor 0, 0, 0, 0;	2720	glClearColor 0, 0, 0, 0;
2604	glClear GL_COLOR_BUFFER_BIT;	2721	glClear GL_COLOR_BUFFER_BIT;
…		…
2608	my $y0 = $top;	2725	my $y0 = $top;
2609	my $y1 = $top + $H;	2726	my $y1 = $top + $H;
2610		2727
2611	my $y = 0;	2728	my $y = 0;
2612		2729
2613	my $layout = $self->{layout};
2614
2615	$layout->set_font ($self->{font}) if $self->{font};
2616
2617	glEnable GL_BLEND;	2730	glEnable GL_BLEND;
2618	#TODO# not correct in windows where rgba is forced off	2731	#TODO# not correct in windows where rgba is forced off
2619	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2732	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2620		2733
2621	for my $par (@{$self->{par}}) {	2734	for my $para (@{$self->{par}}) {
2622	my $h = $par->[1];	2735	my $h = $para->{h};
2623		2736
2624	if ($y0 < $y + $h && $y < $y1) {	2737	if ($y0 < $y + $h && $y < $y1) {
2625	$layout->set_foreground (@{ $par->[2] });	2738
2626	$layout->set_width ($W - $par->[3]);	2739	my $layout = $self->get_layout ($para);
2627	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2628	$layout->set_markup ($par->[4]);
2629		2740
2630	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2741	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2631		2742
2632	glRasterPos $par->[3], $y - $y0;	2743	glRasterPos $para->{indent}, $y - $y0;
2633	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2744	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
		2745
		2746	if (my @w = @{ $para->{widget} }) {
		2747	my @s = $layout->get_shapes;
		2748
		2749	glDisable GL_BLEND;
		2750	for (@w) {
		2751	my ($dx, $dy) = splice @s, 0, 2, ();
		2752
		2753	$_->{x} = $dx + $para->{indent};
		2754	$_->{y} = $dy + $y - $y0;
		2755
		2756	$_->draw;
		2757	}
		2758	glEnable GL_BLEND;
		2759	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2760	}
2634	}	2761	}
2635		2762
2636	$y += $h;	2763	$y += $h;
2637	}	2764	}
2638		2765
2639	glDisable GL_BLEND;	2766	glDisable GL_BLEND;
2640	};	2767	};
2641	});	2768	});
		2769	}
		2770
		2771	sub reconfigure {
		2772	my ($self) = @_;
		2773
		2774	$self->SUPER::reconfigure;
		2775
		2776	$_->{w} = 1e10 for @{ $self->{par} };
		2777	$self->reflow;
2642	}	2778	}
2643		2779
2644	sub _draw {	2780	sub _draw {
2645	my ($self) = @_;	2781	my ($self) = @_;
2646		2782
…		…
2649	glColor 0, 0, 0, 1;	2785	glColor 0, 0, 0, 1;
2650	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2786	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2651	glDisable GL_TEXTURE_2D;	2787	glDisable GL_TEXTURE_2D;
2652		2788
2653	$self->{children}[1]->draw;	2789	$self->{children}[1]->draw;
2654
2655	}	2790	}
2656		2791
2657	#############################################################################	2792	#############################################################################
2658		2793
2659	package CFClient::UI::Animator;	2794	package CFClient::UI::Animator;
…		…
2746	$tooltip .= "\n\n" . (ref $widget) . "\n"	2881	$tooltip .= "\n\n" . (ref $widget) . "\n"
2747	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2882	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2748	. "req $widget->{req_w} $widget->{req_h}\n"	2883	. "req $widget->{req_w} $widget->{req_h}\n"
2749	. "visible $widget->{visible}";	2884	. "visible $widget->{visible}";
2750	}	2885	}
		2886
		2887	$tooltip =~ s/^\n+//;
		2888	$tooltip =~ s/\n+$//;
2751		2889
2752	$self->add (new CFClient::UI::Label	2890	$self->add (new CFClient::UI::Label
2753	markup => $tooltip,	2891	markup => $tooltip,
2754	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2892	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2755	fontsize => 0.8,	2893	fontsize => 0.8,
…		…
2765	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2903	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2766		2904
2767	($w + 4, $h + 4)	2905	($w + 4, $h + 4)
2768	}	2906	}
2769		2907
2770	sub size_allocate {	2908	sub invoke_size_allocate {
2771	my ($self, $w, $h) = @_;	2909	my ($self, $w, $h) = @_;
2772		2910
2773	$self->SUPER::size_allocate ($w - 4, $h - 4);	2911	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2774	}	2912	}
2775		2913
2776	sub visibility_change {	2914	sub invoke_visibility_change {
2777	my ($self, $visible) = @_;	2915	my ($self, $visible) = @_;
2778		2916
2779	return unless $visible;	2917	return unless $visible;
2780		2918
2781	$self->{root}->on_post_alloc ("move_$self" => sub {	2919	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2783	or return;	2921	or return;
2784		2922
2785	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2923	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2786		2924
2787	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2925	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2788	if $x + $self->{w} > $::WIDTH;	2926	if $x + $self->{w} > $self->{root}{w};
2789		2927
2790	$self->move_abs ($x, $y);	2928	$self->move_abs ($x, $y);
2791	});	2929	});
2792	}	2930	}
2793		2931
…		…
2888	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3026	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2889	glDisable GL_TEXTURE_2D;	3027	glDisable GL_TEXTURE_2D;
2890	}	3028	}
2891	}	3029	}
2892		3030
2893	sub DESTROY {	3031	sub destroy {
2894	my ($self) = @_;	3032	my ($self) = @_;
2895		3033
2896	$self->{timer}->cancel	3034	$self->{timer}->cancel
2897	if $self->{timer};	3035	if $self->{timer};
2898		3036
2899	$self->SUPER::DESTROY;	3037	$self->SUPER::destroy;
2900	}	3038	}
2901		3039
2902	#############################################################################	3040	#############################################################################
2903		3041
2904	package CFClient::UI::Buttonbar;	3042	package CFClient::UI::Buttonbar;
…		…
2932	# handle various types of items, only text for now	3070	# handle various types of items, only text for now
2933	if (!ref $widget) {	3071	if (!ref $widget) {
2934	$widget = new CFClient::UI::Label	3072	$widget = new CFClient::UI::Label
2935	can_hover => 1,	3073	can_hover => 1,
2936	can_events => 1,	3074	can_events => 1,
2937	text => $widget,	3075	markup => $widget,
2938	tooltip => $tooltip	3076	tooltip => $tooltip
2939	}	3077	}
2940		3078
2941	$self->{item}{$widget} = $item;	3079	$self->{item}{$widget} = $item;
2942		3080
…		…
2948		3086
2949	# popup given the event (must be a mouse button down event currently)	3087	# popup given the event (must be a mouse button down event currently)
2950	sub popup {	3088	sub popup {
2951	my ($self, $ev) = @_;	3089	my ($self, $ev) = @_;
2952		3090
2953	$self->_emit ("popdown");	3091	$self->emit ("popdown");
2954		3092
2955	# maybe save $GRAB? must be careful about events...	3093	# maybe save $GRAB? must be careful about events...
2956	$GRAB = $self;	3094	$GRAB = $self;
2957	$self->{button} = $ev->{button};	3095	$self->{button} = $ev->{button};
2958		3096
2959	$self->show;	3097	$self->show;
2960	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3098	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2961	}	3099	}
2962		3100
2963	sub mouse_motion {	3101	sub invoke_mouse_motion {
2964	my ($self, $ev, $x, $y) = @_;	3102	my ($self, $ev, $x, $y) = @_;
2965		3103
2966	# TODO: should use vbox->find_widget or so	3104	# TODO: should use vbox->find_widget or so
2967	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3105	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2968	$self->{hover} = $self->{item}{$HOVER};	3106	$self->{hover} = $self->{item}{$HOVER};
2969		3107
2970	0	3108	0
2971	}	3109	}
2972		3110
2973	sub button_up {	3111	sub invoke_button_up {
2974	my ($self, $ev, $x, $y) = @_;	3112	my ($self, $ev, $x, $y) = @_;
2975		3113
2976	if ($ev->{button} == $self->{button}) {	3114	if ($ev->{button} == $self->{button}) {
2977	undef $GRAB;	3115	undef $GRAB;
2978	$self->hide;	3116	$self->hide;
2979		3117
2980	$self->_emit ("popdown");	3118	$self->emit ("popdown");
2981	$self->{hover}[1]->() if $self->{hover};	3119	$self->{hover}[1]->() if $self->{hover};
2982	} else {	3120	} else {
2983	return 0	3121	return 0
2984	}	3122	}
2985		3123
…		…
3022	: $self->{children}[$page_or_widget];	3160	: $self->{children}[$page_or_widget];
3023		3161
3024	$self->{current} = $widget;	3162	$self->{current} = $widget;
3025	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3163	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3026		3164
3027	$self->_emit (page_changed => $self->{current});	3165	$self->emit (page_changed => $self->{current});
3028		3166
3029	$self->realloc;	3167	$self->realloc;
3030	}	3168	}
3031		3169
3032	sub visible_children {	3170	sub visible_children {
…		…
3037	my ($self) = @_;	3175	my ($self) = @_;
3038		3176
3039	$self->{current}->size_request	3177	$self->{current}->size_request
3040	}	3178	}
3041		3179
3042	sub size_allocate {	3180	sub invoke_size_allocate {
3043	my ($self, $w, $h) = @_;	3181	my ($self, $w, $h) = @_;
3044		3182
3045	$self->{current}->configure (0, 0, $w, $h);	3183	$self->{current}->configure (0, 0, $w, $h);
		3184
		3185	1
3046	}	3186	}
3047		3187
3048	sub _draw {	3188	sub _draw {
3049	my ($self) = @_;	3189	my ($self) = @_;
3050		3190
…		…
3089		3229
3090	sub set_current_page {	3230	sub set_current_page {
3091	my ($self, $page) = @_;	3231	my ($self, $page) = @_;
3092		3232
3093	$self->{multiplexer}->set_current_page ($page);	3233	$self->{multiplexer}->set_current_page ($page);
3094	$self->_emit (page_changed => $self->{multiplexer}{current});	3234	$self->emit (page_changed => $self->{multiplexer}{current});
3095	}	3235	}
3096		3236
3097	#############################################################################	3237	#############################################################################
3098		3238
3099	package CFClient::UI::Combobox;	3239	package CFClient::UI::Combobox;
…		…
3104		3244
3105	sub new {	3245	sub new {
3106	my $class = shift;	3246	my $class = shift;
3107		3247
3108	my $self = $class->SUPER::new (	3248	my $self = $class->SUPER::new (
3109	options => [], # [title, value, tooltip], ...	3249	options => [], # [value, title, longdesc], ...
3110	value => undef,	3250	value => undef,
3111	@_,	3251	@_,
3112	);	3252	);
3113		3253
3114	$self->_set_value ($self->{value});	3254	$self->_set_value ($self->{value});
3115		3255
3116	$self	3256	$self
3117	}	3257	}
3118		3258
3119	sub button_down {	3259	sub invoke_button_down {
3120	my ($self, $ev) = @_;	3260	my ($self, $ev) = @_;
3121		3261
3122	my @menu_items;	3262	my @menu_items;
3123		3263
3124	for (@{ $self->{options} }) {	3264	for (@{ $self->{options} }) {
3125	my ($title, $value, $tooltip) = @$_;	3265	my ($value, $title, $tooltip) = @$_;
3126		3266
3127	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];	3267	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3128	}	3268	}
3129		3269
3130	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3270	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3131	}	3271	}
3132		3272
3133	sub _set_value {	3273	sub _set_value {
3134	my ($self, $value) = @_;	3274	my ($self, $value) = @_;
3135		3275
3136	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }	3276	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3137	or return;	3277	or return;
3138		3278
3139	$self->{value} = $item->[1];	3279	$self->{value} = $item->[0];
3140	$self->set_markup ("$item->[0] ⇓");	3280	$self->set_markup ("$item->[1] ⇓");
3141	$self->set_tooltip ($item->[2]);	3281	$self->set_tooltip ($item->[2]);
3142	}	3282	}
3143		3283
3144	sub set_value {	3284	sub set_value {
3145	my ($self, $value) = @_;	3285	my ($self, $value) = @_;
3146		3286
3147	return unless $self->{value} ne $value;	3287	return unless $self->{value} ne $value;
3148		3288
3149	$self->_set_value ($value);	3289	$self->_set_value ($value);
3150	$self->_emit (changed => $value);	3290	$self->emit (changed => $value);
3151	}	3291	}
3152		3292
3153	#############################################################################	3293	#############################################################################
3154		3294
3155	package CFClient::UI::Statusbox;	3295	package CFClient::UI::Statusbox;
…		…
3254	$item->{count}++;	3394	$item->{count}++;
3255	} else {	3395	} else {
3256	$item->{count} = 1;	3396	$item->{count} = 1;
3257	$item->{text} = $item->{tooltip} = $text;	3397	$item->{text} = $item->{tooltip} = $text;
3258	}	3398	}
3259	$item->{id} = ++$self->{id};	3399	$item->{id} += 0.2;#d#
3260	$item->{timeout} = $timeout;	3400	$item->{timeout} = $timeout;
3261	delete $item->{label};	3401	delete $item->{label};
3262	} else {	3402	} else {
3263	$self->{item}{$group} = {	3403	$self->{item}{$group} = {
3264	id => ++$self->{id},	3404	id => ++$self->{id},
…		…
3283		3423
3284	$self->reorder;	3424	$self->reorder;
3285	$self->SUPER::reconfigure;	3425	$self->SUPER::reconfigure;
3286	}	3426	}
3287		3427
3288	sub DESTROY {	3428	sub destroy {
3289	my ($self) = @_;	3429	my ($self) = @_;
3290		3430
3291	$self->{timer}->cancel;	3431	$self->{timer}->cancel;
3292		3432
3293	$self->SUPER::DESTROY;	3433	$self->SUPER::destroy;
3294	}	3434	}
3295		3435
3296	#############################################################################	3436	#############################################################################
3297		3437
3298	package CFClient::UI::Inventory;	3438	package CFClient::UI::Inventory;
…		…
3330	$self->{child}->add (0, $row, $item->{face_widget});	3470	$self->{child}->add (0, $row, $item->{face_widget});
3331	$self->{child}->add (1, $row, $item->{desc_widget});	3471	$self->{child}->add (1, $row, $item->{desc_widget});
3332	$self->{child}->add (2, $row, $item->{weight_widget});	3472	$self->{child}->add (2, $row, $item->{weight_widget});
3333		3473
3334	$row++;	3474	$row++;
3335	}
3336	}
3337
3338	#############################################################################
3339
3340	package CFClient::UI::BindEditor;
3341
3342	our @ISA = CFClient::UI::FancyFrame::;
3343
3344	sub new {
3345	my $class = shift;
3346
3347	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3348
3349	$self->add (my $vb = new CFClient::UI::VBox);
3350
3351
3352	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3353	text => "start recording",
3354	tooltip => "Start/Stops recording of actions."
3355	."All subsequent actions after the recording started will be captured."
3356	."The actions are displayed after the record was stopped."
3357	."To bind the action you have to click on the 'Bind' button",
3358	on_activate => sub {
3359	unless ($self->{recording}) {
3360	$self->start;
3361	} else {
3362	$self->stop;
3363	}
3364	});
3365
3366	$vb->add (new CFClient::UI::Label text => "Actions:");
3367	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3368
3369	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3370	$vb->add (my $hb = new CFClient::UI::HBox);
3371	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3372	$hb->add (new CFClient::UI::Button
3373	text => "bind",
3374	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3375	on_activate => sub {
3376	$self->ask_for_bind;
3377	});
3378
3379	$vb->add (my $hb = new CFClient::UI::HBox);
3380	$hb->add (new CFClient::UI::Button
3381	text => "ok",
3382	expand => 1,
3383	tooltip => "This closes the binding editor and saves the binding",
3384	on_activate => sub {
3385	$self->hide;
3386	$self->commit;
3387	});
3388
3389	$hb->add (new CFClient::UI::Button
3390	text => "cancel",
3391	expand => 1,
3392	tooltip => "This closes the binding editor without saving",
3393	on_activate => sub {
3394	$self->hide;
3395	$self->{binding_cancel}->()
3396	if $self->{binding_cancel};
3397	});
3398
3399	$self->update_binding_widgets;
3400
3401	$self
3402	}
3403
3404	sub commit {
3405	my ($self) = @_;
3406	my ($mod, $sym, $cmds) = $self->get_binding;
3407	if ($sym != 0 && @$cmds > 0) {
3408	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3409	."'. Don't forget 'Save Config'!");
3410	$self->{binding_change}->($mod, $sym, $cmds)
3411	if $self->{binding_change};
3412	} else {
3413	$::STATUSBOX->add ("No action bound, no key or action specified!");
3414	$self->{binding_cancel}->()
3415	if $self->{binding_cancel};
3416	}
3417	}
3418
3419	sub start {
3420	my ($self) = @_;
3421
3422	$self->{rec_btn}->set_text ("stop recording");
3423	$self->{recording} = 1;
3424	$self->clear_command_list;
3425	$::CONN->start_record if $::CONN;
3426	}
3427
3428	sub stop {
3429	my ($self) = @_;
3430
3431	$self->{rec_btn}->set_text ("start recording");
3432	$self->{recording} = 0;
3433
3434	my $rec;
3435	$rec = $::CONN->stop_record if $::CONN;
3436	return unless ref $rec eq 'ARRAY';
3437	$self->set_command_list ($rec);
3438	}
3439
3440
3441	sub ask_for_bind_and_commit {
3442	my ($self) = @_;
3443	$self->ask_for_bind (1);
3444	}
3445
3446	sub ask_for_bind {
3447	my ($self, $commit) = @_;
3448
3449	CFClient::Binder::open_binding_dialog (sub {
3450	my ($mod, $sym) = @_;
3451	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3452	$self->update_binding_widgets;
3453	$self->commit if $commit;
3454	});
3455	}
3456
3457	# $mod and $sym are the modifiers and key symbol
3458	# $cmds is a array ref of strings (the commands)
3459	# $cb is the callback that is executed on OK
3460	# $ccb is the callback that is executed on CANCEL and
3461	# when the binding was unsuccessful on OK
3462	sub set_binding {
3463	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3464
3465	$self->clear_command_list;
3466	$self->{recording} = 0;
3467	$self->{rec_btn}->set_text ("start recording");
3468
3469	$self->{binding} = [$mod, $sym];
3470	$self->{commands} = $cmds;
3471
3472	$self->{binding_change} = $cb;
3473	$self->{binding_cancel} = $ccb;
3474
3475	$self->update_binding_widgets;
3476	}
3477
3478	# this is a shortcut method that asks for a binding
3479	# and then just binds it.
3480	sub do_quick_binding {
3481	my ($self, $cmds) = @_;
3482	$self->set_binding (undef, undef, $cmds, sub {
3483	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3484	});
3485	$self->ask_for_bind (1);
3486	}
3487
3488	sub update_binding_widgets {
3489	my ($self) = @_;
3490	my ($mod, $sym, $cmds) = $self->get_binding;
3491	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3492	$self->set_command_list ($cmds);
3493	}
3494
3495	sub get_binding {
3496	my ($self) = @_;
3497	return (
3498	$self->{binding}->[0],
3499	$self->{binding}->[1],
3500	[ grep { defined $_ } @{$self->{commands}} ]
3501	);
3502	}
3503
3504	sub clear_command_list {
3505	my ($self) = @_;
3506	$self->{cmdbox}->clear ();
3507	}
3508
3509	sub set_command_list {
3510	my ($self, $cmds) = @_;
3511
3512	$self->{cmdbox}->clear ();
3513	$self->{commands} = $cmds;
3514
3515	my $idx = 0;
3516
3517	for (@$cmds) {
3518	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3519
3520	my $i = $idx;
3521	$hb->add (new CFClient::UI::Label text => $_);
3522	$hb->add (new CFClient::UI::Button
3523	text => "delete",
3524	tooltip => "Deletes the action from the record",
3525	on_activate => sub {
3526	$self->{cmdbox}->remove ($hb);
3527	$cmds->[$i] = undef;
3528	});
3529
3530
3531	$idx++
3532	}	3475	}
3533	}	3476	}
3534		3477
3535	#############################################################################	3478	#############################################################################
3536		3479
…		…
3546	commands => [],	3489	commands => [],
3547	@_,	3490	@_,
3548	)	3491	)
3549	}	3492	}
3550		3493
		3494	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3495
		3496	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3497	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3498	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3499	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3551	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3500	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");	3501	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3553	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3502	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3554	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");	3503	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3555	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3504	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556	"<b>Damage</b>. The amount of damage the spell deals when it hits.");	3505	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3557		3506
3558	sub rebuild_spell_list {	3507	sub rebuild_spell_list {
3559	my ($self) = @_;	3508	my ($self) = @_;
3560		3509
3561	$CFClient::UI::ROOT->on_refresh ($self => sub {	3510	$CFClient::UI::ROOT->on_refresh ($self => sub {
3562	$self->clear;	3511	$self->clear;
3563		3512
		3513	return unless $::CONN;
		3514
3564	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");	3515	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3516	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3565	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3517	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3566	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3518	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3567	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3519	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3568		3520
3569	my $row = 0;	3521	my $row = 0;
3570		3522
3571	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3523	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3572	my $spell = $self->{spell}{$_};	3524	my $spell = $self->{spell}{$_};
3573		3525
3574	$row++;	3526	$row++;
		3527
		3528	my $spell_cb = sub {
		3529	my ($widget, $ev) = @_;
		3530
		3531	if ($ev->{button} == 1) {
		3532	$::CONN->user_send ("cast $spell->{name}");
		3533	} elsif ($ev->{button} == 2) {
		3534	$::CONN->user_send ("invoke $spell->{name}");
		3535	} elsif ($ev->{button} == 3) {
		3536	(new CFClient::UI::Menu
		3537	items => [
		3538	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3539	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3540	],
		3541	)->popup ($ev);
		3542	} else {
		3543	return 0;
		3544	}
		3545
		3546	1
		3547	};
		3548
		3549	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3550
		3551	#TODO: add path info to tooltip
		3552	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3575		3553
3576	$self->add (0, $row, new CFClient::UI::Face	3554	$self->add (0, $row, new CFClient::UI::Face
3577	face => $spell->{face},	3555	face => $spell->{face},
3578	can_hover => 1,	3556	can_hover => 1,
3579	can_events => 1,	3557	can_events => 1,
3580	tooltip => $spell->{message},	3558	tooltip => $tooltip,
		3559	on_button_down => $spell_cb,
3581	);	3560	);
3582		3561
3583	$self->add (1, $row, new CFClient::UI::Label	3562	$self->add (1, $row, new CFClient::UI::Label
3584	expand => 1,	3563	expand => 1,
3585	text => $spell->{name},	3564	text => $spell->{name},
3586	can_hover => 1,	3565	can_hover => 1,
3587	can_events => 1,	3566	can_events => 1,
3588	tooltip => $spell->{message},	3567	tooltip => $tooltip,
		3568	on_button_down => $spell_cb,
3589	);	3569	);
3590		3570
		3571	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3591	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3572	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3592	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3573	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3593	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3574	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3594
3595	# TODO: should be done via popup
3596	$self->add (5, $row, new CFClient::UI::Button
3597	text => "bind",
3598	tooltip => "bind spell readying (cast command) to key",
3599	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3600	);
3601	}	3575	}
3602	});	3576	});
3603	}	3577	}
3604		3578
3605	sub add_spell {	3579	sub add_spell {
…		…
3611		3585
3612	sub remove_spell {	3586	sub remove_spell {
3613	my ($self, $spell) = @_;	3587	my ($self, $spell) = @_;
3614		3588
3615	delete $self->{spell}->{$spell->{name}};	3589	delete $self->{spell}->{$spell->{name}};
		3590	$self->rebuild_spell_list;
		3591	}
		3592
		3593	sub clear_spells {
		3594	my ($self) = @_;
		3595
		3596	$self->{spell} = {};
3616	$self->rebuild_spell_list;	3597	$self->rebuild_spell_list;
3617	}	3598	}
3618		3599
3619	#############################################################################	3600	#############################################################################
3620		3601
…		…
3657	$coord = $max - $size if $coord > $max - $size;	3638	$coord = $max - $size if $coord > $max - $size;
3658		3639
3659	int $coord + 0.5	3640	int $coord + 0.5
3660	}	3641	}
3661		3642
3662	sub size_allocate {	3643	sub invoke_size_allocate {
3663	my ($self, $w, $h) = @_;	3644	my ($self, $w, $h) = @_;
3664		3645
3665	for my $child ($self->children) {	3646	for my $child ($self->children) {
3666	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3647	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3667		3648
…		…
3671	$X = _to_pixel $X, $W, $self->{w};	3652	$X = _to_pixel $X, $W, $self->{w};
3672	$Y = _to_pixel $Y, $H, $self->{h};	3653	$Y = _to_pixel $Y, $H, $self->{h};
3673		3654
3674	$child->configure ($X, $Y, $W, $H);	3655	$child->configure ($X, $Y, $W, $H);
3675	}	3656	}
		3657
		3658	1
3676	}	3659	}
3677		3660
3678	sub coord2local {	3661	sub coord2local {
3679	my ($self, $x, $y) = @_;	3662	my ($self, $x, $y) = @_;
3680		3663

Diff Legend

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