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.295 by root, Tue Jun 6 09:19:28 2006 UTC vs.
Revision 1.329 by root, Sun Jul 23 02:44:06 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	$FOCUS = $self;
430		429
431	$self->_emit (focus_in => $focus);	430	$self->update;
432		431
433	$focus->update if $focus;	432	0
434	$FOCUS->update;
435	}	433	}
436		434
437	sub focus_out {	435	sub invoke_focus_out {
438	my ($self) = @_;	436	my ($self) = @_;
439		437
440	return unless $FOCUS == $self;	438	return unless $FOCUS == $self;
441		439
442	my $focus = $FOCUS; undef $FOCUS;	440	undef $FOCUS;
443		441
444	$self->_emit (focus_out => $focus);	442	$self->update;
445		443
446	$focus->update if $focus; #?
447
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	444	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	445	unless $FOCUS;
450	}
451		446
		447	0
		448	}
		449
		450	sub grab_focus {
		451	my ($self) = @_;
		452
		453	$FOCUS->emit ("focus_out") if $FOCUS;
		454	$self->emit ("focus_in");
		455	}
		456
452	sub mouse_motion { 0 }	457	sub invoke_mouse_motion { 0 }
453	sub button_up { 0 }	458	sub invoke_button_up { 0 }
454	sub key_down { 0 }	459	sub invoke_key_down { 0 }
455	sub key_up { 0 }	460	sub invoke_key_up { 0 }
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	0
		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	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		480
		481	#d##TODO# stop propagating at first true, do not use sum
		482	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
		483	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
		484	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463	}	485	}
464		486
465	sub find_widget {	487	sub find_widget {
466	my ($self, $x, $y) = @_;	488	my ($self, $x, $y) = @_;
467		489
…		…
477	sub set_parent {	499	sub set_parent {
478	my ($self, $parent) = @_;	500	my ($self, $parent) = @_;
479		501
480	Scalar::Util::weaken ($self->{parent} = $parent);	502	Scalar::Util::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	503	$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	}	504	}
506		505
507	sub realloc {	506	sub realloc {
508	my ($self) = @_;	507	my ($self) = @_;
509		508
…		…
542	return unless $self->{h} && $self->{w};	541	return unless $self->{h} && $self->{w};
543		542
544	# update screen rectangle	543	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	544	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	545	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		546
550	# skip widgets that are entirely outside the drawing area	547	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		550
…		…
592	}	589	}
593		590
594	sub DESTROY {	591	sub DESTROY {
595	my ($self) = @_;	592	my ($self) = @_;
596		593
		594	return if CFClient::in_destruct;
		595
597	delete $WIDGET{$self+0};	596	delete $WIDGET{$self+0};
598	#$self->deactivate;	597
		598	eval { $self->destroy };
		599	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599	}	600	}
600		601
601	#############################################################################	602	#############################################################################
602		603
603	package CFClient::UI::DrawBG;	604	package CFClient::UI::DrawBG;
…		…
768	}	769	}
769		770
770	sub add {	771	sub add {
771	my ($self, $child) = @_;	772	my ($self, $child) = @_;
772		773
773	$self->{children} = [];	774	$self->SUPER::remove ($_) for @{ $self->{children} };
774
775	$self->SUPER::add ($child);	775	$self->SUPER::add ($child);
776	}	776	}
777		777
778	sub remove {	778	sub remove {
779	my ($self, $widget) = @_;	779	my ($self, $widget) = @_;
…		…
788		788
789	sub size_request {	789	sub size_request {
790	$_[0]{children}[0]->size_request	790	$_[0]{children}[0]->size_request
791	}	791	}
792		792
793	sub size_allocate {	793	sub invoke_size_allocate {
794	my ($self, $w, $h) = @_;	794	my ($self, $w, $h) = @_;
795		795
796	$self->{children}[0]->configure (0, 0, $w, $h);	796	$self->{children}[0]->configure (0, 0, $w, $h);
		797
		798	1
797	}	799	}
798		800
799	#############################################################################	801	#############################################################################
800		802
801	# back-buffered drawing area	803	# back-buffered drawing area
…		…
817		819
818	$ROOT->on_post_alloc ($self => sub { $self->render_child });	820	$ROOT->on_post_alloc ($self => sub { $self->render_child });
819	$self->SUPER::update;	821	$self->SUPER::update;
820	}	822	}
821		823
822	sub size_allocate {	824	sub invoke_size_allocate {
823	my ($self, $w, $h) = @_;	825	my ($self, $w, $h) = @_;
824		826
825	$self->SUPER::size_allocate ($w, $h);
826	$self->update;	827	$self->update;
		828
		829	$self->SUPER::invoke_size_allocate ($w, $h)
827	}	830	}
828		831
829	sub _render {	832	sub _render {
830	my ($self) = @_;	833	my ($self) = @_;
831		834
…		…
892	$h = 10 if $self->{scroll_y};	895	$h = 10 if $self->{scroll_y};
893		896
894	($w, $h)	897	($w, $h)
895	}	898	}
896		899
897	sub size_allocate {	900	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	901	my ($self, $w, $h) = @_;
899		902
900	my $child = $self->child;	903	my $child = $self->child;
901		904
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	905	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	906	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		907
905	$self->child->configure (0, 0, $w, $h);	908	$self->child->configure (0, 0, $w, $h);
906	$self->update;	909	$self->update;
		910
		911	1
907	}	912	}
908		913
909	sub set_offset {	914	sub set_offset {
910	my ($self, $x, $y) = @_;	915	my ($self, $x, $y) = @_;
911		916
…		…
985	$self->add ($child) if $child;	990	$self->add ($child) if $child;
986		991
987	$self	992	$self
988	}	993	}
989		994
		995	#TODO# update range on size_allocate depending on child
		996
990	sub add {	997	sub add {
991	my ($self, $widget) = @_;	998	my ($self, $widget) = @_;
992		999
993	$self->{vp}->add ($self->{child} = $widget);	1000	$self->{vp}->add ($self->{child} = $widget);
994	}	1001	}
995		1002
		1003	sub invoke_button_up {
		1004	my ($self, $ev) = @_;
		1005
		1006	warn "button up $ev->{button}\n";#d#
		1007
		1008	0
		1009	}
		1010
		1011	sub update_slider {
		1012	my ($self) = @_;
		1013
		1014	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1015	}
		1016
