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.294 by root, Tue Jun 6 03:19:26 2006 UTC vs.
Revision 1.315 by root, Wed Jun 28 21:17:01 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
…		…
1713		1750
1714	$text =~ s/./*/g if $self->{hidden};	1751	$text =~ s/./*/g if $self->{hidden};
1715	$self->{layout}->set_text ("$text ");	1752	$self->{layout}->set_text ("$text ");
1716	delete $self->{size_req};	1753	delete $self->{size_req};
1717		1754
1718	$self->_emit (changed => $self->{text});	1755	$self->emit (changed => $self->{text});
1719		1756
1720	$self->realloc;	1757	$self->realloc;
1721	$self->update;	1758	$self->update;
1722	}	1759	}
1723		1760
…		…
1738	my ($w, $h) = $self->SUPER::size_request;	1775	my ($w, $h) = $self->SUPER::size_request;
1739		1776
1740	($w + 1, $h) # add 1 for cursor	1777	($w + 1, $h) # add 1 for cursor
1741	}	1778	}
1742		1779
1743	sub key_down {	1780	sub invoke_key_down {
1744	my ($self, $ev) = @_;	1781	my ($self, $ev) = @_;
1745		1782
1746	my $mod = $ev->{mod};	1783	my $mod = $ev->{mod};
1747	my $sym = $ev->{sym};	1784	my $sym = $ev->{sym};
1748	my $uni = $ev->{unicode};	1785	my $uni = $ev->{unicode};
…		…
1760	} elsif ($sym == CFClient::SDLK_HOME) {	1797	} elsif ($sym == CFClient::SDLK_HOME) {
1761	$self->{cursor} = 0;	1798	$self->{cursor} = 0;
1762	} elsif ($sym == CFClient::SDLK_END) {	1799	} elsif ($sym == CFClient::SDLK_END) {
1763	$self->{cursor} = length $text;	1800	$self->{cursor} = length $text;
1764	} elsif ($uni == 27) {	1801	} elsif ($uni == 27) {
1765	$self->_emit ('escape');	1802	$self->emit ('escape');
1766	} elsif ($uni) {	1803	} elsif ($uni) {
1767	substr $text, $self->{cursor}++, 0, chr $uni;	1804	substr $text, $self->{cursor}++, 0, chr $uni;
1768	} else {	1805	} else {
1769	return 0;	1806	return 0;
1770	}	1807	}
…		…
1774	$self->realloc;	1811	$self->realloc;
1775		1812
1776	1	1813	1
1777	}	1814	}
1778		1815
1779	sub focus_in {	1816	sub invoke_focus_in {
1780	my ($self) = @_;	1817	my ($self) = @_;
1781		1818
1782	$self->{last_activity} = $::NOW;	1819	$self->{last_activity} = $::NOW;
1783		1820
1784	$self->SUPER::focus_in;	1821	$self->SUPER::invoke_focus_in
1785	}	1822	}
1786		1823
1787	sub button_down {	1824	sub invoke_button_down {
1788	my ($self, $ev, $x, $y) = @_;	1825	my ($self, $ev, $x, $y) = @_;
1789		1826
1790	$self->SUPER::button_down ($ev, $x, $y);	1827	$self->SUPER::invoke_button_down ($ev, $x, $y);
1791		1828
1792	my $idx = $self->{layout}->xy_to_index ($x, $y);	1829	my $idx = $self->{layout}->xy_to_index ($x, $y);
1793		1830
1794	# byte-index to char-index	1831	# byte-index to char-index
1795	my $text = $self->{text};	1832	my $text = $self->{text};
…		…
1800	$self->update;	1837	$self->update;
1801		1838
1802	1	1839	1
1803	}	1840	}
1804		1841
1805	sub mouse_motion {	1842	sub invoke_mouse_motion {
1806	my ($self, $ev, $x, $y) = @_;	1843	my ($self, $ev, $x, $y) = @_;
1807	# 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#
1808		1845
1809	0	1846	1
1810	}	1847	}
1811		1848
1812	sub _draw {	1849	sub _draw {
1813	my ($self) = @_;	1850	my ($self) = @_;
1814		1851
…		…
1855		1892
1856	our @ISA = CFClient::UI::EntryBase::;	1893	our @ISA = CFClient::UI::EntryBase::;
1857		1894
1858	use CFClient::OpenGL;	1895	use CFClient::OpenGL;
1859		1896
1860	sub key_down {	1897	sub invoke_key_down {
1861	my ($self, $ev) = @_;	1898	my ($self, $ev) = @_;
1862		1899
1863	my $sym = $ev->{sym};	1900	my $sym = $ev->{sym};
1864		1901
1865	if ($sym == 13) {	1902	if ($sym == 13) {
1866	unshift @{$self->{history}},	1903	unshift @{$self->{history}},
1867	my $txt = $self->get_text;	1904	my $txt = $self->get_text;
		1905
1868	$self->{history_pointer} = -1;	1906	$self->{history_pointer} = -1;
1869	$self->{history_saveback} = '';	1907	$self->{history_saveback} = '';
1870	$self->_emit (activate => $txt);	1908	$self->emit (activate => $txt);
1871	$self->update;	1909	$self->update;
1872		1910
1873	} elsif ($sym == CFClient::SDLK_UP) {	1911	} elsif ($sym == CFClient::SDLK_UP) {
1874	if ($self->{history_pointer} < 0) {	1912	if ($self->{history_pointer} < 0) {
1875	$self->{history_saveback} = $self->get_text;	1913	$self->{history_saveback} = $self->get_text;
…		…
1891	} else {	1929	} else {
1892	$self->set_text ($self->{history_saveback});	1930	$self->set_text ($self->{history_saveback});
1893	}	1931	}
1894		1932
1895	} else {	1933	} else {
1896	return $self->SUPER::key_down ($ev)	1934	return $self->SUPER::invoke_key_down ($ev)
1897	}	1935	}
1898		1936
1899	1	1937	1
1900	}	1938	}
1901		1939
…		…
1925	can_events => 1,	1963	can_events => 1,
1926	@_	1964	@_
1927	)	1965	)
1928	}	1966	}
1929		1967
1930	sub activate { }
1931
1932	sub button_up {	1968	sub invoke_button_up {
1933	my ($self, $ev, $x, $y) = @_;	1969	my ($self, $ev, $x, $y) = @_;
1934		1970
1935	$self->emit ("activate")	1971	$self->emit ("activate")
1936	if $x >= 0 && $x < $self->{w}	1972	if $x >= 0 && $x < $self->{w}
1937	&& $y >= 0 && $y < $self->{h};	1973	&& $y >= 0 && $y < $self->{h};
…		…
1951	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1987	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1952		1988
1953	glDisable GL_TEXTURE_2D;	1989	glDisable GL_TEXTURE_2D;
1954		1990
1955	$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
1956	}	2028	}
1957		2029
1958	#############################################################################	2030	#############################################################################
1959		2031
1960	package CFClient::UI::CheckBox;	2032	package CFClient::UI::CheckBox;
…		…
1987	my ($self) = @_;	2059	my ($self) = @_;
1988		2060
1989	(6) x 2	2061	(6) x 2
1990	}	2062	}
1991		2063
1992	sub button_down {	2064	sub invoke_button_down {
1993	my ($self, $ev, $x, $y) = @_;	2065	my ($self, $ev, $x, $y) = @_;
1994		2066
1995	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997	$self->{state} = !$self->{state};	2069	$self->{state} = !$self->{state};
1998	$self->_emit (changed => $self->{state});	2070	$self->emit (changed => $self->{state});
1999	} else {	2071	} else {
2000	return 0	2072	return 0
2001	}	2073	}
2002		2074
2003	1	2075	1
…		…
2028	package CFClient::UI::Image;	2100	package CFClient::UI::Image;
2029		2101
2030	our @ISA = CFClient::UI::Base::;	2102	our @ISA = CFClient::UI::Base::;
2031		2103
2032	use CFClient::OpenGL;	2104	use CFClient::OpenGL;
2033	use Carp qw/confess/;
2034		2105
2035	our %loaded_images;	2106	our %texture_cache;
2036		2107
2037	sub new {	2108	sub new {
2038	my $class = shift;	2109	my $class = shift;
2039		2110
2040	my $self = $class->SUPER::new (can_events => 0, @_);	2111	my $self = $class->SUPER::new (
		2112	can_events => 0,
		2113	@_,
		2114	);
2041		2115
2042	$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";
2043		2118
2044	$loaded_images{$self->{image}} ||=	2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2045	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;
2046		2121
2047	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2048		2123
2049	Scalar::Util::weaken $loaded_images{$self->{image}};	2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051	$self->{aspect} = $tex->{w} / $tex->{h};
2052		2125
2053	$self	2126	$self
2054	}	2127	}
2055		2128
2056	sub size_request {	2129	sub size_request {
2057	my ($self) = @_;	2130	my ($self) = @_;
2058		2131
2059	($self->{tex}->{w}, $self->{tex}->{h})	2132	($self->{tex}{w}, $self->{tex}{h})
2060	}	2133	}
2061		2134
2062	sub _draw {	2135	sub _draw {
2063	my ($self) = @_;	2136	my ($self) = @_;
2064		2137
…		…
2300	$self->update;	2373	$self->update;
2301		2374
2302	$self	2375	$self
2303	}	2376	}
2304		2377
2305	sub changed { }
2306
2307	sub set_range {	2378	sub set_range {
2308	my ($self, $range) = @_;	2379	my ($self, $range) = @_;
2309		2380
2310	($range, $self->{range}) = ($self->{range}, $range);	2381	($range, $self->{range}) = ($self->{range}, $range);
2311		2382
2312	$self->update
2313	if "@$range" ne "@{$self->{range}}";	2383	if ("@$range" ne "@{$self->{range}}") {
		2384	$self->update;
		2385	$self->set_value ($self->{range}[0]);
		2386	}
2314	}	2387	}
2315		2388
2316	sub set_value {	2389	sub set_value {
2317	my ($self, $value) = @_;	2390	my ($self, $value) = @_;
2318		2391
…		…
2329	if $unit;	2402	if $unit;
2330		2403
2331	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2404	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2332		2405
2333	if ($value != $old_value) {	2406	if ($value != $old_value) {
2334	$self->_emit (changed => $value);	2407	$self->emit (changed => $value);
2335	$self->update;	2408	$self->update;
2336	}	2409	}
2337	}	2410	}
2338		2411
2339	sub size_request {	2412	sub size_request {
2340	my ($self) = @_;	2413	my ($self) = @_;
2341		2414
2342	($self->{req_w}, $self->{req_h})	2415	($self->{req_w}, $self->{req_h})
2343	}	2416	}
2344		2417
2345	sub button_down {	2418	sub invoke_button_down {
2346	my ($self, $ev, $x, $y) = @_;	2419	my ($self, $ev, $x, $y) = @_;
2347		2420
2348	$self->SUPER::button_down ($ev, $x, $y);	2421	$self->SUPER::invoke_button_down ($ev, $x, $y);
2349		2422
2350	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2423	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2351		2424
2352	$self->mouse_motion ($ev, $x, $y)	2425	$self->invoke_mouse_motion ($ev, $x, $y)
2353	}	2426	}
2354		2427
2355	sub mouse_motion {	2428	sub invoke_mouse_motion {
2356	my ($self, $ev, $x, $y) = @_;	2429	my ($self, $ev, $x, $y) = @_;
2357		2430
2358	if ($GRAB == $self) {	2431	if ($GRAB == $self) {
2359	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2432	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2360		2433
…		…
2465	sub set_range { shift->{slider}->set_range (@_) }	2538	sub set_range { shift->{slider}->set_range (@_) }
2466	sub set_value { shift->{slider}->set_value (@_) }	2539	sub set_value { shift->{slider}->set_value (@_) }
2467		2540
2468	#############################################################################	2541	#############################################################################
2469		2542
2470	package CFClient::UI::TextView;	2543	package CFClient::UI::TextScroller;
2471		2544
2472	our @ISA = CFClient::UI::HBox::;	2545	our @ISA = CFClient::UI::HBox::;
2473		2546
2474	use CFClient::OpenGL;	2547	use CFClient::OpenGL;
2475		2548
…		…
2502		2575
2503	$self->{fontsize} = $fontsize;	2576	$self->{fontsize} = $fontsize;
2504	$self->reflow;	2577	$self->reflow;
2505	}	2578	}
2506		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
2507	sub size_allocate {	2589	sub invoke_size_allocate {
2508	my ($self, $w, $h) = @_;	2590	my ($self, $w, $h) = @_;
2509		2591
2510	$self->SUPER::size_allocate ($w, $h);	2592	my ($empty, $slider, @other) = @{ $self->{children} };
		2593	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2511		2594
2512	$self->{layout}->set_font ($self->{font}) if $self->{font};	2595	$self->{layout}->set_font ($self->{font}) if $self->{font};
2513	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2596	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2514	$self->{layout}->set_width ($self->{children}[0]{w});	2597	$self->{layout}->set_width ($empty->{w});
2515	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2598	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2516		2599
2517	$self->reflow;	2600	$self->reflow;
2518	}
2519		2601
2520	sub text_size {	2602	local $self->{children} = [$empty, $slider];
2521	my ($self, $text, $indent) = @_;	2603	$self->SUPER::invoke_size_allocate ($w, $h)
		2604	}
		2605
		2606	sub get_layout {
		2607	my ($self, $para) = @_;
2522		2608
2523	my $layout = $self->{layout};	2609	my $layout = $self->{layout};
2524		2610
		2611	$layout->set_font ($self->{font}) if $self->{font};
		2612	$layout->set_foreground (@{$para->{fg}});
2525	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2613	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2526	$layout->set_width ($self->{children}[0]{w} - $indent);	2614	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2527	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2615	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2528	$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}}
2529		2622	);
		2623
2530	$layout->size	2624	$layout
2531	}	2625	}
2532		2626
2533	sub reflow {	2627	sub reflow {
2534	my ($self) = @_;	2628	my ($self) = @_;
2535		2629
…		…
2544	$self->{children}[1]->set_value ($offset);	2638	$self->{children}[1]->set_value ($offset);
2545	}	2639	}
2546		2640
2547	sub clear {	2641	sub clear {
2548	my ($self) = @_;	2642	my ($self) = @_;
		2643
		2644	my (undef, undef, @other) = @{ $self->{children} };
		2645	$self->remove ($_) for @other;
2549		2646
2550	$self->{par} = [];	2647	$self->{par} = [];
2551	$self->{height} = 0;	2648	$self->{height} = 0;
2552	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2649	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2553	}	2650	}
2554		2651
2555	sub add_paragraph {	2652	sub add_paragraph {
2556	my ($self, $color, $text, $indent) = @_;	2653	my ($self, $color, $para, $indent) = @_;
2557		2654
2558	for my $line (split /\n/, $text) {	2655	my ($text, @w) = ref $para ? @$para : $para;
2559	my ($w, $h) = $self->text_size ($line);	2656
2560	$self->{height} += $h;	2657	$para = {
2561	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,
2562	}	2664	};
2563		2665
2564	$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;
2565	}	2678	}
2566		2679
2567	sub update {	2680	sub update {
2568	my ($self) = @_;	2681	my ($self) = @_;
2569		2682
…		…
2571		2684
2572	return unless $self->{h} > 0;	2685	return unless $self->{h} > 0;
2573		2686
2574	delete $self->{texture};	2687	delete $self->{texture};
2575		2688
2576	$ROOT->on_post_alloc ($self, sub {	2689	$ROOT->on_post_alloc ($self => sub {
2577	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2690	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2578		2691
2579	if (delete $self->{need_reflow}) {	2692	if (delete $self->{need_reflow}) {
2580	my $height = 0;	2693	my $height = 0;
2581		2694
2582	my $layout = $self->{layout};
2583
2584	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2585
2586	for (@{$self->{par}}) {	2695	for my $para (@{$self->{par}}) {
2587	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2696	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2588	$layout->set_width ($W - $_->[3]);	2697	my $layout = $self->get_layout ($para);
2589	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590	$layout->set_markup ($_->[4]);
2591	my ($w, $h) = $layout->size;	2698	my ($w, $h) = $layout->size;
2592	$_->[0] = $w + $_->[3];	2699
2593	$_->[1] = $h;	2700	$para->{w} = $w + $para->{indent};
		2701	$para->{h} = $h;
		2702	$para->{wrapped} = $layout->has_wrapped;
2594	}	2703	}
2595		2704
2596	$height += $_->[1];	2705	$height += $para->{h};
2597	}	2706	}
2598		2707
2599	$self->{height} = $height;	2708	$self->{height} = $height;
2600		2709
2601	$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]);
2602		2711
2603	delete $self->{texture};	2712	delete $self->{texture};
		2713	}
		2714
		2715	if (delete $self->{scroll_to_bottom}) {
		2716	$self->{children}[1]->set_value (1e10);
2604	}	2717	}
2605		2718
2606	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2719	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2607	glClearColor 0, 0, 0, 0;	2720	glClearColor 0, 0, 0, 0;
2608	glClear GL_COLOR_BUFFER_BIT;	2721	glClear GL_COLOR_BUFFER_BIT;
…		…
2612	my $y0 = $top;	2725	my $y0 = $top;
2613	my $y1 = $top + $H;	2726	my $y1 = $top + $H;
2614		2727
2615	my $y = 0;	2728	my $y = 0;
2616		2729
2617	my $layout = $self->{layout};
2618
2619	$layout->set_font ($self->{font}) if $self->{font};
2620
2621	glEnable GL_BLEND;	2730	glEnable GL_BLEND;
2622	#TODO# not correct in windows where rgba is forced off	2731	#TODO# not correct in windows where rgba is forced off
2623	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2732	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2624		2733
2625	for my $par (@{$self->{par}}) {	2734	for my $para (@{$self->{par}}) {
2626	my $h = $par->[1];	2735	my $h = $para->{h};
2627		2736
2628	if ($y0 < $y + $h && $y < $y1) {	2737	if ($y0 < $y + $h && $y < $y1) {
2629	$layout->set_foreground (@{ $par->[2] });	2738
2630	$layout->set_width ($W - $par->[3]);	2739	my $layout = $self->get_layout ($para);
2631	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2632	$layout->set_markup ($par->[4]);
2633		2740
2634	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2741	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2635		2742
2636	glRasterPos $par->[3], $y - $y0;	2743	glRasterPos $para->{indent}, $y - $y0;
2637	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	}
2638	}	2761	}
2639		2762
2640	$y += $h;	2763	$y += $h;
2641	}	2764	}
2642		2765
2643	glDisable GL_BLEND;	2766	glDisable GL_BLEND;
2644	};	2767	};
2645	});	2768	});
		2769	}
		2770
		2771	sub reconfigure {
		2772	my ($self) = @_;
		2773
		2774	$self->SUPER::reconfigure;
		2775
		2776	$_->{w} = 1e10 for @{ $self->{par} };
		2777	$self->reflow;
2646	}	2778	}
2647		2779
2648	sub _draw {	2780	sub _draw {
2649	my ($self) = @_;	2781	my ($self) = @_;
2650		2782
…		…
2653	glColor 0, 0, 0, 1;	2785	glColor 0, 0, 0, 1;
2654	$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});
2655	glDisable GL_TEXTURE_2D;	2787	glDisable GL_TEXTURE_2D;
2656		2788
2657	$self->{children}[1]->draw;	2789	$self->{children}[1]->draw;
2658
2659	}	2790	}
2660		2791
2661	#############################################################################	2792	#############################################################################
2662		2793
2663	package CFClient::UI::Animator;	2794	package CFClient::UI::Animator;
…		…
2750	$tooltip .= "\n\n" . (ref $widget) . "\n"	2881	$tooltip .= "\n\n" . (ref $widget) . "\n"
2751	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2882	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2752	. "req $widget->{req_w} $widget->{req_h}\n"	2883	. "req $widget->{req_w} $widget->{req_h}\n"
2753	. "visible $widget->{visible}";	2884	. "visible $widget->{visible}";
2754	}	2885	}
		2886
		2887	$tooltip =~ s/^\n+//;
		2888	$tooltip =~ s/\n+$//;
