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

Diff Legend

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