996	sub update {	1017	sub update {
997	my ($self) = @_;	1018	my ($self) = @_;
998		1019
999	$self->SUPER::update;	1020	$self->SUPER::update;
1000		1021
1001	# todo: overwrite size_allocate of child	1022	$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	}	1023	}
1005		1024
1006	sub size_allocate {	1025	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1026	my ($self, $w, $h) = @_;
1008		1027
		1028	$self->update_slider;
		1029
1009	$self->SUPER::size_allocate ($w, $h);	1030	$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	}	1031	}
1014
1015	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll
1017		1032
1018	#############################################################################	1033	#############################################################################
1019		1034
1020	package CFClient::UI::Frame;	1035	package CFClient::UI::Frame;
1021		1036
…		…
1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1087	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073		1088
1074	sub new {	1089	sub new {
1075	my ($class, %arg) = @_;	1090	my ($class, %arg) = @_;
1076		1091
1077	my $title = delete $arg{title};
1078
1079	my $self = $class->SUPER::new (	1092	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1093	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1094	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1095	border => 0.6,
1083	can_events => 1,	1096	can_events => 1,
1084	min_w => 16,	1097	min_w => 64,
1085	min_h => 16,	1098	min_h => 32,
1086	%arg,	1099	%arg,
1087	);	1100	);
1088		1101
1089	$self->{title} = new CFClient::UI::Label	1102	$self->{title_widget} = new CFClient::UI::Label
1090	align => 0,	1103	align => 0,
1091	valign => 1,	1104	valign => 1,
1092	text => $title,	1105	text => $self->{title},
1093	fontsize => $self->{border}	1106	fontsize => $self->{border},
1094	if defined $title;	1107	if exists $self->{title};
		1108
		1109	if ($self->{has_close_button}) {
		1110	$self->{close_button} =
		1111	new CFClient::UI::ImageButton
		1112	path => 'x1_close.png',
		1113	on_activate => sub { $self->emit ("delete") };
		1114
		1115	$self->CFClient::UI::Container::add ($self->{close_button});
		1116	}
1095		1117
1096	$self	1118	$self
1097	}	1119	}
1098		1120
1099	sub add {	1121	sub add {
1100	my ($self, @widgets) = @_;	1122	my ($self, @widgets) = @_;
1101		1123
1102	$self->SUPER::add (@widgets);	1124	$self->SUPER::add (@widgets);
		1125	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1126	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1127	}
1105		1128
1106	sub border {	1129	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1130	int $_[0]{border} * $::FONTSIZE
1108	}	1131	}
1109		1132
1110	sub size_request {	1133	sub size_request {
1111	my ($self) = @_;	1134	my ($self) = @_;
1112		1135
1113	$self->{title}->size_request	1136	$self->{title_widget}->size_request
1114	if $self->{title};	1137	if $self->{title_widget};
		1138
		1139	$self->{close_button}->size_request
		1140	if $self->{close_button};
1115		1141
1116	my ($w, $h) = $self->SUPER::size_request;	1142	my ($w, $h) = $self->SUPER::size_request;
1117		1143
1118	(	1144	(
1119	$w + $self->border * 2,	1145	$w + $self->border * 2,
1120	$h + $self->border * 2,	1146	$h + $self->border * 2,
1121	)	1147	)
1122	}	1148	}
1123		1149
1124	sub size_allocate {	1150	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1151	my ($self, $w, $h) = @_;
1126		1152
1127	if ($self->{title}) {	1153	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1154	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1155	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1156	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1157	}
1132		1158
1133	my $border = $self->border;	1159	my $border = $self->border;
1134		1160
1135	$h -= List::Util::max 0, $border * 2;	1161	$h -= List::Util::max 0, $border * 2;
1136	$w -= List::Util::max 0, $border * 2;	1162	$w -= List::Util::max 0, $border * 2;
		1163
		1164	$self->child->configure ($border, $border, $w, $h);
		1165
		1166	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1167	if $self->{close_button};
		1168
		1169	1
		1170	}
		1171
		1172	sub invoke_delete {
		1173	my ($self) = @_;
		1174
		1175	$self->hide;
1137		1176
1138	$self->child->configure ($border, $border, $w, $h);	1177	1
1139	}	1178	}
1140		1179
1141	sub button_down {	1180	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1181	my ($self, $ev, $x, $y) = @_;
1143		1182
1144	my ($w, $h) = @$self{qw(w h)};	1183	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1184	my $border = $self->border;
1146		1185
…		…
1177		1216
1178	($x, $y) = ($ev->{x}, $ev->{y});	1217	($x, $y) = ($ev->{x}, $ev->{y});
1179		1218
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1219	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1220	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1221	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1222	};
1184	} else {	1223	} else {
1185	return 0;	1224	return 0;
1186	}	1225	}
1187		1226
1188	1	1227	1
1189	}	1228	}
1190		1229
1191	sub button_up {	1230	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1231	my ($self, $ev, $x, $y) = @_;
1193		1232
1194	!!delete $self->{motion}	1233	! ! delete $self->{motion}
1195	}	1234	}
1196		1235
1197	sub mouse_motion {	1236	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1237	my ($self, $ev, $x, $y) = @_;
1199		1238
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1239	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1240
1202	!!$self->{motion}	1241	! ! $self->{motion}
1203	}	1242	}
1204		1243
1205	sub _draw {	1244	sub _draw {
1206	my ($self) = @_;	1245	my ($self) = @_;
1207		1246
…		…
1233		1272
1234	glDisable GL_TEXTURE_2D;	1273	glDisable GL_TEXTURE_2D;
1235		1274
1236	$child->draw;	1275	$child->draw;
1237		1276
1238	if ($self->{title}) {	1277	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1278	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1279	$self->{title_widget}->_draw;
		1280
		1281	glTranslate 0, - ($border - $self->{h});
1241	}	1282	}
		1283
		1284	$self->{close_button}->draw
		1285	if $self->{close_button};
1242	}	1286	}
1243		1287
1244	#############################################################################	1288	#############################################################################
1245		1289
1246	package CFClient::UI::Table;	1290	package CFClient::UI::Table;
…		…
1269		1313
1270	$child->set_parent ($self);	1314	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1315	$self->{children}[$y][$x] = $child;
1272		1316
1273	$self->realloc;	1317	$self->realloc;
		1318	}
		1319
		1320	sub remove {
		1321	my ($self, $child) = @_;
		1322
		1323	# TODO: not yet implemented
1274	}	1324	}
1275		1325
1276	# TODO: move to container class maybe? send children a signal on removal?	1326	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1327	sub clear {
1278	my ($self) = @_;	1328	my ($self) = @_;
…		…
1319	(sum @$ws),	1369	(sum @$ws),
1320	(sum @$hs),	1370	(sum @$hs),
1321	)	1371	)
1322	}	1372	}
1323		1373
1324	sub size_allocate {	1374	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1375	my ($self, $w, $h) = @_;
1326		1376
1327	my ($ws, $hs) = $self->get_wh;	1377	my ($ws, $hs) = $self->get_wh;
1328		1378
1329	my $req_w = (sum @$ws) || 1;	1379	my $req_w = (sum @$ws) || 1;
…		…
1361	}	1411	}
1362		1412
1363	$y += $row_h;	1413	$y += $row_h;
1364	}	1414	}
1365		1415
		1416	1
1366	}	1417	}
1367		1418
1368	sub find_widget {	1419	sub find_widget {
1369	my ($self, $x, $y) = @_;	1420	my ($self, $x, $y) = @_;
1370		1421
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1458	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1459	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1460	)
1410	}	1461	}
1411		1462
1412	sub size_allocate {	1463	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1464	my ($self, $w, $h) = @_;
1414		1465
1415	my $space = $self->{vertical} ? $h : $w;	1466	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1467	my @children = $self->visible_children;
1417		1468
1418	my @req;	1469	my @req;
1419		1470
1420	if ($self->{homogeneous}) {	1471	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1472	@req = ($space / (@children || 1)) x @children;
1422	} else {	1473	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1474	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1475	my $req = List::Util::sum @req;
1425		1476
1426	if ($req > $space) {	1477	if ($req > $space) {
1427	# ah well, not enough space	1478	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1479	$_ *= $space / $req for @req;
1429	} else {	1480	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1481	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1482
1432	$space = ($space - $req) / $expand; # remaining space to give away	1483	$space = ($space - $req) / $expand; # remaining space to give away
1433		1484
1434	$req[$_] += $space * $children->[$_]{expand}	1485	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1486	for 0 .. $#children;
1436	}	1487	}
1437	}	1488	}
1438		1489
1439	CFClient::UI::harmonize \@req;	1490	CFClient::UI::harmonize \@req;
1440		1491
1441	my $pos = 0;	1492	my $pos = 0;
1442	for (0 .. $#$children) {	1493	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1494	my $alloc = $req[$_];
1444	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1495	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445		1496
1446	$pos += $alloc;	1497	$pos += $alloc;
1447	}	1498	}
1448		1499
1449	1	1500	1
…		…
1552	my ($self, $text) = @_;	1603	my ($self, $text) = @_;
1553		1604
1554	return if $self->{text} eq "T$text";	1605	return if $self->{text} eq "T$text";
1555	$self->{text} = "T$text";	1606	$self->{text} = "T$text";
1556		1607
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1608	$self->{layout}->set_text ($text);
1559		1609
1560	delete $self->{size_req};	1610	delete $self->{size_req};
1561	$self->realloc;	1611	$self->realloc;
1562	$self->update;	1612	$self->update;
…		…
1568	return if $self->{text} eq "M$markup";	1618	return if $self->{text} eq "M$markup";
1569	$self->{text} = "M$markup";	1619	$self->{text} = "M$markup";
1570		1620
1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1621	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572		1622
1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574	$self->{layout}->set_markup ($markup);	1623	$self->{layout}->set_markup ($markup);
1575		1624
1576	delete $self->{size_req};	1625	delete $self->{size_req};
1577	$self->realloc;	1626	$self->realloc;
1578	$self->update;	1627	$self->update;
…		…
1590		1639
1591	my ($w, $h) = $self->{layout}->size;	1640	my ($w, $h) = $self->{layout}->size;
1592		1641
1593	if (exists $self->{template}) {	1642	if (exists $self->{template}) {
1594	$self->{template}->set_font ($self->{font}) if $self->{font};	1643	$self->{template}->set_font ($self->{font}) if $self->{font};
		1644	$self->{template}->set_width ($self->{max_w} || -1);
1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1645	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596		1646
1597	my ($w2, $h2) = $self->{template}->size;	1647	my ($w2, $h2) = $self->{template}->size;
1598		1648
1599	$w = List::Util::max $w, $w2;	1649	$w = List::Util::max $w, $w2;
…		…
1604	};	1654	};
1605		1655
1606	@{ $self->{size_req} }	1656	@{ $self->{size_req} }
1607	}	1657	}
1608		1658
		1659	sub baseline_shift {
		1660	$_[0]{layout}->descent
		1661	}
		1662