2755		2889
2756	$self->add (new CFClient::UI::Label	2890	$self->add (new CFClient::UI::Label
2757	markup => $tooltip,	2891	markup => $tooltip,
2758	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2892	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2759	fontsize => 0.8,	2893	fontsize => 0.8,
…		…
2769	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2903	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2770		2904
2771	($w + 4, $h + 4)	2905	($w + 4, $h + 4)
2772	}	2906	}
2773		2907
2774	sub size_allocate {	2908	sub invoke_size_allocate {
2775	my ($self, $w, $h) = @_;	2909	my ($self, $w, $h) = @_;
2776		2910
2777	$self->SUPER::size_allocate ($w - 4, $h - 4);	2911	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2778	}	2912	}
2779		2913
2780	sub visibility_change {	2914	sub invoke_visibility_change {
2781	my ($self, $visible) = @_;	2915	my ($self, $visible) = @_;
2782		2916
2783	return unless $visible;	2917	return unless $visible;
2784		2918
2785	$self->{root}->on_post_alloc ("move_$self" => sub {	2919	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2787	or return;	2921	or return;
2788		2922
2789	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2923	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2790		2924
2791	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2925	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2792	if $x + $self->{w} > $::WIDTH;	2926	if $x + $self->{w} > $self->{root}{w};
2793		2927
2794	$self->move_abs ($x, $y);	2928	$self->move_abs ($x, $y);
2795	});	2929	});
2796	}	2930	}
2797		2931
…		…
2892	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3026	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2893	glDisable GL_TEXTURE_2D;	3027	glDisable GL_TEXTURE_2D;
2894	}	3028	}
2895	}	3029	}
2896		3030
2897	sub DESTROY {	3031	sub destroy {
2898	my ($self) = @_;	3032	my ($self) = @_;
2899		3033
2900	$self->{timer}->cancel	3034	$self->{timer}->cancel
2901	if $self->{timer};	3035	if $self->{timer};
2902		3036
2903	$self->SUPER::DESTROY;	3037	$self->SUPER::destroy;
2904	}	3038	}
2905		3039
2906	#############################################################################	3040	#############################################################################
2907		3041
2908	package CFClient::UI::Buttonbar;	3042	package CFClient::UI::Buttonbar;
…		…
2936	# handle various types of items, only text for now	3070	# handle various types of items, only text for now
2937	if (!ref $widget) {	3071	if (!ref $widget) {
2938	$widget = new CFClient::UI::Label	3072	$widget = new CFClient::UI::Label
2939	can_hover => 1,	3073	can_hover => 1,
2940	can_events => 1,	3074	can_events => 1,
2941	text => $widget,	3075	markup => $widget,
2942	tooltip => $tooltip	3076	tooltip => $tooltip
2943	}	3077	}
2944		3078
2945	$self->{item}{$widget} = $item;	3079	$self->{item}{$widget} = $item;
2946		3080
…		…
2952		3086
2953	# 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)
2954	sub popup {	3088	sub popup {
2955	my ($self, $ev) = @_;	3089	my ($self, $ev) = @_;
2956		3090
2957	$self->_emit ("popdown");	3091	$self->emit ("popdown");
2958		3092
2959	# maybe save $GRAB? must be careful about events...	3093	# maybe save $GRAB? must be careful about events...
2960	$GRAB = $self;	3094	$GRAB = $self;
2961	$self->{button} = $ev->{button};	3095	$self->{button} = $ev->{button};
2962		3096
2963	$self->show;	3097	$self->show;
2964	$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);
2965	}	3099	}
2966		3100
2967	sub mouse_motion {	3101	sub invoke_mouse_motion {
2968	my ($self, $ev, $x, $y) = @_;	3102	my ($self, $ev, $x, $y) = @_;
2969		3103
2970	# TODO: should use vbox->find_widget or so	3104	# TODO: should use vbox->find_widget or so
2971	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3105	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2972	$self->{hover} = $self->{item}{$HOVER};	3106	$self->{hover} = $self->{item}{$HOVER};
2973		3107
2974	0	3108	0
2975	}	3109	}
2976		3110
2977	sub button_up {	3111	sub invoke_button_up {
2978	my ($self, $ev, $x, $y) = @_;	3112	my ($self, $ev, $x, $y) = @_;
2979		3113
2980	if ($ev->{button} == $self->{button}) {	3114	if ($ev->{button} == $self->{button}) {
2981	undef $GRAB;	3115	undef $GRAB;
2982	$self->hide;	3116	$self->hide;
2983		3117
2984	$self->_emit ("popdown");	3118	$self->emit ("popdown");
2985	$self->{hover}[1]->() if $self->{hover};	3119	$self->{hover}[1]->() if $self->{hover};
2986	} else {	3120	} else {
2987	return 0	3121	return 0
2988	}	3122	}
2989		3123
…		…
3026	: $self->{children}[$page_or_widget];	3160	: $self->{children}[$page_or_widget];
3027		3161
3028	$self->{current} = $widget;	3162	$self->{current} = $widget;
3029	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3163	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3030		3164
3031	$self->_emit (page_changed => $self->{current});	3165	$self->emit (page_changed => $self->{current});
3032		3166
3033	$self->realloc;	3167	$self->realloc;
3034	}	3168	}
3035		3169
3036	sub visible_children {	3170	sub visible_children {
…		…
3041	my ($self) = @_;	3175	my ($self) = @_;
3042		3176
3043	$self->{current}->size_request	3177	$self->{current}->size_request
3044	}	3178	}
3045		3179
3046	sub size_allocate {	3180	sub invoke_size_allocate {
3047	my ($self, $w, $h) = @_;	3181	my ($self, $w, $h) = @_;
3048		3182
3049	$self->{current}->configure (0, 0, $w, $h);	3183	$self->{current}->configure (0, 0, $w, $h);
		3184
		3185	1
3050	}	3186	}
3051		3187
3052	sub _draw {	3188	sub _draw {
3053	my ($self) = @_;	3189	my ($self) = @_;
3054		3190
…		…
3093		3229
3094	sub set_current_page {	3230	sub set_current_page {
3095	my ($self, $page) = @_;	3231	my ($self, $page) = @_;
3096		3232
3097	$self->{multiplexer}->set_current_page ($page);	3233	$self->{multiplexer}->set_current_page ($page);
3098	$self->_emit (page_changed => $self->{multiplexer}{current});	3234	$self->emit (page_changed => $self->{multiplexer}{current});
3099	}	3235	}
3100		3236
3101	#############################################################################	3237	#############################################################################
3102		3238
3103	package CFClient::UI::Combobox;	3239	package CFClient::UI::Combobox;
…		…
3108		3244
3109	sub new {	3245	sub new {
3110	my $class = shift;	3246	my $class = shift;
3111		3247
3112	my $self = $class->SUPER::new (	3248	my $self = $class->SUPER::new (
3113	options => [], # [title, value, tooltip], ...	3249	options => [], # [value, title, longdesc], ...
3114	value => undef,	3250	value => undef,
3115	@_,	3251	@_,
3116	);	3252	);
3117		3253
3118	$self->_set_value ($self->{value});	3254	$self->_set_value ($self->{value});
3119		3255
3120	$self	3256	$self
3121	}	3257	}
3122		3258
3123	sub button_down {	3259	sub invoke_button_down {
3124	my ($self, $ev) = @_;	3260	my ($self, $ev) = @_;
3125		3261
3126	my @menu_items;	3262	my @menu_items;
3127		3263
3128	for (@{ $self->{options} }) {	3264	for (@{ $self->{options} }) {
3129	my ($title, $value, $tooltip) = @$_;	3265	my ($value, $title, $tooltip) = @$_;
3130		3266
3131	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];	3267	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3132	}	3268	}
3133		3269
3134	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3270	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3135	}	3271	}
3136		3272
3137	sub _set_value {	3273	sub _set_value {
3138	my ($self, $value) = @_;	3274	my ($self, $value) = @_;
3139		3275
3140	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }	3276	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3141	or return;	3277	or return;
3142		3278
3143	$self->{value} = $item->[1];	3279	$self->{value} = $item->[0];
3144	$self->set_markup ("$item->[0] ⇓");	3280	$self->set_markup ("$item->[1] ⇓");
3145	$self->set_tooltip ($item->[2]);	3281	$self->set_tooltip ($item->[2]);
3146	}	3282	}
3147		3283
3148	sub set_value {	3284	sub set_value {
3149	my ($self, $value) = @_;	3285	my ($self, $value) = @_;
3150		3286
3151	return unless $self->{value} ne $value;	3287	return unless $self->{value} ne $value;
3152		3288
3153	$self->_set_value ($value);	3289	$self->_set_value ($value);
3154	$self->_emit (changed => $value);	3290	$self->emit (changed => $value);
3155	}	3291	}
3156		3292
3157	#############################################################################	3293	#############################################################################
3158		3294
3159	package CFClient::UI::Statusbox;	3295	package CFClient::UI::Statusbox;
…		…
3258	$item->{count}++;	3394	$item->{count}++;
3259	} else {	3395	} else {
3260	$item->{count} = 1;	3396	$item->{count} = 1;
3261	$item->{text} = $item->{tooltip} = $text;	3397	$item->{text} = $item->{tooltip} = $text;
3262	}	3398	}
3263	$item->{id} = ++$self->{id};	3399	$item->{id} += 0.2;#d#
3264	$item->{timeout} = $timeout;	3400	$item->{timeout} = $timeout;
3265	delete $item->{label};	3401	delete $item->{label};
3266	} else {	3402	} else {
3267	$self->{item}{$group} = {	3403	$self->{item}{$group} = {
3268	id => ++$self->{id},	3404	id => ++$self->{id},
…		…
3274	count => 1,	3410	count => 1,
3275	%arg,	3411	%arg,
3276	};	3412	};
3277	}	3413	}
3278		3414
		3415	$ROOT->on_refresh (reorder => sub {
3279	$self->reorder;	3416	$self->reorder;
		3417	});