1609	sub size_allocate {	1663	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1664	my ($self, $w, $h) = @_;
1611		1665
1612	delete $self->{ox};	1666	delete $self->{ox};
1613		1667
1614	delete $self->{texture}	1668	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1669	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1670
		1671	1
1616	}	1672	}
1617		1673
1618	sub set_fontsize {	1674	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1675	my ($self, $fontsize) = @_;
1620		1676
1621	$self->{fontsize} = $fontsize;	1677	$self->{fontsize} = $fontsize;
		1678	delete $self->{size_req};
1622	delete $self->{texture};	1679	delete $self->{texture};
1623		1680
1624	$self->realloc;	1681	$self->realloc;
1625	}	1682	}
1626		1683
1627	sub reconfigure {	1684	sub reconfigure {
1628	my ($self) = @_;	1685	my ($self) = @_;
1629		1686
1630	delete $self->{size_req};	1687	delete $self->{size_req};
		1688	delete $self->{texture};
1631		1689
1632	$self->SUPER::reconfigure;	1690	$self->SUPER::reconfigure;
1633	}	1691	}
1634		1692
1635	sub _draw {	1693	sub _draw {
1636	my ($self) = @_;	1694	my ($self) = @_;
1637		1695
1638	$self->SUPER::_draw; # draw background, if applicable	1696	$self->SUPER::_draw; # draw background, if applicable
1639		1697
1640	my $tex = $self->{texture} ||= do {	1698	my $size = $self->{texture} ||= do {
1641	$self->{layout}->set_foreground (@{$self->{fg}});	1699	$self->{layout}->set_foreground (@{$self->{fg}});
1642	$self->{layout}->set_font ($self->{font}) if $self->{font};	1700	$self->{layout}->set_font ($self->{font}) if $self->{font};
1643	$self->{layout}->set_width ($self->{w});	1701	$self->{layout}->set_width ($self->{w});
1644	$self->{layout}->set_ellipsise ($self->{ellipsise});	1702	$self->{layout}->set_ellipsise ($self->{ellipsise});
1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1703	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1704	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647		1705
1648	new_from_layout CFClient::Texture $self->{layout}	1706	[$self->{layout}->size]
1649	};	1707	};
1650		1708
1651	unless (exists $self->{ox}) {	1709	unless (exists $self->{ox}) {
1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1710	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1711	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654	: ($self->{w} - $tex->{w}) * 0.5);	1712	: ($self->{w} - $size->[0]) * 0.5);
1655		1713
1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1714	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1715	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658	: ($self->{h} - $tex->{h}) * 0.5);	1716	: ($self->{h} - $size->[1]) * 0.5);
1659	};	1717	};
1660		1718
1661	glEnable GL_TEXTURE_2D;
1662
1663	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1719	my $w = List::Util::min $self->{w} + 4, $size->[0];
1664	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1720	my $h = List::Util::min $self->{h} + 2, $size->[1];
1665		1721
1666	if ($tex->{format} == GL_ALPHA) {	1722	$self->{layout}->render ($self->{ox}, $self->{oy});
1667	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1668	glColor @{$self->{fg}};
1669	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1670	} else {
1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1673	}
1674
1675	glDisable GL_TEXTURE_2D;
1676	}	1723	}
1677		1724
1678	#############################################################################	1725	#############################################################################
1679		1726
1680	package CFClient::UI::EntryBase;	1727	package CFClient::UI::EntryBase;
…		…
1713		1760
1714	$text =~ s/./*/g if $self->{hidden};	1761	$text =~ s/./*/g if $self->{hidden};
1715	$self->{layout}->set_text ("$text ");	1762	$self->{layout}->set_text ("$text ");
1716	delete $self->{size_req};	1763	delete $self->{size_req};
1717		1764
1718	$self->_emit (changed => $self->{text});	1765	$self->emit (changed => $self->{text});
1719		1766
1720	$self->realloc;	1767	$self->realloc;
1721	$self->update;	1768	$self->update;
1722	}	1769	}
1723		1770
…		…
1738	my ($w, $h) = $self->SUPER::size_request;	1785	my ($w, $h) = $self->SUPER::size_request;
1739		1786
1740	($w + 1, $h) # add 1 for cursor	1787	($w + 1, $h) # add 1 for cursor
1741	}	1788	}
1742		1789
1743	sub key_down {	1790	sub invoke_key_down {
1744	my ($self, $ev) = @_;	1791	my ($self, $ev) = @_;
1745		1792
1746	my $mod = $ev->{mod};	1793	my $mod = $ev->{mod};
1747	my $sym = $ev->{sym};	1794	my $sym = $ev->{sym};
1748	my $uni = $ev->{unicode};	1795	my $uni = $ev->{unicode};
…		…
1760	} elsif ($sym == CFClient::SDLK_HOME) {	1807	} elsif ($sym == CFClient::SDLK_HOME) {
1761	$self->{cursor} = 0;	1808	$self->{cursor} = 0;
1762	} elsif ($sym == CFClient::SDLK_END) {	1809	} elsif ($sym == CFClient::SDLK_END) {
1763	$self->{cursor} = length $text;	1810	$self->{cursor} = length $text;
1764	} elsif ($uni == 27) {	1811	} elsif ($uni == 27) {
1765	$self->_emit ('escape');	1812	$self->emit ('escape');
1766	} elsif ($uni) {	1813	} elsif ($uni) {
1767	substr $text, $self->{cursor}++, 0, chr $uni;	1814	substr $text, $self->{cursor}++, 0, chr $uni;
1768	} else {	1815	} else {
1769	return 0;	1816	return 0;
1770	}	1817	}
…		…
1774	$self->realloc;	1821	$self->realloc;
1775		1822
1776	1	1823	1
1777	}	1824	}
1778		1825
1779	sub focus_in {	1826	sub invoke_focus_in {
1780	my ($self) = @_;	1827	my ($self) = @_;
1781		1828
1782	$self->{last_activity} = $::NOW;	1829	$self->{last_activity} = $::NOW;
1783		1830
1784	$self->SUPER::focus_in;	1831	$self->SUPER::invoke_focus_in
1785	}	1832	}
1786		1833
1787	sub button_down {	1834	sub invoke_button_down {
1788	my ($self, $ev, $x, $y) = @_;	1835	my ($self, $ev, $x, $y) = @_;
1789		1836
1790	$self->SUPER::button_down ($ev, $x, $y);	1837	$self->SUPER::invoke_button_down ($ev, $x, $y);
1791		1838
1792	my $idx = $self->{layout}->xy_to_index ($x, $y);	1839	my $idx = $self->{layout}->xy_to_index ($x, $y);
1793		1840
1794	# byte-index to char-index	1841	# byte-index to char-index
1795	my $text = $self->{text};	1842	my $text = $self->{text};
1796	utf8::encode $text;	1843	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1797	$self->{cursor} = length substr $text, 0, $idx;	1844	$self->{cursor} = length $text;
1798		1845
1799	$self->_set_text ($self->{text});	1846	$self->_set_text ($self->{text});
1800	$self->update;	1847	$self->update;
1801		1848
1802	1	1849	1
1803	}	1850	}
1804		1851
1805	sub mouse_motion {	1852	sub invoke_mouse_motion {
1806	my ($self, $ev, $x, $y) = @_;	1853	my ($self, $ev, $x, $y) = @_;
1807	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1854	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808		1855
1809	0	1856	1
1810	}	1857	}
1811		1858
1812	sub _draw {	1859	sub _draw {
1813	my ($self) = @_;	1860	my ($self) = @_;
1814		1861
…		…
1855		1902
1856	our @ISA = CFClient::UI::EntryBase::;	1903	our @ISA = CFClient::UI::EntryBase::;
1857		1904
1858	use CFClient::OpenGL;	1905	use CFClient::OpenGL;
1859		1906
1860	sub key_down {	1907	sub invoke_key_down {
1861	my ($self, $ev) = @_;	1908	my ($self, $ev) = @_;
1862		1909
1863	my $sym = $ev->{sym};	1910	my $sym = $ev->{sym};
1864		1911
1865	if ($sym == 13) {	1912	if ($sym == 13) {
1866	unshift @{$self->{history}},	1913	unshift @{$self->{history}},
1867	my $txt = $self->get_text;	1914	my $txt = $self->get_text;
		1915
1868	$self->{history_pointer} = -1;	1916	$self->{history_pointer} = -1;
1869	$self->{history_saveback} = '';	1917	$self->{history_saveback} = '';
1870	$self->_emit (activate => $txt);	1918	$self->emit (activate => $txt);
1871	$self->update;	1919	$self->update;
1872		1920
1873	} elsif ($sym == CFClient::SDLK_UP) {	1921	} elsif ($sym == CFClient::SDLK_UP) {
1874	if ($self->{history_pointer} < 0) {	1922	if ($self->{history_pointer} < 0) {
1875	$self->{history_saveback} = $self->get_text;	1923	$self->{history_saveback} = $self->get_text;
…		…
1891	} else {	1939	} else {
1892	$self->set_text ($self->{history_saveback});	1940	$self->set_text ($self->{history_saveback});
1893	}	1941	}
1894		1942
1895	} else {	1943	} else {
1896	return $self->SUPER::key_down ($ev)	1944	return $self->SUPER::invoke_key_down ($ev)
1897	}	1945	}
1898		1946
1899	1	1947	1
1900	}	1948	}
1901		1949
…		…
1925	can_events => 1,	1973	can_events => 1,
1926	@_	1974	@_
1927	)	1975	)
1928	}	1976	}
1929		1977
1930	sub activate { }
1931
1932	sub button_up {	1978	sub invoke_button_up {
1933	my ($self, $ev, $x, $y) = @_;	1979	my ($self, $ev, $x, $y) = @_;
1934		1980
1935	$self->emit ("activate")	1981	$self->emit ("activate")
1936	if $x >= 0 && $x < $self->{w}	1982	if $x >= 0 && $x < $self->{w}
1937	&& $y >= 0 && $y < $self->{h};	1983	&& $y >= 0 && $y < $self->{h};
…		…
1951	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1997	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1952		1998
1953	glDisable GL_TEXTURE_2D;	1999	glDisable GL_TEXTURE_2D;
1954		2000
1955	$self->SUPER::_draw;	2001	$self->SUPER::_draw;
		2002	}
		2003
		2004	#############################################################################
		2005
		2006	package CFClient::UI::ImageButton;
		2007
		2008	our @ISA = CFClient::UI::Image::;
		2009
		2010	use CFClient::OpenGL;
		2011
		2012	my %textures;
		2013
		2014	sub new {
		2015	my $class = shift;
		2016
		2017	my $self = $class->SUPER::new (
		2018	padding_x => 4,
		2019	padding_y => 4,
		2020	fg => [1, 1, 1],
		2021	active_fg => [0, 0, 1],
		2022	can_hover => 1,
		2023	align => 0,
		2024	valign => 0,
		2025	can_events => 1,
		2026	@_
		2027	);
		2028	}
		2029
		2030	sub invoke_button_up {
		2031	my ($self, $ev, $x, $y) = @_;
		2032
		2033	$self->emit ("activate")
		2034	if $x >= 0 && $x < $self->{w}
		2035	&& $y >= 0 && $y < $self->{h};
		2036
		2037	1
1956	}	2038	}
1957		2039
1958	#############################################################################	2040	#############################################################################
1959		2041
1960	package CFClient::UI::CheckBox;	2042	package CFClient::UI::CheckBox;
…		…
1987	my ($self) = @_;	2069	my ($self) = @_;
1988		2070
1989	(6) x 2	2071	(6) x 2
1990	}	2072	}
1991		2073
		2074	sub toggle {
		2075	my ($self) = @_;
		2076
		2077	$self->{state} = !$self->{state};
		2078	$self->emit (changed => $self->{state});
		2079	$self->update;
		2080	}
		2081
1992	sub button_down {	2082	sub invoke_button_down {
1993	my ($self, $ev, $x, $y) = @_;	2083	my ($self, $ev, $x, $y) = @_;
1994		2084
1995	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997	$self->{state} = !$self->{state};	2087	$self->toggle;
1998	$self->_emit (changed => $self->{state});
1999	} else {	2088	} else {
2000	return 0	2089	return 0
2001	}	2090	}
2002		2091
2003	1	2092	1
…		…
2028	package CFClient::UI::Image;	2117	package CFClient::UI::Image;
2029		2118
2030	our @ISA = CFClient::UI::Base::;	2119	our @ISA = CFClient::UI::Base::;
2031		2120
2032	use CFClient::OpenGL;	2121	use CFClient::OpenGL;
2033	use Carp qw/confess/;
2034		2122
2035	our %loaded_images;	2123	our %texture_cache;
2036		2124
2037	sub new {	2125	sub new {
2038	my $class = shift;	2126	my $class = shift;
2039		2127
2040	my $self = $class->SUPER::new (can_events => 0, @_);	2128	my $self = $class->SUPER::new (
		2129	can_events => 0,
		2130	@_,
		2131	);
2041		2132
2042	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2133	$self->{path} || $self->{tex}
		2134	or Carp::croak "'path' or 'tex' attributes required";
2043		2135
2044	$loaded_images{$self->{image}} ||=	2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2045	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2137	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2046		2138
2047	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2048		2140
2049	Scalar::Util::weaken $loaded_images{$self->{image}};	2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051	$self->{aspect} = $tex->{w} / $tex->{h};
2052		2142
2053	$self	2143	$self
2054	}	2144	}
2055		2145
2056	sub size_request {	2146	sub size_request {
2057	my ($self) = @_;	2147	my ($self) = @_;
2058		2148
2059	($self->{tex}->{w}, $self->{tex}->{h})	2149	($self->{tex}{w}, $self->{tex}{h})
2060	}	2150	}
2061		2151
2062	sub _draw {	2152	sub _draw {
2063	my ($self) = @_;	2153	my ($self) = @_;
2064		2154
…		…
2173	my $ycut1 = max 0, min 1, $ycut;	2263	my $ycut1 = max 0, min 1, $ycut;
2174	my $ycut2 = max 0, min 1, $ycut - 1;	2264	my $ycut2 = max 0, min 1, $ycut - 1;
2175		2265
2176	my $h1 = $self->{h} * (1 - $ycut1);	2266	my $h1 = $self->{h} * (1 - $ycut1);
2177	my $h2 = $self->{h} * (1 - $ycut2);	2267	my $h2 = $self->{h} * (1 - $ycut2);
		2268	my $h3 = $self->{h};
		2269
		2270	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2178		2271
2179	glEnable GL_BLEND;	2272	glEnable GL_BLEND;
2180	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2273	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2274	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2182	glEnable GL_TEXTURE_2D;	2275	glEnable GL_TEXTURE_2D;
…		…
2201		2294
2202	if ($t3) {	2295	if ($t3) {
2203	glBindTexture GL_TEXTURE_2D, $t3->{name};	2296	glBindTexture GL_TEXTURE_2D, $t3->{name};
2204	glBegin GL_QUADS;	2297	glBegin GL_QUADS;
2205	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2298	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2206	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2299	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2207	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2300	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2208	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2301	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2209	glEnd;	2302	glEnd;
2210	}	2303	}
2211		2304
2212	glDisable GL_BLEND;	2305	glDisable GL_BLEND;
…		…
2300	$self->update;	2393	$self->update;
2301		2394
2302	$self	2395	$self
2303	}	2396	}
2304		2397
2305	sub changed { }
2306
2307	sub set_range {	2398	sub set_range {
2308	my ($self, $range) = @_;	2399	my ($self, $range) = @_;
2309		2400
2310	($range, $self->{range}) = ($self->{range}, $range);	2401	($range, $self->{range}) = ($self->{range}, $range);
2311		2402
…		…
2331	if $unit;	2422	if $unit;
2332		2423
2333	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2424	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334		2425
2335	if ($value != $old_value) {	2426	if ($value != $old_value) {
2336	$self->_emit (changed => $value);	2427	$self->emit (changed => $value);
2337	$self->update;	2428	$self->update;
2338	}	2429	}
2339	}	2430	}
2340		2431
2341	sub size_request {	2432	sub size_request {
2342	my ($self) = @_;	2433	my ($self) = @_;
2343		2434
2344	($self->{req_w}, $self->{req_h})	2435	($self->{req_w}, $self->{req_h})
2345	}	2436	}
2346		2437
2347	sub button_down {	2438	sub invoke_button_down {
2348	my ($self, $ev, $x, $y) = @_;	2439	my ($self, $ev, $x, $y) = @_;
2349		2440
2350	$self->SUPER::button_down ($ev, $x, $y);	2441	$self->SUPER::invoke_button_down ($ev, $x, $y);
2351		2442
2352	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2443	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353		2444
2354	$self->mouse_motion ($ev, $x, $y)	2445	$self->invoke_mouse_motion ($ev, $x, $y)
2355	}	2446	}
2356		2447
2357	sub mouse_motion {	2448	sub invoke_mouse_motion {
2358	my ($self, $ev, $x, $y) = @_;	2449	my ($self, $ev, $x, $y) = @_;
2359		2450
2360	if ($GRAB == $self) {	2451	if ($GRAB == $self) {
2361	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2452	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362		2453
…		…
2467	sub set_range { shift->{slider}->set_range (@_) }	2558	sub set_range { shift->{slider}->set_range (@_) }
2468	sub set_value { shift->{slider}->set_value (@_) }	2559	sub set_value { shift->{slider}->set_value (@_) }
2469		2560
2470	#############################################################################	2561	#############################################################################
2471		2562
2472	package CFClient::UI::TextView;	2563	package CFClient::UI::TextScroller;
2473		2564
2474	our @ISA = CFClient::UI::HBox::;	2565	our @ISA = CFClient::UI::HBox::;
2475		2566
2476	use CFClient::OpenGL;	2567	use CFClient::OpenGL;
2477		2568
…		…
2483	can_events => 0,	2574	can_events => 0,
2484	indent => 0,	2575	indent => 0,
2485	#font => default_font	2576	#font => default_font
2486	@_,	2577	@_,
2487		2578
2488	layout => (new CFClient::Layout 1),	2579	layout => (new CFClient::Layout),
2489	par => [],	2580	par => [],
2490	height => 0,	2581	height => 0,
2491	children => [	2582	children => [
2492	(new CFClient::UI::Empty expand => 1),	2583	(new CFClient::UI::Empty expand => 1),
2493	(new CFClient::UI::Slider vertical => 1),	2584	(new CFClient::UI::Slider vertical => 1),
…		…
2504		2595
2505	$self->{fontsize} = $fontsize;	2596	$self->{fontsize} = $fontsize;
2506	$self->reflow;	2597	$self->reflow;
2507	}	2598	}
2508		2599
		2600	sub size_request {
		2601	my ($self) = @_;
		2602
		2603	my ($empty, $slider) = @{ $self->{children} };
		2604
		2605	local $self->{children} = [$empty, $slider];
		2606	$self->SUPER::size_request
		2607	}
		2608
2509	sub size_allocate {	2609	sub invoke_size_allocate {
2510	my ($self, $w, $h) = @_;	2610	my ($self, $w, $h) = @_;
2511		2611
2512	$self->SUPER::size_allocate ($w, $h);	2612	my ($empty, $slider, @other) = @{ $self->{children} };
		2613	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2513		2614
2514	$self->{layout}->set_font ($self->{font}) if $self->{font};	2615	$self->{layout}->set_font ($self->{font}) if $self->{font};
2515	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2616	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516	$self->{layout}->set_width ($self->{children}[0]{w});	2617	$self->{layout}->set_width ($empty->{w});
2517	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2618	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518		2619
2519	$self->reflow;	2620	$self->reflow;
2520	}
2521		2621
2522	sub text_size {	2622	local $self->{children} = [$empty, $slider];
2523	my ($self, $text, $indent) = @_;	2623	$self->SUPER::invoke_size_allocate ($w, $h)
		2624	}
		2625
		2626	sub get_layout {
		2627	my ($self, $para) = @_;
2524		2628
2525	my $layout = $self->{layout};	2629	my $layout = $self->{layout};
2526		2630
		2631	$layout->set_font ($self->{font}) if $self->{font};
		2632	$layout->set_foreground (@{$para->{fg}});
2527	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2633	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2528	$layout->set_width ($self->{children}[0]{w} - $indent);	2634	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2529	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2635	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2530	$layout->set_markup ($text);	2636	$layout->set_markup ($para->{markup});
		2637
		2638	$layout->set_shapes (
		2639	map
		2640	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2641	@{$para->{widget}}
2531		2642	);
		2643
2532	$layout->size	2644	$layout
2533	}	2645	}
2534		2646
2535	sub reflow {	2647	sub reflow {
2536	my ($self) = @_;	2648	my ($self) = @_;
2537		2649
…		…
2546	$self->{children}[1]->set_value ($offset);	2658	$self->{children}[1]->set_value ($offset);
2547	}	2659	}
2548		2660
2549	sub clear {	2661	sub clear {
2550	my ($self) = @_;	2662	my ($self) = @_;
		2663
		2664	my (undef, undef, @other) = @{ $self->{children} };
		2665	$self->remove ($_) for @other;
2551		2666
2552	$self->{par} = [];	2667	$self->{par} = [];
2553	$self->{height} = 0;	2668	$self->{height} = 0;
2554	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555	}	2670	}
2556		2671
2557	sub add_paragraph {	2672	sub add_paragraph {
2558	my ($self, $color, $text, $indent) = @_;	2673	my ($self, $color, $para, $indent) = @_;
2559		2674
2560	for my $line (split /\n/, $text) {	2675	my ($text, @w) = ref $para ? @$para : $para;
2561	my ($w, $h) = $self->text_size ($line);	2676
2562	$self->{height} += $h;	2677	$para = {
2563	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2678	w => 1e10,
		2679	wrapped => 1,
		2680	fg => $color,
		2681	indent => $indent,
		2682	markup => $text,
		2683	widget => \@w,
2564	}	2684	};
2565		2685
2566	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2686	$self->add (@w) if @w;
		2687	push @{$self->{par}}, $para;
		2688
		2689	$self->{need_reflow}++;
		2690	$self->update;
		2691	}
		2692
		2693	sub scroll_to_bottom {
		2694	my ($self) = @_;
		2695
		2696	$self->{scroll_to_bottom} = 1;
		2697	$self->update;
2567	}	2698	}
2568		2699
2569	sub update {	2700	sub update {
2570	my ($self) = @_;	2701	my ($self) = @_;
2571		2702
…		…
2579	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580		2711
2581	if (delete $self->{need_reflow}) {	2712	if (delete $self->{need_reflow}) {
2582	my $height = 0;	2713	my $height = 0;
2583		2714
2584	my $layout = $self->{layout};
2585
2586	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2587
2588	for (@{$self->{par}}) {	2715	for my $para (@{$self->{par}}) {
2589	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2590	$layout->set_width ($W - $_->[3]);	2717	my $layout = $self->get_layout ($para);
2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592	$layout->set_markup ($_->[4]);
2593	my ($w, $h) = $layout->size;	2718	my ($w, $h) = $layout->size;
2594	$_->[0] = $w + $_->[3];	2719
2595	$_->[1] = $h;	2720	$para->{w} = $w + $para->{indent};
		2721	$para->{h} = $h;
		2722	$para->{wrapped} = $layout->has_wrapped;
2596	}	2723	}
2597		2724
2598	$height += $_->[1];	2725	$height += $para->{h};
2599	}	2726	}
2600		2727
2601	$self->{height} = $height;	2728	$self->{height} = $height;
2602		2729
2603	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2730	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2604		2731
2605	delete $self->{texture};	2732	delete $self->{texture};
		2733	}
		2734
		2735	if (delete $self->{scroll_to_bottom}) {
		2736	$self->{children}[1]->set_value (1e10);
2606	}	2737	}
2607		2738
2608	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2609	glClearColor 0, 0, 0, 0;	2740	glClearColor 0, 0, 0, 0;
2610	glClear GL_COLOR_BUFFER_BIT;	2741	glClear GL_COLOR_BUFFER_BIT;
…		…
2614	my $y0 = $top;	2745	my $y0 = $top;
2615	my $y1 = $top + $H;	2746	my $y1 = $top + $H;
2616		2747
2617	my $y = 0;	2748	my $y = 0;
2618		2749
2619	my $layout = $self->{layout};
2620
2621	$layout->set_font ($self->{font}) if $self->{font};
2622
2623	glEnable GL_BLEND;
2624	#TODO# not correct in windows where rgba is forced off
2625	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2626
2627	for my $par (@{$self->{par}}) {	2750	for my $para (@{$self->{par}}) {
2628	my $h = $par->[1];	2751	my $h = $para->{h};
2629		2752
2630	if ($y0 < $y + $h && $y < $y1) {	2753	if ($y0 < $y + $h && $y < $y1) {
2631	$layout->set_foreground (@{ $par->[2] });
2632	$layout->set_width ($W - $par->[3]);
2633	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2634	$layout->set_markup ($par->[4]);
2635		2754
2636	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2755	my $layout = $self->get_layout ($para);
2637		2756
2638	glRasterPos $par->[3], $y - $y0;	2757	$layout->render ($para->{indent}, $y - $y0);
2639	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2758
		2759	if (my @w = @{ $para->{widget} }) {
		2760	my @s = $layout->get_shapes;
		2761
		2762	for (@w) {
		2763	my ($dx, $dy) = splice @s, 0, 2, ();
		2764
		2765	$_->{x} = $dx + $para->{indent};
		2766	$_->{y} = $dy + $y - $y0;
		2767
		2768	$_->draw;
		2769	}
		2770	}
2640	}	2771	}
2641		2772
2642	$y += $h;	2773	$y += $h;
2643	}	2774	}
2644
2645	glDisable GL_BLEND;
2646	};	2775	};
2647	});	2776	});
		2777	}
		2778
		2779	sub reconfigure {
		2780	my ($self) = @_;
		2781
		2782	$self->SUPER::reconfigure;
		2783
		2784	$_->{w} = 1e10 for @{ $self->{par} };
		2785	$self->reflow;
2648	}	2786	}
2649		2787
2650	sub _draw {	2788	sub _draw {
2651	my ($self) = @_;	2789	my ($self) = @_;
2652		2790
…		…
2655	glColor 0, 0, 0, 1;	2793	glColor 0, 0, 0, 1;
2656	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2794	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2657	glDisable GL_TEXTURE_2D;	2795	glDisable GL_TEXTURE_2D;
2658		2796
2659	$self->{children}[1]->draw;	2797	$self->{children}[1]->draw;
2660
2661	}	2798	}
2662		2799
2663	#############################################################################	2800	#############################################################################
2664		2801
2665	package CFClient::UI::Animator;	2802	package CFClient::UI::Animator;
…		…
2752	$tooltip .= "\n\n" . (ref $widget) . "\n"	2889	$tooltip .= "\n\n" . (ref $widget) . "\n"
2753	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2890	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754	. "req $widget->{req_w} $widget->{req_h}\n"	2891	. "req $widget->{req_w} $widget->{req_h}\n"
2755	. "visible $widget->{visible}";	2892	. "visible $widget->{visible}";
2756	}	2893	}
		2894
		2895	$tooltip =~ s/^\n+//;
		2896	$tooltip =~ s/\n+$//;