3280	}	3418	}
3281		3419
3282	sub reconfigure {	3420	sub reconfigure {
3283	my ($self) = @_;	3421	my ($self) = @_;
3284		3422
…		…
3287		3425
3288	$self->reorder;	3426	$self->reorder;
3289	$self->SUPER::reconfigure;	3427	$self->SUPER::reconfigure;
3290	}	3428	}
3291		3429
3292	sub DESTROY {	3430	sub destroy {
3293	my ($self) = @_;	3431	my ($self) = @_;
3294		3432
3295	$self->{timer}->cancel;	3433	$self->{timer}->cancel;
3296		3434
3297	$self->SUPER::DESTROY;	3435	$self->SUPER::destroy;
3298	}	3436	}
3299		3437
3300	#############################################################################	3438	#############################################################################
3301		3439
3302	package CFClient::UI::Inventory;	3440	package CFClient::UI::Inventory;
…		…
3321	return unless $items;	3459	return unless $items;
3322		3460
3323	my @items = sort {	3461	my @items = sort {
3324	($a->{type} <=> $b->{type})	3462	($a->{type} <=> $b->{type})
3325	or ($a->{name} cmp $b->{name})	3463	or ($a->{name} cmp $b->{name})
3326	} @$items;	3464	} values %$items;
3327		3465
3328	$self->{real_items} = \@items;	3466	$self->{real_items} = \@items;
3329		3467
3330	my $row = 0;	3468	my $row = 0;
3331	for my $item (@items) {	3469	for my $item (@items) {
…		…
3334	$self->{child}->add (0, $row, $item->{face_widget});	3472	$self->{child}->add (0, $row, $item->{face_widget});
3335	$self->{child}->add (1, $row, $item->{desc_widget});	3473	$self->{child}->add (1, $row, $item->{desc_widget});
3336	$self->{child}->add (2, $row, $item->{weight_widget});	3474	$self->{child}->add (2, $row, $item->{weight_widget});
3337		3475
3338	$row++;	3476	$row++;
3339	}
3340	}
3341
3342	#############################################################################
3343
3344	package CFClient::UI::BindEditor;
3345
3346	our @ISA = CFClient::UI::FancyFrame::;
3347
3348	sub new {
3349	my $class = shift;
3350
3351	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3352
3353	$self->add (my $vb = new CFClient::UI::VBox);
3354
3355
3356	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3357	text => "start recording",
3358	tooltip => "Start/Stops recording of actions."
3359	."All subsequent actions after the recording started will be captured."
3360	."The actions are displayed after the record was stopped."
3361	."To bind the action you have to click on the 'Bind' button",
3362	on_activate => sub {
3363	unless ($self->{recording}) {
3364	$self->start;
3365	} else {
3366	$self->stop;
3367	}
3368	});
3369
3370	$vb->add (new CFClient::UI::Label text => "Actions:");
3371	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3372
3373	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3374	$vb->add (my $hb = new CFClient::UI::HBox);
3375	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3376	$hb->add (new CFClient::UI::Button
3377	text => "bind",
3378	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3379	on_activate => sub {
3380	$self->ask_for_bind;
3381	});
3382
3383	$vb->add (my $hb = new CFClient::UI::HBox);
3384	$hb->add (new CFClient::UI::Button
3385	text => "ok",
3386	expand => 1,
3387	tooltip => "This closes the binding editor and saves the binding",
3388	on_activate => sub {
3389	$self->hide;
3390	$self->commit;
3391	});
3392
3393	$hb->add (new CFClient::UI::Button
3394	text => "cancel",
3395	expand => 1,
3396	tooltip => "This closes the binding editor without saving",
3397	on_activate => sub {
3398	$self->hide;
3399	$self->{binding_cancel}->()
3400	if $self->{binding_cancel};
3401	});
3402
3403	$self->update_binding_widgets;
3404
3405	$self
3406	}
3407
3408	sub commit {
3409	my ($self) = @_;
3410	my ($mod, $sym, $cmds) = $self->get_binding;
3411	if ($sym != 0 && @$cmds > 0) {
3412	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3413	."'. Don't forget 'Save Config'!");
3414	$self->{binding_change}->($mod, $sym, $cmds)
3415	if $self->{binding_change};
3416	} else {
3417	$::STATUSBOX->add ("No action bound, no key or action specified!");
3418	$self->{binding_cancel}->()
3419	if $self->{binding_cancel};
3420	}
3421	}
3422
3423	sub start {
3424	my ($self) = @_;
3425
3426	$self->{rec_btn}->set_text ("stop recording");
3427	$self->{recording} = 1;
3428	$self->clear_command_list;
3429	$::CONN->start_record if $::CONN;
3430	}
3431
3432	sub stop {
3433	my ($self) = @_;
3434
3435	$self->{rec_btn}->set_text ("start recording");
3436	$self->{recording} = 0;
3437
3438	my $rec;
3439	$rec = $::CONN->stop_record if $::CONN;
3440	return unless ref $rec eq 'ARRAY';
3441	$self->set_command_list ($rec);
3442	}
3443
3444
3445	sub ask_for_bind_and_commit {
3446	my ($self) = @_;
3447	$self->ask_for_bind (1);
3448	}
3449
3450	sub ask_for_bind {
3451	my ($self, $commit) = @_;
3452
3453	CFClient::Binder::open_binding_dialog (sub {
3454	my ($mod, $sym) = @_;
3455	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3456	$self->update_binding_widgets;
3457	$self->commit if $commit;
3458	});
3459	}
3460
3461	# $mod and $sym are the modifiers and key symbol
3462	# $cmds is a array ref of strings (the commands)
3463	# $cb is the callback that is executed on OK
3464	# $ccb is the callback that is executed on CANCEL and
3465	# when the binding was unsuccessful on OK
3466	sub set_binding {
3467	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3468
3469	$self->clear_command_list;
3470	$self->{recording} = 0;
3471	$self->{rec_btn}->set_text ("start recording");
3472
3473	$self->{binding} = [$mod, $sym];
3474	$self->{commands} = $cmds;
3475
3476	$self->{binding_change} = $cb;
3477	$self->{binding_cancel} = $ccb;
3478
3479	$self->update_binding_widgets;
3480	}
3481
3482	# this is a shortcut method that asks for a binding
3483	# and then just binds it.
3484	sub do_quick_binding {
3485	my ($self, $cmds) = @_;
3486	$self->set_binding (undef, undef, $cmds, sub {
3487	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3488	});
3489	$self->ask_for_bind (1);
3490	}
3491
3492	sub update_binding_widgets {
3493	my ($self) = @_;
3494	my ($mod, $sym, $cmds) = $self->get_binding;
3495	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3496	$self->set_command_list ($cmds);
3497	}
3498
3499	sub get_binding {
3500	my ($self) = @_;
3501	return (
3502	$self->{binding}->[0],
3503	$self->{binding}->[1],
3504	[ grep { defined $_ } @{$self->{commands}} ]
3505	);
3506	}
3507
3508	sub clear_command_list {
3509	my ($self) = @_;
3510	$self->{cmdbox}->clear ();
3511	}
3512
3513	sub set_command_list {
3514	my ($self, $cmds) = @_;
3515
3516	$self->{cmdbox}->clear ();
3517	$self->{commands} = $cmds;
3518
3519	my $idx = 0;
3520
3521	for (@$cmds) {
3522	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3523
3524	my $i = $idx;
3525	$hb->add (new CFClient::UI::Label text => $_);
3526	$hb->add (new CFClient::UI::Button
3527	text => "delete",
3528	tooltip => "Deletes the action from the record",
3529	on_activate => sub {
3530	$self->{cmdbox}->remove ($hb);
3531	$cmds->[$i] = undef;
3532	});
3533
3534
3535	$idx++
3536	}	3477	}
3537	}	3478	}
3538		3479
3539	#############################################################################	3480	#############################################################################
3540		3481
…		…
3550	commands => [],	3491	commands => [],
3551	@_,	3492	@_,
3552	)	3493	)
3553	}	3494	}
3554		3495
		3496	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3497
		3498	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3499	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3500	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3501	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3555	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3502	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");	3503	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3557	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3504	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");	3505	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3559	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3506	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560	"<b>Damage</b>. The amount of damage the spell deals when it hits.");	3507	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3561		3508