2757		2897
2758	$self->add (new CFClient::UI::Label	2898	$self->add (new CFClient::UI::Label
2759	markup => $tooltip,	2899	markup => $tooltip,
2760	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2761	fontsize => 0.8,	2901	fontsize => 0.8,
…		…
2771	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2911	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2772		2912
2773	($w + 4, $h + 4)	2913	($w + 4, $h + 4)
2774	}	2914	}
2775		2915
2776	sub size_allocate {	2916	sub invoke_size_allocate {
2777	my ($self, $w, $h) = @_;	2917	my ($self, $w, $h) = @_;
2778		2918
2779	$self->SUPER::size_allocate ($w - 4, $h - 4);	2919	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2780	}	2920	}
2781		2921
2782	sub visibility_change {	2922	sub invoke_visibility_change {
2783	my ($self, $visible) = @_;	2923	my ($self, $visible) = @_;
2784		2924
2785	return unless $visible;	2925	return unless $visible;
2786		2926
2787	$self->{root}->on_post_alloc ("move_$self" => sub {	2927	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2789	or return;	2929	or return;
2790		2930
2791	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792		2932
2793	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794	if $x + $self->{w} > $::WIDTH;	2934	if $x + $self->{w} > $self->{root}{w};
2795		2935
2796	$self->move_abs ($x, $y);	2936	$self->move_abs ($x, $y);
2797	});	2937	});
2798	}	2938	}
2799		2939
…		…
2894	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3034	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2895	glDisable GL_TEXTURE_2D;	3035	glDisable GL_TEXTURE_2D;
2896	}	3036	}
2897	}	3037	}
2898		3038
2899	sub DESTROY {	3039	sub destroy {
2900	my ($self) = @_;	3040	my ($self) = @_;
2901		3041
2902	$self->{timer}->cancel	3042	$self->{timer}->cancel
2903	if $self->{timer};	3043	if $self->{timer};
2904		3044
2905	$self->SUPER::DESTROY;	3045	$self->SUPER::destroy;
2906	}	3046	}
2907		3047
2908	#############################################################################	3048	#############################################################################
2909		3049
2910	package CFClient::UI::Buttonbar;	3050	package CFClient::UI::Buttonbar;
…		…
2935	for my $item (@{ $self->{items} }) {	3075	for my $item (@{ $self->{items} }) {
2936	my ($widget, $cb, $tooltip) = @$item;	3076	my ($widget, $cb, $tooltip) = @$item;
2937		3077
2938	# handle various types of items, only text for now	3078	# handle various types of items, only text for now
2939	if (!ref $widget) {	3079	if (!ref $widget) {
		3080	if ($widget =~ /\t/) {
		3081	my ($left, $right) = split /\t/, $widget, 2;
		3082
		3083	$widget = new CFClient::UI::HBox
		3084	can_hover => 1,
		3085	can_events => 1,
		3086	tooltip => $tooltip,
		3087	children => [
		3088	(new CFClient::UI::Label markup => $left, expand => 1),
		3089	(new CFClient::UI::Label markup => $right, align => +1),
		3090	],
		3091	;
		3092
		3093	} else {
2940	$widget = new CFClient::UI::Label	3094	$widget = new CFClient::UI::Label
2941	can_hover => 1,	3095	can_hover => 1,
2942	can_events => 1,	3096	can_events => 1,
2943	text => $widget,	3097	markup => $widget,
2944	tooltip => $tooltip	3098	tooltip => $tooltip;
		3099	}
2945	}	3100	}
2946		3101
2947	$self->{item}{$widget} = $item;	3102	$self->{item}{$widget} = $item;
2948		3103
2949	$self->{vbox}->add ($widget);	3104	$self->{vbox}->add ($widget);
…		…
2954		3109
2955	# popup given the event (must be a mouse button down event currently)	3110	# popup given the event (must be a mouse button down event currently)
2956	sub popup {	3111	sub popup {
2957	my ($self, $ev) = @_;	3112	my ($self, $ev) = @_;
2958		3113
2959	$self->_emit ("popdown");	3114	$self->emit ("popdown");
2960		3115
2961	# maybe save $GRAB? must be careful about events...	3116	# maybe save $GRAB? must be careful about events...
2962	$GRAB = $self;	3117	$GRAB = $self;
2963	$self->{button} = $ev->{button};	3118	$self->{button} = $ev->{button};
2964		3119
2965	$self->show;	3120	$self->show;
2966	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3121	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2967	}	3122	}
2968		3123
2969	sub mouse_motion {	3124	sub invoke_mouse_motion {
2970	my ($self, $ev, $x, $y) = @_;	3125	my ($self, $ev, $x, $y) = @_;
2971		3126
2972	# TODO: should use vbox->find_widget or so	3127	# TODO: should use vbox->find_widget or so
2973	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3128	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2974	$self->{hover} = $self->{item}{$HOVER};	3129	$self->{hover} = $self->{item}{$HOVER};
2975		3130
2976	0	3131	0
2977	}	3132	}
2978		3133
2979	sub button_up {	3134	sub invoke_button_up {
2980	my ($self, $ev, $x, $y) = @_;	3135	my ($self, $ev, $x, $y) = @_;
2981		3136
2982	if ($ev->{button} == $self->{button}) {	3137	if ($ev->{button} == $self->{button}) {
2983	undef $GRAB;	3138	undef $GRAB;
2984	$self->hide;	3139	$self->hide;
2985		3140
2986	$self->_emit ("popdown");	3141	$self->emit ("popdown");
2987	$self->{hover}[1]->() if $self->{hover};	3142	$self->{hover}[1]->() if $self->{hover};
2988	} else {	3143	} else {
2989	return 0	3144	return 0
2990	}	3145	}
2991		3146
…		…
3018		3173
3019	$self->{current} = $self->{children}[0]	3174	$self->{current} = $self->{children}[0]
3020	if @{ $self->{children} };	3175	if @{ $self->{children} };
3021	}	3176	}
3022		3177
		3178	sub get_current_page {
		3179	my ($self) = @_;
		3180
		3181	$self->{current}
		3182	}
		3183
3023	sub set_current_page {	3184	sub set_current_page {
3024	my ($self, $page_or_widget) = @_;	3185	my ($self, $page_or_widget) = @_;
3025		3186
3026	my $widget = ref $page_or_widget	3187	my $widget = ref $page_or_widget
3027	? $page_or_widget	3188	? $page_or_widget
3028	: $self->{children}[$page_or_widget];	3189	: $self->{children}[$page_or_widget];
3029		3190
3030	$self->{current} = $widget;	3191	$self->{current} = $widget;
3031	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3192	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032		3193
3033	$self->_emit (page_changed => $self->{current});	3194	$self->emit (page_changed => $self->{current});
3034		3195
3035	$self->realloc;	3196	$self->realloc;
3036	}	3197	}
3037		3198
3038	sub visible_children {	3199	sub visible_children {
…		…
3043	my ($self) = @_;	3204	my ($self) = @_;
3044		3205
3045	$self->{current}->size_request	3206	$self->{current}->size_request
3046	}	3207	}
3047		3208
3048	sub size_allocate {	3209	sub invoke_size_allocate {
3049	my ($self, $w, $h) = @_;	3210	my ($self, $w, $h) = @_;
3050		3211
3051	$self->{current}->configure (0, 0, $w, $h);	3212	$self->{current}->configure (0, 0, $w, $h);
		3213
		3214	1
3052	}	3215	}
3053		3216
3054	sub _draw {	3217	sub _draw {
3055	my ($self) = @_;	3218	my ($self) = @_;
3056		3219
…		…
3091	);	3254	);
3092		3255
3093	$self->{multiplexer}->add ($widget);	3256	$self->{multiplexer}->add ($widget);
3094	}	3257	}
3095		3258
		3259	sub get_current_page {
		3260	my ($self) = @_;
		3261
		3262	$self->{multiplexer}->get_current_page
		3263	}
		3264
3096	sub set_current_page {	3265	sub set_current_page {
3097	my ($self, $page) = @_;	3266	my ($self, $page) = @_;
3098		3267
3099	$self->{multiplexer}->set_current_page ($page);	3268	$self->{multiplexer}->set_current_page ($page);
3100	$self->_emit (page_changed => $self->{multiplexer}{current});	3269	$self->emit (page_changed => $self->{multiplexer}{current});
3101	}	3270	}
3102		3271
3103	#############################################################################	3272	#############################################################################
3104		3273
3105	package CFClient::UI::Combobox;	3274	package CFClient::UI::Combobox;
…		…
3110		3279
3111	sub new {	3280	sub new {
3112	my $class = shift;	3281	my $class = shift;
3113		3282
3114	my $self = $class->SUPER::new (	3283	my $self = $class->SUPER::new (
3115	options => [], # [title, value, tooltip], ...	3284	options => [], # [value, title, longdesc], ...
3116	value => undef,	3285	value => undef,
3117	@_,	3286	@_,
3118	);	3287	);
3119		3288
3120	$self->_set_value ($self->{value});	3289	$self->_set_value ($self->{value});
3121		3290
3122	$self	3291	$self
3123	}	3292	}
3124		3293
3125	sub button_down {	3294	sub invoke_button_down {
3126	my ($self, $ev) = @_;	3295	my ($self, $ev) = @_;
3127		3296
3128	my @menu_items;	3297	my @menu_items;
3129		3298
3130	for (@{ $self->{options} }) {	3299	for (@{ $self->{options} }) {
3131	my ($title, $value, $tooltip) = @$_;	3300	my ($value, $title, $tooltip) = @$_;
3132		3301
3133	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];	3302	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134	}	3303	}
3135		3304
3136	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3305	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137	}	3306	}
3138		3307
3139	sub _set_value {	3308	sub _set_value {
3140	my ($self, $value) = @_;	3309	my ($self, $value) = @_;
3141		3310
3142	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }	3311	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3143	or return;	3312	or return;
3144		3313
3145	$self->{value} = $item->[1];	3314	$self->{value} = $item->[0];
3146	$self->set_markup ("$item->[0] ⇓");	3315	$self->set_markup ("$item->[1] ⇓");
3147	$self->set_tooltip ($item->[2]);	3316	$self->set_tooltip ($item->[2]);
3148	}	3317	}
3149		3318
3150	sub set_value {	3319	sub set_value {
3151	my ($self, $value) = @_;	3320	my ($self, $value) = @_;
3152		3321
3153	return unless $self->{value} ne $value;	3322	return unless $self->{value} ne $value;
3154		3323
3155	$self->_set_value ($value);	3324	$self->_set_value ($value);
3156	$self->_emit (changed => $value);	3325	$self->emit (changed => $value);
3157	}	3326	}
3158		3327
3159	#############################################################################	3328	#############################################################################
3160		3329
3161	package CFClient::UI::Statusbox;	3330	package CFClient::UI::Statusbox;
…		…
3260	$item->{count}++;	3429	$item->{count}++;
3261	} else {	3430	} else {
3262	$item->{count} = 1;	3431	$item->{count} = 1;
3263	$item->{text} = $item->{tooltip} = $text;	3432	$item->{text} = $item->{tooltip} = $text;
3264	}	3433	}
3265	$item->{id} = ++$self->{id};	3434	$item->{id} += 0.2;#d#
3266	$item->{timeout} = $timeout;	3435	$item->{timeout} = $timeout;
3267	delete $item->{label};	3436	delete $item->{label};
3268	} else {	3437	} else {
3269	$self->{item}{$group} = {	3438	$self->{item}{$group} = {
3270	id => ++$self->{id},	3439	id => ++$self->{id},
…		…
3276	count => 1,	3445	count => 1,
3277	%arg,	3446	%arg,
3278	};	3447	};
3279	}	3448	}
3280		3449
		3450	$ROOT->on_refresh (reorder => sub {
3281	$self->reorder;	3451	$self->reorder;
		3452	});