3562	sub rebuild_spell_list {	3509	sub rebuild_spell_list {
3563	my ($self) = @_;	3510	my ($self) = @_;
3564		3511
3565	$CFClient::UI::ROOT->on_refresh ($self => sub {	3512	$CFClient::UI::ROOT->on_refresh ($self => sub {
3566	$self->clear;	3513	$self->clear;
3567		3514
		3515	return unless $::CONN;
		3516
3568	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");	3517	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3518	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3569	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3519	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3570	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3520	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3571	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3521	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3572		3522
3573	my $row = 0;	3523	my $row = 0;
3574		3524
3575	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3525	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3576	my $spell = $self->{spell}{$_};	3526	my $spell = $self->{spell}{$_};
3577		3527
3578	$row++;	3528	$row++;
		3529
		3530	my $spell_cb = sub {
		3531	my ($widget, $ev) = @_;
		3532
		3533	if ($ev->{button} == 1) {
		3534	$::CONN->user_send ("cast $spell->{name}");
		3535	} elsif ($ev->{button} == 2) {
		3536	$::CONN->user_send ("invoke $spell->{name}");
		3537	} elsif ($ev->{button} == 3) {
		3538	(new CFClient::UI::Menu
		3539	items => [
		3540	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3541	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3542	],
		3543	)->popup ($ev);
		3544	} else {
		3545	return 0;
		3546	}
		3547
		3548	1
		3549	};
		3550
		3551	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3552
		3553	#TODO: add path info to tooltip
		3554	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3579		3555
3580	$self->add (0, $row, new CFClient::UI::Face	3556	$self->add (0, $row, new CFClient::UI::Face
3581	face => $spell->{face},	3557	face => $spell->{face},
3582	can_hover => 1,	3558	can_hover => 1,
3583	can_events => 1,	3559	can_events => 1,
3584	tooltip => $spell->{message},	3560	tooltip => $tooltip,
		3561	on_button_down => $spell_cb,
3585	);	3562	);
3586		3563
3587	$self->add (1, $row, new CFClient::UI::Label	3564	$self->add (1, $row, new CFClient::UI::Label
3588	expand => 1,	3565	expand => 1,
3589	text => $spell->{name},	3566	text => $spell->{name},
3590	can_hover => 1,	3567	can_hover => 1,
3591	can_events => 1,	3568	can_events => 1,
3592	tooltip => $spell->{message},	3569	tooltip => $tooltip,
		3570	on_button_down => $spell_cb,
3593	);	3571	);
3594		3572
		3573	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3595	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3574	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3596	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3575	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3597	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3576	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3598
3599	# TODO: should be done via popup
3600	$self->add (5, $row, new CFClient::UI::Button
3601	text => "bind",
3602	tooltip => "bind spell readying (cast command) to key",
3603	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3604	);
3605	}	3577	}
3606	});	3578	});
3607	}	3579	}
3608		3580
3609	sub add_spell {	3581	sub add_spell {
…		…
3615		3587
3616	sub remove_spell {	3588	sub remove_spell {
3617	my ($self, $spell) = @_;	3589	my ($self, $spell) = @_;
3618		3590
3619	delete $self->{spell}->{$spell->{name}};	3591	delete $self->{spell}->{$spell->{name}};
		3592	$self->rebuild_spell_list;
		3593	}
		3594
		3595	sub clear_spells {
		3596	my ($self) = @_;
		3597
		3598	$self->{spell} = {};
3620	$self->rebuild_spell_list;	3599	$self->rebuild_spell_list;
3621	}	3600	}
3622		3601
3623	#############################################################################	3602	#############################################################################
3624		3603
…		…
3661	$coord = $max - $size if $coord > $max - $size;	3640	$coord = $max - $size if $coord > $max - $size;
3662		3641
3663	int $coord + 0.5	3642	int $coord + 0.5
3664	}	3643	}
3665		3644
3666	sub size_allocate {	3645	sub invoke_size_allocate {
3667	my ($self, $w, $h) = @_;	3646	my ($self, $w, $h) = @_;
3668		3647
3669	for my $child ($self->children) {	3648	for my $child ($self->children) {
3670	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3649	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3671		3650
…		…
3675	$X = _to_pixel $X, $W, $self->{w};	3654	$X = _to_pixel $X, $W, $self->{w};
3676	$Y = _to_pixel $Y, $H, $self->{h};	3655	$Y = _to_pixel $Y, $H, $self->{h};
3677		3656
3678	$child->configure ($X, $Y, $W, $H);	3657	$child->configure ($X, $Y, $W, $H);
3679	}	3658	}
		3659
		3660	1
3680	}	3661	}
3681		3662
3682	sub coord2local {	3663	sub coord2local {
3683	my ($self, $x, $y) = @_;	3664	my ($self, $x, $y) = @_;
3684		3665

Diff Legend

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