3282	}	3453	}
3283		3454
3284	sub reconfigure {	3455	sub reconfigure {
3285	my ($self) = @_;	3456	my ($self) = @_;
3286		3457
…		…
3289		3460
3290	$self->reorder;	3461	$self->reorder;
3291	$self->SUPER::reconfigure;	3462	$self->SUPER::reconfigure;
3292	}	3463	}
3293		3464
3294	sub DESTROY {	3465	sub destroy {
3295	my ($self) = @_;	3466	my ($self) = @_;
3296		3467
3297	$self->{timer}->cancel;	3468	$self->{timer}->cancel;
3298		3469
3299	$self->SUPER::DESTROY;	3470	$self->SUPER::destroy;
3300	}	3471	}
3301		3472
3302	#############################################################################	3473	#############################################################################
3303		3474
3304	package CFClient::UI::Inventory;	3475	package CFClient::UI::Inventory;
3305		3476
3306	our @ISA = CFClient::UI::ScrolledWindow::;	3477	our @ISA = CFClient::UI::Table::;
3307		3478
3308	sub new {	3479	sub new {
3309	my $class = shift;	3480	my $class = shift;
3310		3481
3311	my $self = $class->SUPER::new (	3482	my $self = $class->SUPER::new (
3312	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3483	col_expand => [0, 1, 0],
3313	@_,	3484	@_,
3314	);	3485	);
3315		3486
3316	$self	3487	$self
3317	}	3488	}
3318		3489
3319	sub set_items {	3490	sub set_items {
3320	my ($self, $items) = @_;	3491	my ($self, $items) = @_;
3321		3492
3322	$self->{child}->clear;	3493	$self->clear;
3323	return unless $items;	3494	return unless $items;
3324		3495
3325	my @items = sort {	3496	my @items = sort {
3326	($a->{type} <=> $b->{type})	3497	($a->{type} <=> $b->{type})
3327	or ($a->{name} cmp $b->{name})	3498	or ($a->{name} cmp $b->{name})
3328	} @$items;	3499	} values %$items;
3329		3500
3330	$self->{real_items} = \@items;	3501	$self->{real_items} = \@items;
3331		3502
3332	my $row = 0;	3503	my $row = 0;
3333	for my $item (@items) {	3504	for my $item (@items) {
3334	CFClient::Item::update_widgets $item;	3505	CFClient::Item::update_widgets $item;
3335		3506
3336	$self->{child}->add (0, $row, $item->{face_widget});	3507	$self->add (0, $row, $item->{face_widget});
3337	$self->{child}->add (1, $row, $item->{desc_widget});	3508	$self->add (1, $row, $item->{desc_widget});
3338	$self->{child}->add (2, $row, $item->{weight_widget});	3509	$self->add (2, $row, $item->{weight_widget});
3339		3510
3340	$row++;	3511	$row++;
3341	}
3342	}
3343
3344	#############################################################################
3345
3346	package CFClient::UI::BindEditor;
3347
3348	our @ISA = CFClient::UI::FancyFrame::;
3349
3350	sub new {
3351	my $class = shift;
3352
3353	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3354
3355	$self->add (my $vb = new CFClient::UI::VBox);
3356
3357
3358	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3359	text => "start recording",
3360	tooltip => "Start/Stops recording of actions."
3361	."All subsequent actions after the recording started will be captured."
3362	."The actions are displayed after the record was stopped."
3363	."To bind the action you have to click on the 'Bind' button",
3364	on_activate => sub {
3365	unless ($self->{recording}) {
3366	$self->start;
3367	} else {
3368	$self->stop;
3369	}
3370	});
3371
3372	$vb->add (new CFClient::UI::Label text => "Actions:");
3373	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3374
3375	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3376	$vb->add (my $hb = new CFClient::UI::HBox);
3377	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3378	$hb->add (new CFClient::UI::Button
3379	text => "bind",
3380	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3381	on_activate => sub {
3382	$self->ask_for_bind;
3383	});
3384
3385	$vb->add (my $hb = new CFClient::UI::HBox);
3386	$hb->add (new CFClient::UI::Button
3387	text => "ok",
3388	expand => 1,
3389	tooltip => "This closes the binding editor and saves the binding",
3390	on_activate => sub {
3391	$self->hide;
3392	$self->commit;
3393	});
3394
3395	$hb->add (new CFClient::UI::Button
3396	text => "cancel",
3397	expand => 1,
3398	tooltip => "This closes the binding editor without saving",
3399	on_activate => sub {
3400	$self->hide;
3401	$self->{binding_cancel}->()
3402	if $self->{binding_cancel};
3403	});
3404
3405	$self->update_binding_widgets;
3406
3407	$self
3408	}
3409
3410	sub commit {
3411	my ($self) = @_;
3412	my ($mod, $sym, $cmds) = $self->get_binding;
3413	if ($sym != 0 && @$cmds > 0) {
3414	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3415	."'. Don't forget 'Save Config'!");
3416	$self->{binding_change}->($mod, $sym, $cmds)
3417	if $self->{binding_change};
3418	} else {
3419	$::STATUSBOX->add ("No action bound, no key or action specified!");
3420	$self->{binding_cancel}->()
3421	if $self->{binding_cancel};
3422	}
3423	}
3424
3425	sub start {
3426	my ($self) = @_;
3427
3428	$self->{rec_btn}->set_text ("stop recording");
3429	$self->{recording} = 1;
3430	$self->clear_command_list;
3431	$::CONN->start_record if $::CONN;
3432	}
3433
3434	sub stop {
3435	my ($self) = @_;
3436
3437	$self->{rec_btn}->set_text ("start recording");
3438	$self->{recording} = 0;
3439
3440	my $rec;
3441	$rec = $::CONN->stop_record if $::CONN;
3442	return unless ref $rec eq 'ARRAY';
3443	$self->set_command_list ($rec);
3444	}
3445
3446
3447	sub ask_for_bind_and_commit {
3448	my ($self) = @_;
3449	$self->ask_for_bind (1);
3450	}
3451
3452	sub ask_for_bind {
3453	my ($self, $commit) = @_;
3454
3455	CFClient::Binder::open_binding_dialog (sub {
3456	my ($mod, $sym) = @_;
3457	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458	$self->update_binding_widgets;
3459	$self->commit if $commit;
3460	});
3461	}
3462
3463	# $mod and $sym are the modifiers and key symbol
3464	# $cmds is a array ref of strings (the commands)
3465	# $cb is the callback that is executed on OK
3466	# $ccb is the callback that is executed on CANCEL and
3467	# when the binding was unsuccessful on OK
3468	sub set_binding {
3469	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3470
3471	$self->clear_command_list;
3472	$self->{recording} = 0;
3473	$self->{rec_btn}->set_text ("start recording");
3474
3475	$self->{binding} = [$mod, $sym];
3476	$self->{commands} = $cmds;
3477
3478	$self->{binding_change} = $cb;
3479	$self->{binding_cancel} = $ccb;
3480
3481	$self->update_binding_widgets;
3482	}
3483
3484	# this is a shortcut method that asks for a binding
3485	# and then just binds it.
3486	sub do_quick_binding {
3487	my ($self, $cmds) = @_;
3488	$self->set_binding (undef, undef, $cmds, sub {
3489	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490	});
3491	$self->ask_for_bind (1);
3492	}
3493
3494	sub update_binding_widgets {
3495	my ($self) = @_;
3496	my ($mod, $sym, $cmds) = $self->get_binding;
3497	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3498	$self->set_command_list ($cmds);
3499	}
3500
3501	sub get_binding {
3502	my ($self) = @_;
3503	return (
3504	$self->{binding}->[0],
3505	$self->{binding}->[1],
3506	[ grep { defined $_ } @{$self->{commands}} ]
3507	);
3508	}
3509
3510	sub clear_command_list {
3511	my ($self) = @_;
3512	$self->{cmdbox}->clear ();
3513	}
3514
3515	sub set_command_list {
3516	my ($self, $cmds) = @_;
3517
3518	$self->{cmdbox}->clear ();
3519	$self->{commands} = $cmds;
3520
3521	my $idx = 0;
3522
3523	for (@$cmds) {
3524	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3525
3526	my $i = $idx;
3527	$hb->add (new CFClient::UI::Label text => $_);
3528	$hb->add (new CFClient::UI::Button
3529	text => "delete",
3530	tooltip => "Deletes the action from the record",
3531	on_activate => sub {
3532	$self->{cmdbox}->remove ($hb);
3533	$cmds->[$i] = undef;
3534	});
3535
3536
3537	$idx++
3538	}	3512	}
3539	}	3513	}
3540		3514
3541	#############################################################################	3515	#############################################################################
3542		3516
…		…
3552	commands => [],	3526	commands => [],
3553	@_,	3527	@_,
3554	)	3528	)
3555	}	3529	}
3556		3530
		3531	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3532
		3533	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3534	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3535	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3536	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3557	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3537	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");	3538	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3559	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3539	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");	3540	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3561	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3541	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562	"<b>Damage</b>. The amount of damage the spell deals when it hits.");	3542	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3563		3543
3564	sub rebuild_spell_list {	3544	sub rebuild_spell_list {
3565	my ($self) = @_;	3545	my ($self) = @_;
3566		3546
3567	$CFClient::UI::ROOT->on_refresh ($self => sub {	3547	$CFClient::UI::ROOT->on_refresh ($self => sub {
3568	$self->clear;	3548	$self->clear;
3569		3549
		3550	return unless $::CONN;
		3551
3570	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");	3552	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3553	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3571	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3554	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3555	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3556	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574		3557
3575	my $row = 0;	3558	my $row = 0;
3576		3559
3577	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3560	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578	my $spell = $self->{spell}{$_};	3561	my $spell = $self->{spell}{$_};
3579		3562
3580	$row++;	3563	$row++;
		3564
		3565	my $spell_cb = sub {
		3566	my ($widget, $ev) = @_;
		3567
		3568	if ($ev->{button} == 1) {
		3569	$::CONN->user_send ("cast $spell->{name}");
		3570	} elsif ($ev->{button} == 2) {
		3571	$::CONN->user_send ("invoke $spell->{name}");
		3572	} elsif ($ev->{button} == 3) {
		3573	(new CFClient::UI::Menu
		3574	items => [
		3575	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3576	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3577	],
		3578	)->popup ($ev);
		3579	} else {
		3580	return 0;
		3581	}
		3582
		3583	1
		3584	};
		3585
		3586	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3587
		3588	#TODO: add path info to tooltip
		3589	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3581		3590
3582	$self->add (0, $row, new CFClient::UI::Face	3591	$self->add (0, $row, new CFClient::UI::Face
3583	face => $spell->{face},	3592	face => $spell->{face},
3584	can_hover => 1,	3593	can_hover => 1,
3585	can_events => 1,	3594	can_events => 1,
3586	tooltip => $spell->{message},	3595	tooltip => $tooltip,
		3596	on_button_down => $spell_cb,
3587	);	3597	);
3588		3598
3589	$self->add (1, $row, new CFClient::UI::Label	3599	$self->add (1, $row, new CFClient::UI::Label
3590	expand => 1,	3600	expand => 1,
3591	text => $spell->{name},	3601	text => $spell->{name},
3592	can_hover => 1,	3602	can_hover => 1,
3593	can_events => 1,	3603	can_events => 1,
3594	tooltip => $spell->{message},	3604	tooltip => $tooltip,
		3605	on_button_down => $spell_cb,
3595	);	3606	);
3596		3607
		3608	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3609	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3610	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3611	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601	# TODO: should be done via popup
3602	$self->add (5, $row, new CFClient::UI::Button
3603	text => "bind",
3604	tooltip => "bind spell readying (cast command) to key",
3605	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606	);
3607	}	3612	}
3608	});	3613	});
3609	}	3614	}
3610		3615
3611	sub add_spell {	3616	sub add_spell {
…		…
3617		3622
3618	sub remove_spell {	3623	sub remove_spell {
3619	my ($self, $spell) = @_;	3624	my ($self, $spell) = @_;
3620		3625
3621	delete $self->{spell}->{$spell->{name}};	3626	delete $self->{spell}->{$spell->{name}};
		3627	$self->rebuild_spell_list;
		3628	}
		3629
		3630	sub clear_spells {
		3631	my ($self) = @_;
		3632
		3633	$self->{spell} = {};
3622	$self->rebuild_spell_list;	3634	$self->rebuild_spell_list;
3623	}	3635	}
3624		3636
3625	#############################################################################	3637	#############################################################################
3626		3638
…		…
3663	$coord = $max - $size if $coord > $max - $size;	3675	$coord = $max - $size if $coord > $max - $size;
3664		3676
3665	int $coord + 0.5	3677	int $coord + 0.5
3666	}	3678	}
3667		3679
3668	sub size_allocate {	3680	sub invoke_size_allocate {
3669	my ($self, $w, $h) = @_;	3681	my ($self, $w, $h) = @_;
3670		3682
3671	for my $child ($self->children) {	3683	for my $child ($self->children) {
3672	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3684	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3673		3685
…		…
3677	$X = _to_pixel $X, $W, $self->{w};	3689	$X = _to_pixel $X, $W, $self->{w};
3678	$Y = _to_pixel $Y, $H, $self->{h};	3690	$Y = _to_pixel $Y, $H, $self->{h};
3679		3691
3680	$child->configure ($X, $Y, $W, $H);	3692	$child->configure ($X, $Y, $W, $H);
3681	}	3693	}
		3694
		3695	1
3682	}	3696	}
3683		3697
3684	sub coord2local {	3698	sub coord2local {
3685	my ($self, $x, $y) = @_;	3699	my ($self, $x, $y) = @_;
3686		3700
…		…
3812	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3826	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3813		3827
3814	$w = 0 if $w < 0;	3828	$w = 0 if $w < 0;
3815	$h = 0 if $h < 0;	3829	$h = 0 if $h < 0;
3816		3830
		3831	$w = max $widget->{min_w}, $w;
		3832	$h = max $widget->{min_h}, $h;
		3833
		3834	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3835	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3836
3817	$w = int $w + 0.5;	3837	$w = int $w + 0.5;
3818	$h = int $h + 0.5;	3838	$h = int $h + 0.5;
3819		3839
3820	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3840	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3821	$widget->{old_w} = $widget->{w};	3841	$widget->{old_w} = $widget->{w};

Diff Legend

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