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.286 by root, Mon Jun 5 03:48:49 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);
		1609
1559	delete $self->{req_h};	1610	delete $self->{size_req};
1560
1561	$self->realloc;	1611	$self->realloc;
1562	$self->update;	1612	$self->update;
1563	}	1613	}
1564		1614
1565	sub set_markup {	1615	sub set_markup {
…		…
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);
		1624
1575	delete $self->{req_h};	1625	delete $self->{size_req};
1576
1577	$self->realloc;	1626	$self->realloc;
1578	$self->update;	1627	$self->update;
1579	}	1628	}
1580		1629
1581	sub size_request {	1630	sub size_request {
1582	my ($self) = @_;	1631	my ($self) = @_;
1583		1632
1584	if (exists $self->{req_h}) {	1633	$self->{size_req} ||= do {
1585	@$self{qw(req_w req_h)}
1586	} else {
1587	$self->{layout}->set_font ($self->{font}) if $self->{font};	1634	$self->{layout}->set_font ($self->{font}) if $self->{font};
1588	$self->{layout}->set_width ($self->{max_w} || -1);	1635	$self->{layout}->set_width ($self->{max_w} || -1);
1589	$self->{layout}->set_ellipsise ($self->{ellipsise});	1636	$self->{layout}->set_ellipsise ($self->{ellipsise});
1590	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1637	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1638	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592		1639
1593	my ($w, $h) = $self->{layout}->size;	1640	my ($w, $h) = $self->{layout}->size;
1594		1641
1595	if (exists $self->{template}) {	1642	if (exists $self->{template}) {
1596	$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);
1597	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1645	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598		1646
1599	my ($w2, $h2) = $self->{template}->size;	1647	my ($w2, $h2) = $self->{template}->size;
1600		1648
1601	$w = List::Util::max $w, $w2;	1649	$w = List::Util::max $w, $w2;
1602	$h = List::Util::max $h, $h2;	1650	$h = List::Util::max $h, $h2;
1603	}	1651	}
1604		1652
1605	($w, $h)	1653	[$w, $h]
1606	}	1654	};
1607	}
1608		1655
		1656	@{ $self->{size_req} }
		1657	}
		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
		1684	sub reconfigure {
		1685	my ($self) = @_;
		1686
		1687	delete $self->{size_req};
		1688	delete $self->{texture};
		1689
		1690	$self->SUPER::reconfigure;
		1691	}
		1692
1627	sub _draw {	1693	sub _draw {
1628	my ($self) = @_;	1694	my ($self) = @_;
1629		1695
1630	$self->SUPER::_draw; # draw background, if applicable	1696	$self->SUPER::_draw; # draw background, if applicable
1631		1697
1632	my $tex = $self->{texture} ||= do {	1698	my $size = $self->{texture} ||= do {
1633	$self->{layout}->set_foreground (@{$self->{fg}});	1699	$self->{layout}->set_foreground (@{$self->{fg}});
1634	$self->{layout}->set_font ($self->{font}) if $self->{font};	1700	$self->{layout}->set_font ($self->{font}) if $self->{font};
1635	$self->{layout}->set_width ($self->{w});	1701	$self->{layout}->set_width ($self->{w});
1636	$self->{layout}->set_ellipsise ($self->{ellipsise});	1702	$self->{layout}->set_ellipsise ($self->{ellipsise});
1637	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1703	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1704	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639		1705
1640	new_from_layout CFClient::Texture $self->{layout}	1706	[$self->{layout}->size]
1641	};	1707	};
1642		1708
1643	unless (exists $self->{ox}) {	1709	unless (exists $self->{ox}) {
1644	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1710	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1711	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646	: ($self->{w} - $tex->{w}) * 0.5);	1712	: ($self->{w} - $size->[0]) * 0.5);
1647		1713
1648	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1714	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1715	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650	: ($self->{h} - $tex->{h}) * 0.5);	1716	: ($self->{h} - $size->[1]) * 0.5);
1651	};	1717	};
1652		1718
1653	glEnable GL_TEXTURE_2D;	1719	my $w = List::Util::min $self->{w} + 4, $size->[0];
1654	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1720	my $h = List::Util::min $self->{h} + 2, $size->[1];
1655		1721
1656	if ($tex->{format} == GL_ALPHA) {	1722	$self->{layout}->render ($self->{ox}, $self->{oy});
1657	glColor @{$self->{fg}};
1658	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659	} else {
1660	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1661	}
1662
1663	glDisable GL_TEXTURE_2D;
1664	}	1723	}
1665		1724
1666	#############################################################################	1725	#############################################################################
1667		1726
1668	package CFClient::UI::EntryBase;	1727	package CFClient::UI::EntryBase;
…		…
1682	can_hover => 1,	1741	can_hover => 1,
1683	can_focus => 1,	1742	can_focus => 1,
1684	valign => 0,	1743	valign => 0,
1685	can_events => 1,	1744	can_events => 1,
1686	#text => ...	1745	#text => ...
		1746	#hidden => "*",
1687	@_	1747	@_
1688	)	1748	)
1689	}	1749	}
1690		1750
1691	sub _set_text {	1751	sub _set_text {
…		…
1698	$self->{last_activity} = $::NOW;	1758	$self->{last_activity} = $::NOW;
1699	$self->{text} = $text;	1759	$self->{text} = $text;
1700		1760
1701	$text =~ s/./*/g if $self->{hidden};	1761	$text =~ s/./*/g if $self->{hidden};
1702	$self->{layout}->set_text ("$text ");	1762	$self->{layout}->set_text ("$text ");
1703	delete $self->{req_h};	1763	delete $self->{size_req};
1704		1764
1705	$self->_emit (changed => $self->{text});	1765	$self->emit (changed => $self->{text});
1706		1766
1707	$self->realloc;	1767	$self->realloc;
1708	$self->update;	1768	$self->update;
1709	}	1769	}
1710		1770
…		…
1725	my ($w, $h) = $self->SUPER::size_request;	1785	my ($w, $h) = $self->SUPER::size_request;
1726		1786
1727	($w + 1, $h) # add 1 for cursor	1787	($w + 1, $h) # add 1 for cursor
1728	}	1788	}
1729		1789
1730	sub key_down {	1790	sub invoke_key_down {
1731	my ($self, $ev) = @_;	1791	my ($self, $ev) = @_;
1732		1792
1733	my $mod = $ev->{mod};	1793	my $mod = $ev->{mod};
1734	my $sym = $ev->{sym};	1794	my $sym = $ev->{sym};
1735	my $uni = $ev->{unicode};	1795	my $uni = $ev->{unicode};
…		…
1747	} elsif ($sym == CFClient::SDLK_HOME) {	1807	} elsif ($sym == CFClient::SDLK_HOME) {
1748	$self->{cursor} = 0;	1808	$self->{cursor} = 0;
1749	} elsif ($sym == CFClient::SDLK_END) {	1809	} elsif ($sym == CFClient::SDLK_END) {
1750	$self->{cursor} = length $text;	1810	$self->{cursor} = length $text;
1751	} elsif ($uni == 27) {	1811	} elsif ($uni == 27) {
1752	$self->_emit ('escape');	1812	$self->emit ('escape');
1753	} elsif ($uni) {	1813	} elsif ($uni) {
1754	substr $text, $self->{cursor}++, 0, chr $uni;	1814	substr $text, $self->{cursor}++, 0, chr $uni;
1755	} else {	1815	} else {
1756	return 0;	1816	return 0;
1757	}	1817	}
…		…
1761	$self->realloc;	1821	$self->realloc;
1762		1822
1763	1	1823	1
1764	}	1824	}
1765		1825
1766	sub focus_in {	1826	sub invoke_focus_in {
1767	my ($self) = @_;	1827	my ($self) = @_;
1768		1828
1769	$self->{last_activity} = $::NOW;	1829	$self->{last_activity} = $::NOW;
1770		1830
1771	$self->SUPER::focus_in;	1831	$self->SUPER::invoke_focus_in
1772	}	1832	}
1773		1833
1774	sub button_down {	1834	sub invoke_button_down {
1775	my ($self, $ev, $x, $y) = @_;	1835	my ($self, $ev, $x, $y) = @_;
1776		1836
1777	$self->SUPER::button_down ($ev, $x, $y);	1837	$self->SUPER::invoke_button_down ($ev, $x, $y);
1778		1838
1779	my $idx = $self->{layout}->xy_to_index ($x, $y);	1839	my $idx = $self->{layout}->xy_to_index ($x, $y);
1780		1840
1781	# byte-index to char-index	1841	# byte-index to char-index
1782	my $text = $self->{text};	1842	my $text = $self->{text};
1783	utf8::encode $text;	1843	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1784	$self->{cursor} = length substr $text, 0, $idx;	1844	$self->{cursor} = length $text;
1785		1845
1786	$self->_set_text ($self->{text});	1846	$self->_set_text ($self->{text});
1787	$self->update;	1847	$self->update;
1788		1848
1789	1	1849	1
1790	}	1850	}
1791		1851
1792	sub mouse_motion {	1852	sub invoke_mouse_motion {
1793	my ($self, $ev, $x, $y) = @_;	1853	my ($self, $ev, $x, $y) = @_;
1794	# 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#
1795		1855
1796	0	1856	1
1797	}	1857	}
1798		1858
1799	sub _draw {	1859	sub _draw {
1800	my ($self) = @_;	1860	my ($self) = @_;
1801		1861
…		…
1842		1902
1843	our @ISA = CFClient::UI::EntryBase::;	1903	our @ISA = CFClient::UI::EntryBase::;
1844		1904
1845	use CFClient::OpenGL;	1905	use CFClient::OpenGL;
1846		1906
1847	sub key_down {	1907	sub invoke_key_down {
1848	my ($self, $ev) = @_;	1908	my ($self, $ev) = @_;
1849		1909
1850	my $sym = $ev->{sym};	1910	my $sym = $ev->{sym};
1851		1911
1852	if ($sym == 13) {	1912	if ($sym == 13) {
1853	unshift @{$self->{history}},	1913	unshift @{$self->{history}},
1854	my $txt = $self->get_text;	1914	my $txt = $self->get_text;
		1915
1855	$self->{history_pointer} = -1;	1916	$self->{history_pointer} = -1;
1856	$self->{history_saveback} = '';	1917	$self->{history_saveback} = '';
1857	$self->_emit (activate => $txt);	1918	$self->emit (activate => $txt);
1858	$self->update;	1919	$self->update;
1859		1920
1860	} elsif ($sym == CFClient::SDLK_UP) {	1921	} elsif ($sym == CFClient::SDLK_UP) {
1861	if ($self->{history_pointer} < 0) {	1922	if ($self->{history_pointer} < 0) {
1862	$self->{history_saveback} = $self->get_text;	1923	$self->{history_saveback} = $self->get_text;
…		…
1878	} else {	1939	} else {
1879	$self->set_text ($self->{history_saveback});	1940	$self->set_text ($self->{history_saveback});
1880	}	1941	}
1881		1942
1882	} else {	1943	} else {
1883	return $self->SUPER::key_down ($ev)	1944	return $self->SUPER::invoke_key_down ($ev)
1884	}	1945	}
1885		1946
1886	1	1947	1
1887	}	1948	}
1888		1949
…		…
1912	can_events => 1,	1973	can_events => 1,
1913	@_	1974	@_
1914	)	1975	)
1915	}	1976	}
1916		1977
1917	sub activate { }
1918
1919	sub button_up {	1978	sub invoke_button_up {
1920	my ($self, $ev, $x, $y) = @_;	1979	my ($self, $ev, $x, $y) = @_;
1921		1980
1922	$self->emit ("activate")	1981	$self->emit ("activate")
1923	if $x >= 0 && $x < $self->{w}	1982	if $x >= 0 && $x < $self->{w}
1924	&& $y >= 0 && $y < $self->{h};	1983	&& $y >= 0 && $y < $self->{h};
…		…
1938	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1997	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1939		1998
1940	glDisable GL_TEXTURE_2D;	1999	glDisable GL_TEXTURE_2D;
1941		2000
1942	$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
1943	}	2038	}
1944		2039
1945	#############################################################################	2040	#############################################################################
1946		2041
1947	package CFClient::UI::CheckBox;	2042	package CFClient::UI::CheckBox;
…		…
1974	my ($self) = @_;	2069	my ($self) = @_;
1975		2070
1976	(6) x 2	2071	(6) x 2
1977	}	2072	}
1978		2073
		2074	sub toggle {
		2075	my ($self) = @_;
		2076
		2077	$self->{state} = !$self->{state};
		2078	$self->emit (changed => $self->{state});
		2079	$self->update;
		2080	}
		2081
1979	sub button_down {	2082	sub invoke_button_down {
1980	my ($self, $ev, $x, $y) = @_;	2083	my ($self, $ev, $x, $y) = @_;
1981		2084
1982	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984	$self->{state} = !$self->{state};	2087	$self->toggle;
1985	$self->_emit (changed => $self->{state});
1986	} else {	2088	} else {
1987	return 0	2089	return 0
1988	}	2090	}
1989		2091
1990	1	2092	1
…		…
2015	package CFClient::UI::Image;	2117	package CFClient::UI::Image;
2016		2118
2017	our @ISA = CFClient::UI::Base::;	2119	our @ISA = CFClient::UI::Base::;
2018		2120
2019	use CFClient::OpenGL;	2121	use CFClient::OpenGL;
2020	use Carp qw/confess/;
2021		2122
2022	our %loaded_images;	2123	our %texture_cache;
2023		2124
2024	sub new {	2125	sub new {
2025	my $class = shift;	2126	my $class = shift;
2026		2127
2027	my $self = $class->SUPER::new (can_events => 0, @_);	2128	my $self = $class->SUPER::new (
		2129	can_events => 0,
		2130	@_,
		2131	);
2028		2132
2029	$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";
2030		2135
2031	$loaded_images{$self->{image}} ||=	2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2032	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;
2033		2138
2034	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2035		2140
2036	Scalar::Util::weaken $loaded_images{$self->{image}};	2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038	$self->{aspect} = $tex->{w} / $tex->{h};
2039		2142
2040	$self	2143	$self
2041	}	2144	}
2042		2145
2043	sub size_request {	2146	sub size_request {
2044	my ($self) = @_;	2147	my ($self) = @_;
2045		2148
2046	($self->{tex}->{w}, $self->{tex}->{h})	2149	($self->{tex}{w}, $self->{tex}{h})
2047	}	2150	}
2048		2151
2049	sub _draw {	2152	sub _draw {
2050	my ($self) = @_;	2153	my ($self) = @_;
2051		2154
…		…
2160	my $ycut1 = max 0, min 1, $ycut;	2263	my $ycut1 = max 0, min 1, $ycut;
2161	my $ycut2 = max 0, min 1, $ycut - 1;	2264	my $ycut2 = max 0, min 1, $ycut - 1;
2162		2265
2163	my $h1 = $self->{h} * (1 - $ycut1);	2266	my $h1 = $self->{h} * (1 - $ycut1);
2164	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);
2165		2271
2166	glEnable GL_BLEND;	2272	glEnable GL_BLEND;
2167	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2273	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2274	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169	glEnable GL_TEXTURE_2D;	2275	glEnable GL_TEXTURE_2D;
…		…
2188		2294
2189	if ($t3) {	2295	if ($t3) {
2190	glBindTexture GL_TEXTURE_2D, $t3->{name};	2296	glBindTexture GL_TEXTURE_2D, $t3->{name};
2191	glBegin GL_QUADS;	2297	glBegin GL_QUADS;
2192	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2298	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2193	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2299	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2194	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2300	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2195	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2301	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2196	glEnd;	2302	glEnd;
2197	}	2303	}
2198		2304
2199	glDisable GL_BLEND;	2305	glDisable GL_BLEND;
…		…
2287	$self->update;	2393	$self->update;
2288		2394
2289	$self	2395	$self
2290	}	2396	}
2291		2397
2292	sub changed { }
2293
2294	sub set_range {	2398	sub set_range {
2295	my ($self, $range) = @_;	2399	my ($self, $range) = @_;
2296		2400
2297	($range, $self->{range}) = ($self->{range}, $range);	2401	($range, $self->{range}) = ($self->{range}, $range);
2298		2402
2299	$self->update
2300	if "@$range" ne "@{$self->{range}}";	2403	if ("@$range" ne "@{$self->{range}}") {
		2404	$self->update;
		2405	$self->set_value ($self->{range}[0]);
		2406	}
2301	}	2407	}
2302		2408
2303	sub set_value {	2409	sub set_value {
2304	my ($self, $value) = @_;	2410	my ($self, $value) = @_;
2305		2411
…		…
2316	if $unit;	2422	if $unit;
2317		2423
2318	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2424	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319		2425
2320	if ($value != $old_value) {	2426	if ($value != $old_value) {
2321	$self->_emit (changed => $value);	2427	$self->emit (changed => $value);
2322	$self->update;	2428	$self->update;
2323	}	2429	}
2324	}	2430	}
2325		2431
2326	sub size_request {	2432	sub size_request {
2327	my ($self) = @_;	2433	my ($self) = @_;
2328		2434
2329	($self->{req_w}, $self->{req_h})	2435	($self->{req_w}, $self->{req_h})
2330	}	2436	}
2331		2437
2332	sub button_down {	2438	sub invoke_button_down {
2333	my ($self, $ev, $x, $y) = @_;	2439	my ($self, $ev, $x, $y) = @_;
2334		2440
2335	$self->SUPER::button_down ($ev, $x, $y);	2441	$self->SUPER::invoke_button_down ($ev, $x, $y);
2336		2442
2337	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2443	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338		2444
2339	$self->mouse_motion ($ev, $x, $y)	2445	$self->invoke_mouse_motion ($ev, $x, $y)
2340	}	2446	}
2341		2447
2342	sub mouse_motion {	2448	sub invoke_mouse_motion {
2343	my ($self, $ev, $x, $y) = @_;	2449	my ($self, $ev, $x, $y) = @_;
2344		2450
2345	if ($GRAB == $self) {	2451	if ($GRAB == $self) {
2346	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2452	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347		2453
…		…
2452	sub set_range { shift->{slider}->set_range (@_) }	2558	sub set_range { shift->{slider}->set_range (@_) }
2453	sub set_value { shift->{slider}->set_value (@_) }	2559	sub set_value { shift->{slider}->set_value (@_) }
2454		2560
2455	#############################################################################	2561	#############################################################################
2456		2562
2457	package CFClient::UI::TextView;	2563	package CFClient::UI::TextScroller;
2458		2564
2459	our @ISA = CFClient::UI::HBox::;	2565	our @ISA = CFClient::UI::HBox::;
2460		2566
2461	use CFClient::OpenGL;	2567	use CFClient::OpenGL;
2462		2568
…		…
2464	my $class = shift;	2570	my $class = shift;
2465		2571
2466	my $self = $class->SUPER::new (	2572	my $self = $class->SUPER::new (
2467	fontsize => 1,	2573	fontsize => 1,
2468	can_events => 0,	2574	can_events => 0,
		2575	indent => 0,
2469	#font => default_font	2576	#font => default_font
2470	@_,	2577	@_,
2471		2578
2472	layout => (new CFClient::Layout 1),	2579	layout => (new CFClient::Layout),
2473	par => [],	2580	par => [],
2474	height => 0,	2581	height => 0,
2475	children => [	2582	children => [
2476	(new CFClient::UI::Empty expand => 1),	2583	(new CFClient::UI::Empty expand => 1),
2477	(new CFClient::UI::Slider vertical => 1),	2584	(new CFClient::UI::Slider vertical => 1),
…		…
2488		2595
2489	$self->{fontsize} = $fontsize;	2596	$self->{fontsize} = $fontsize;
2490	$self->reflow;	2597	$self->reflow;
2491	}	2598	}
2492		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
2493	sub size_allocate {	2609	sub invoke_size_allocate {
2494	my ($self, $w, $h) = @_;	2610	my ($self, $w, $h) = @_;
2495		2611
2496	$self->SUPER::size_allocate ($w, $h);	2612	my ($empty, $slider, @other) = @{ $self->{children} };
		2613	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497		2614
2498	$self->{layout}->set_font ($self->{font}) if $self->{font};	2615	$self->{layout}->set_font ($self->{font}) if $self->{font};
2499	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2616	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500	$self->{layout}->set_width ($self->{children}[0]{w});	2617	$self->{layout}->set_width ($empty->{w});
		2618	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501		2619
2502	$self->reflow;	2620	$self->reflow;
2503	}
2504		2621
2505	sub text_size {	2622	local $self->{children} = [$empty, $slider];
2506	my ($self, $text, $indent) = @_;	2623	$self->SUPER::invoke_size_allocate ($w, $h)
		2624	}
		2625
		2626	sub get_layout {
		2627	my ($self, $para) = @_;
2507		2628
2508	my $layout = $self->{layout};	2629	my $layout = $self->{layout};
2509		2630
		2631	$layout->set_font ($self->{font}) if $self->{font};
		2632	$layout->set_foreground (@{$para->{fg}});
2510	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2633	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511	$layout->set_width ($self->{children}[0]{w} - $indent);	2634	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2635	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512	$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}}
2513		2642	);
		2643
2514	$layout->size	2644	$layout
2515	}	2645	}
2516		2646
2517	sub reflow {	2647	sub reflow {
2518	my ($self) = @_;	2648	my ($self) = @_;
2519		2649
…		…
2528	$self->{children}[1]->set_value ($offset);	2658	$self->{children}[1]->set_value ($offset);
2529	}	2659	}
2530		2660
2531	sub clear {	2661	sub clear {
2532	my ($self) = @_;	2662	my ($self) = @_;
		2663
		2664	my (undef, undef, @other) = @{ $self->{children} };
		2665	$self->remove ($_) for @other;
2533		2666
2534	$self->{par} = [];	2667	$self->{par} = [];
2535	$self->{height} = 0;	2668	$self->{height} = 0;
2536	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537	}	2670	}
2538		2671
2539	sub add_paragraph {	2672	sub add_paragraph {
2540	my ($self, $color, $text, $indent) = @_;	2673	my ($self, $color, $para, $indent) = @_;
2541		2674
2542	for my $line (split /\n/, $text) {	2675	my ($text, @w) = ref $para ? @$para : $para;
2543	my ($w, $h) = $self->text_size ($line);	2676
2544	$self->{height} += $h;	2677	$para = {
2545	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,
2546	}	2684	};
2547		2685
2548	$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;
2549	}	2698	}
2550		2699
2551	sub update {	2700	sub update {
2552	my ($self) = @_;	2701	my ($self) = @_;
2553		2702
…		…
2555		2704
2556	return unless $self->{h} > 0;	2705	return unless $self->{h} > 0;
2557		2706
2558	delete $self->{texture};	2707	delete $self->{texture};
2559		2708
2560	$ROOT->on_post_alloc ($self, sub {	2709	$ROOT->on_post_alloc ($self => sub {
2561	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562		2711
2563	if (delete $self->{need_reflow}) {	2712	if (delete $self->{need_reflow}) {
2564	my $height = 0;	2713	my $height = 0;
2565		2714
2566	my $layout = $self->{layout};
2567
2568	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570	for (@{$self->{par}}) {	2715	for my $para (@{$self->{par}}) {
2571	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2572	$layout->set_width ($W - $_->[3]);	2717	my $layout = $self->get_layout ($para);
2573	$layout->set_markup ($_->[4]);
2574	my ($w, $h) = $layout->size;	2718	my ($w, $h) = $layout->size;
2575	$_->[0] = $w + $_->[3];	2719
2576	$_->[1] = $h;	2720	$para->{w} = $w + $para->{indent};
		2721	$para->{h} = $h;
		2722	$para->{wrapped} = $layout->has_wrapped;
2577	}	2723	}
2578		2724
2579	$height += $_->[1];	2725	$height += $para->{h};
2580	}	2726	}
2581		2727
2582	$self->{height} = $height;	2728	$self->{height} = $height;
2583		2729
2584	$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]);
2585		2731
2586	delete $self->{texture};	2732	delete $self->{texture};
		2733	}
		2734
		2735	if (delete $self->{scroll_to_bottom}) {
		2736	$self->{children}[1]->set_value (1e10);
2587	}	2737	}
2588		2738
2589	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2590	glClearColor 0, 0, 0, 0;	2740	glClearColor 0, 0, 0, 0;
2591	glClear GL_COLOR_BUFFER_BIT;	2741	glClear GL_COLOR_BUFFER_BIT;
…		…
2595	my $y0 = $top;	2745	my $y0 = $top;
2596	my $y1 = $top + $H;	2746	my $y1 = $top + $H;
2597		2747
2598	my $y = 0;	2748	my $y = 0;
2599		2749
2600	my $layout = $self->{layout};
2601
2602	$layout->set_font ($self->{font}) if $self->{font};
2603
2604	glEnable GL_BLEND;
2605	#TODO# not correct in windows where rgba is forced off
2606	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2607
2608	for my $par (@{$self->{par}}) {	2750	for my $para (@{$self->{par}}) {
2609	my $h = $par->[1];	2751	my $h = $para->{h};
2610		2752
2611	if ($y0 < $y + $h && $y < $y1) {	2753	if ($y0 < $y + $h && $y < $y1) {
2612	$layout->set_foreground (@{ $par->[2] });
2613	$layout->set_width ($W - $par->[3]);
2614	$layout->set_markup ($par->[4]);
2615		2754
2616	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2755	my $layout = $self->get_layout ($para);
2617		2756
2618	glRasterPos $par->[3], $y - $y0;	2757	$layout->render ($para->{indent}, $y - $y0);
2619	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	}
2620	}	2771	}
2621		2772
2622	$y += $h;	2773	$y += $h;
2623	}	2774	}
2624
2625	glDisable GL_BLEND;
2626	};	2775	};
2627	});	2776	});
		2777	}
		2778
		2779	sub reconfigure {
		2780	my ($self) = @_;
		2781
		2782	$self->SUPER::reconfigure;
		2783
		2784	$_->{w} = 1e10 for @{ $self->{par} };
		2785	$self->reflow;
2628	}	2786	}
2629		2787
2630	sub _draw {	2788	sub _draw {
2631	my ($self) = @_;	2789	my ($self) = @_;
2632		2790
…		…
2635	glColor 0, 0, 0, 1;	2793	glColor 0, 0, 0, 1;
2636	$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});
2637	glDisable GL_TEXTURE_2D;	2795	glDisable GL_TEXTURE_2D;
2638		2796
2639	$self->{children}[1]->draw;	2797	$self->{children}[1]->draw;
2640
2641	}	2798	}
2642		2799
2643	#############################################################################	2800	#############################################################################
2644		2801
2645	package CFClient::UI::Animator;	2802	package CFClient::UI::Animator;
…		…
2732	$tooltip .= "\n\n" . (ref $widget) . "\n"	2889	$tooltip .= "\n\n" . (ref $widget) . "\n"
2733	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2890	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734	. "req $widget->{req_w} $widget->{req_h}\n"	2891	. "req $widget->{req_w} $widget->{req_h}\n"
2735	. "visible $widget->{visible}";	2892	. "visible $widget->{visible}";
2736	}	2893	}
		2894
		2895	$tooltip =~ s/^\n+//;
		2896	$tooltip =~ s/\n+$//;
2737		2897
2738	$self->add (new CFClient::UI::Label	2898	$self->add (new CFClient::UI::Label
2739	markup => $tooltip,	2899	markup => $tooltip,
2740	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741	fontsize => 0.8,	2901	fontsize => 0.8,
…		…
2751	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2911	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752		2912
2753	($w + 4, $h + 4)	2913	($w + 4, $h + 4)
2754	}	2914	}
2755		2915
2756	sub size_allocate {	2916	sub invoke_size_allocate {
2757	my ($self, $w, $h) = @_;	2917	my ($self, $w, $h) = @_;
2758		2918
2759	$self->SUPER::size_allocate ($w - 4, $h - 4);	2919	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760	}	2920	}
2761		2921
2762	sub visibility_change {	2922	sub invoke_visibility_change {
2763	my ($self, $visible) = @_;	2923	my ($self, $visible) = @_;
2764		2924
2765	return unless $visible;	2925	return unless $visible;
2766		2926
2767	$self->{root}->on_post_alloc ("move_$self" => sub {	2927	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2769	or return;	2929	or return;
2770		2930
2771	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772		2932
2773	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774	if $x + $self->{w} > $::WIDTH;	2934	if $x + $self->{w} > $self->{root}{w};
2775		2935
2776	$self->move_abs ($x, $y);	2936	$self->move_abs ($x, $y);
2777	});	2937	});
2778	}	2938	}
2779		2939
…		…
2874	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3034	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875	glDisable GL_TEXTURE_2D;	3035	glDisable GL_TEXTURE_2D;
2876	}	3036	}
2877	}	3037	}
2878		3038
2879	sub DESTROY {	3039	sub destroy {
2880	my ($self) = @_;	3040	my ($self) = @_;
2881		3041
2882	$self->{timer}->cancel	3042	$self->{timer}->cancel
2883	if $self->{timer};	3043	if $self->{timer};
2884		3044
2885	$self->SUPER::DESTROY;	3045	$self->SUPER::destroy;
2886	}	3046	}
2887		3047
2888	#############################################################################	3048	#############################################################################
2889		3049
2890	package CFClient::UI::Buttonbar;	3050	package CFClient::UI::Buttonbar;
…		…
2911	);	3071	);
2912		3072
2913	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3073	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2914		3074
2915	for my $item (@{ $self->{items} }) {	3075	for my $item (@{ $self->{items} }) {
2916	my ($widget, $cb) = @$item;	3076	my ($widget, $cb, $tooltip) = @$item;
2917		3077
2918	# handle various types of items, only text for now	3078	# handle various types of items, only text for now
2919	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 {
2920	$widget = new CFClient::UI::Label	3094	$widget = new CFClient::UI::Label
2921	can_hover => 1,	3095	can_hover => 1,
2922	can_events => 1,	3096	can_events => 1,
2923	text => $widget;	3097	markup => $widget,
		3098	tooltip => $tooltip;
		3099	}
2924	}	3100	}
2925		3101
2926	$self->{item}{$widget} = $item;	3102	$self->{item}{$widget} = $item;
2927		3103
2928	$self->{vbox}->add ($widget);	3104	$self->{vbox}->add ($widget);
…		…
2933		3109
2934	# 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)
2935	sub popup {	3111	sub popup {
2936	my ($self, $ev) = @_;	3112	my ($self, $ev) = @_;
2937		3113
2938	$self->_emit ("popdown");	3114	$self->emit ("popdown");
2939		3115
2940	# maybe save $GRAB? must be careful about events...	3116	# maybe save $GRAB? must be careful about events...
2941	$GRAB = $self;	3117	$GRAB = $self;
2942	$self->{button} = $ev->{button};	3118	$self->{button} = $ev->{button};
2943		3119
2944	$self->show;	3120	$self->show;
2945	$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);
2946	}	3122	}
2947		3123
2948	sub mouse_motion {	3124	sub invoke_mouse_motion {
2949	my ($self, $ev, $x, $y) = @_;	3125	my ($self, $ev, $x, $y) = @_;
2950		3126
2951	# TODO: should use vbox->find_widget or so	3127	# TODO: should use vbox->find_widget or so
2952	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3128	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953	$self->{hover} = $self->{item}{$HOVER};	3129	$self->{hover} = $self->{item}{$HOVER};
2954		3130
2955	0	3131	0
2956	}	3132	}
2957		3133
2958	sub button_up {	3134	sub invoke_button_up {
2959	my ($self, $ev, $x, $y) = @_;	3135	my ($self, $ev, $x, $y) = @_;
2960		3136
2961	if ($ev->{button} == $self->{button}) {	3137	if ($ev->{button} == $self->{button}) {
2962	undef $GRAB;	3138	undef $GRAB;
2963	$self->hide;	3139	$self->hide;
2964		3140
2965	$self->_emit ("popdown");	3141	$self->emit ("popdown");
2966	$self->{hover}[1]->() if $self->{hover};	3142	$self->{hover}[1]->() if $self->{hover};
2967	} else {	3143	} else {
2968	return 0	3144	return 0
2969	}	3145	}
2970		3146
…		…
2997		3173
2998	$self->{current} = $self->{children}[0]	3174	$self->{current} = $self->{children}[0]
2999	if @{ $self->{children} };	3175	if @{ $self->{children} };
3000	}	3176	}
3001		3177
		3178	sub get_current_page {
		3179	my ($self) = @_;
		3180
		3181	$self->{current}
		3182	}
		3183
3002	sub set_current_page {	3184	sub set_current_page {
3003	my ($self, $page_or_widget) = @_;	3185	my ($self, $page_or_widget) = @_;
3004		3186
3005	my $widget = ref $page_or_widget	3187	my $widget = ref $page_or_widget
3006	? $page_or_widget	3188	? $page_or_widget
3007	: $self->{children}[$page_or_widget];	3189	: $self->{children}[$page_or_widget];
3008		3190
3009	$self->{current} = $widget;	3191	$self->{current} = $widget;
3010	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3192	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011		3193
3012	$self->_emit (page_changed => $self->{current});	3194	$self->emit (page_changed => $self->{current});
3013		3195
3014	$self->realloc;	3196	$self->realloc;
3015	}	3197	}
3016		3198
3017	sub visible_children {	3199	sub visible_children {
…		…
3022	my ($self) = @_;	3204	my ($self) = @_;
3023		3205
3024	$self->{current}->size_request	3206	$self->{current}->size_request
3025	}	3207	}
3026		3208
3027	sub size_allocate {	3209	sub invoke_size_allocate {
3028	my ($self, $w, $h) = @_;	3210	my ($self, $w, $h) = @_;
3029		3211
3030	$self->{current}->configure (0, 0, $w, $h);	3212	$self->{current}->configure (0, 0, $w, $h);
		3213
		3214	1
3031	}	3215	}
3032		3216
3033	sub _draw {	3217	sub _draw {
3034	my ($self) = @_;	3218	my ($self) = @_;
3035		3219
…		…
3070	);	3254	);
3071		3255
3072	$self->{multiplexer}->add ($widget);	3256	$self->{multiplexer}->add ($widget);
3073	}	3257	}
3074		3258
		3259	sub get_current_page {
		3260	my ($self) = @_;
		3261
		3262	$self->{multiplexer}->get_current_page
		3263	}
		3264
3075	sub set_current_page {	3265	sub set_current_page {
3076	my ($self, $page) = @_;	3266	my ($self, $page) = @_;
3077		3267
3078	$self->{multiplexer}->set_current_page ($page);	3268	$self->{multiplexer}->set_current_page ($page);
3079	$self->_emit (page_changed => $self->{multiplexer}{current});	3269	$self->emit (page_changed => $self->{multiplexer}{current});
		3270	}
		3271
		3272	#############################################################################
		3273
		3274	package CFClient::UI::Combobox;
		3275
		3276	use utf8;
		3277
		3278	our @ISA = CFClient::UI::Button::;
		3279
		3280	sub new {
		3281	my $class = shift;
		3282
		3283	my $self = $class->SUPER::new (
		3284	options => [], # [value, title, longdesc], ...
		3285	value => undef,
		3286	@_,
		3287	);
		3288
		3289	$self->_set_value ($self->{value});
		3290
		3291	$self
		3292	}
		3293
		3294	sub invoke_button_down {
		3295	my ($self, $ev) = @_;
		3296
		3297	my @menu_items;
		3298
		3299	for (@{ $self->{options} }) {
		3300	my ($value, $title, $tooltip) = @$_;
		3301
		3302	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3303	}
		3304
		3305	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3306	}
		3307
		3308	sub _set_value {
		3309	my ($self, $value) = @_;
		3310
		3311	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3312	or return;
		3313
		3314	$self->{value} = $item->[0];
		3315	$self->set_markup ("$item->[1] ⇓");
		3316	$self->set_tooltip ($item->[2]);
		3317	}
		3318
		3319	sub set_value {
		3320	my ($self, $value) = @_;
		3321
		3322	return unless $self->{value} ne $value;
		3323
		3324	$self->_set_value ($value);
		3325	$self->emit (changed => $value);
3080	}	3326	}
3081		3327
3082	#############################################################################	3328	#############################################################################
3083		3329
3084	package CFClient::UI::Statusbox;	3330	package CFClient::UI::Statusbox;
…		…
3183	$item->{count}++;	3429	$item->{count}++;
3184	} else {	3430	} else {
3185	$item->{count} = 1;	3431	$item->{count} = 1;
3186	$item->{text} = $item->{tooltip} = $text;	3432	$item->{text} = $item->{tooltip} = $text;
3187	}	3433	}
3188	$item->{id} = ++$self->{id};	3434	$item->{id} += 0.2;#d#
3189	$item->{timeout} = $timeout;	3435	$item->{timeout} = $timeout;
3190	delete $item->{label};	3436	delete $item->{label};
3191	} else {	3437	} else {
3192	$self->{item}{$group} = {	3438	$self->{item}{$group} = {
3193	id => ++$self->{id},	3439	id => ++$self->{id},
…		…
3199	count => 1,	3445	count => 1,
3200	%arg,	3446	%arg,
3201	};	3447	};
3202	}	3448	}
3203		3449
		3450	$ROOT->on_refresh (reorder => sub {
3204	$self->reorder;	3451	$self->reorder;
		3452	});
3205	}	3453	}
3206		3454
3207	sub reconfigure {	3455	sub reconfigure {
3208	my ($self) = @_;	3456	my ($self) = @_;
3209		3457
…		…
3212		3460
3213	$self->reorder;	3461	$self->reorder;
3214	$self->SUPER::reconfigure;	3462	$self->SUPER::reconfigure;
3215	}	3463	}
3216		3464
3217	sub DESTROY {	3465	sub destroy {
3218	my ($self) = @_;	3466	my ($self) = @_;
3219		3467
3220	$self->{timer}->cancel;	3468	$self->{timer}->cancel;
3221		3469
3222	$self->SUPER::DESTROY;	3470	$self->SUPER::destroy;
3223	}	3471	}
3224		3472
3225	#############################################################################	3473	#############################################################################
3226		3474
3227	package CFClient::UI::Inventory;	3475	package CFClient::UI::Inventory;
3228		3476
3229	our @ISA = CFClient::UI::ScrolledWindow::;	3477	our @ISA = CFClient::UI::Table::;
3230		3478
3231	sub new {	3479	sub new {
3232	my $class = shift;	3480	my $class = shift;
3233		3481
3234	my $self = $class->SUPER::new (	3482	my $self = $class->SUPER::new (
3235	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3483	col_expand => [0, 1, 0],
3236	@_,	3484	@_,
3237	);	3485	);
3238		3486
3239	$self	3487	$self
3240	}	3488	}
3241		3489
3242	sub set_items {	3490	sub set_items {
3243	my ($self, $items) = @_;	3491	my ($self, $items) = @_;
3244		3492
3245	$self->{child}->clear;	3493	$self->clear;
3246	return unless $items;	3494	return unless $items;
3247		3495
3248	my @items = sort {	3496	my @items = sort {
3249	($a->{type} <=> $b->{type})	3497	($a->{type} <=> $b->{type})
3250	or ($a->{name} cmp $b->{name})	3498	or ($a->{name} cmp $b->{name})
3251	} @$items;	3499	} values %$items;
3252		3500
3253	$self->{real_items} = \@items;	3501	$self->{real_items} = \@items;
3254		3502
3255	my $row = 0;	3503	my $row = 0;
3256	for my $item (@items) {	3504	for my $item (@items) {
3257	CFClient::Item::update_widgets $item;	3505	CFClient::Item::update_widgets $item;
3258		3506
3259	$self->{child}->add (0, $row, $item->{face_widget});	3507	$self->add (0, $row, $item->{face_widget});
3260	$self->{child}->add (1, $row, $item->{desc_widget});	3508	$self->add (1, $row, $item->{desc_widget});
3261	$self->{child}->add (2, $row, $item->{weight_widget});	3509	$self->add (2, $row, $item->{weight_widget});
3262		3510
3263	$row++;	3511	$row++;
3264	}
3265	}
3266
3267	#############################################################################
3268
3269	package CFClient::UI::BindEditor;
3270
3271	our @ISA = CFClient::UI::FancyFrame::;
3272
3273	sub new {
3274	my $class = shift;
3275
3276	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278	$self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282	text => "start recording",
3283	tooltip => "Start/Stops recording of actions."
3284	."All subsequent actions after the recording started will be captured."
3285	."The actions are displayed after the record was stopped."
3286	."To bind the action you have to click on the 'Bind' button",
3287	on_activate => sub {
3288	unless ($self->{recording}) {
3289	$self->start;
3290	} else {
3291	$self->stop;
3292	}
3293	});
3294
3295	$vb->add (new CFClient::UI::Label text => "Actions:");
3296	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3299	$vb->add (my $hb = new CFClient::UI::HBox);
3300	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301	$hb->add (new CFClient::UI::Button
3302	text => "bind",
3303	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304	on_activate => sub {
3305	$self->ask_for_bind;
3306	});
3307
3308	$vb->add (my $hb = new CFClient::UI::HBox);
3309	$hb->add (new CFClient::UI::Button
3310	text => "ok",
3311	expand => 1,
3312	tooltip => "This closes the binding editor and saves the binding",
3313	on_activate => sub {
3314	$self->hide;
3315	$self->commit;
3316	});
3317
3318	$hb->add (new CFClient::UI::Button
3319	text => "cancel",
3320	expand => 1,
3321	tooltip => "This closes the binding editor without saving",
3322	on_activate => sub {
3323	$self->hide;
3324	$self->{binding_cancel}->()
3325	if $self->{binding_cancel};
3326	});
3327
3328	$self->update_binding_widgets;
3329
3330	$self
3331	}
3332
3333	sub commit {
3334	my ($self) = @_;
3335	my ($mod, $sym, $cmds) = $self->get_binding;
3336	if ($sym != 0 && @$cmds > 0) {
3337	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338	."'. Don't forget 'Save Config'!");
3339	$self->{binding_change}->($mod, $sym, $cmds)
3340	if $self->{binding_change};
3341	} else {
3342	$::STATUSBOX->add ("No action bound, no key or action specified!");
3343	$self->{binding_cancel}->()
3344	if $self->{binding_cancel};
3345	}
3346	}
3347
3348	sub start {
3349	my ($self) = @_;
3350
3351	$self->{rec_btn}->set_text ("stop recording");
3352	$self->{recording} = 1;
3353	$self->clear_command_list;
3354	$::CONN->start_record if $::CONN;
3355	}
3356
3357	sub stop {
3358	my ($self) = @_;
3359
3360	$self->{rec_btn}->set_text ("start recording");
3361	$self->{recording} = 0;
3362
3363	my $rec;
3364	$rec = $::CONN->stop_record if $::CONN;
3365	return unless ref $rec eq 'ARRAY';
3366	$self->set_command_list ($rec);
3367	}
3368
3369
3370	sub ask_for_bind_and_commit {
3371	my ($self) = @_;
3372	$self->ask_for_bind (1);
3373	}
3374
3375	sub ask_for_bind {
3376	my ($self, $commit) = @_;
3377
3378	CFClient::Binder::open_binding_dialog (sub {
3379	my ($mod, $sym) = @_;
3380	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381	$self->update_binding_widgets;
3382	$self->commit if $commit;
3383	});
3384	}
3385
3386	# $mod and $sym are the modifiers and key symbol
3387	# $cmds is a array ref of strings (the commands)
3388	# $cb is the callback that is executed on OK
3389	# $ccb is the callback that is executed on CANCEL and
3390	# when the binding was unsuccessful on OK
3391	sub set_binding {
3392	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394	$self->clear_command_list;
3395	$self->{recording} = 0;
3396	$self->{rec_btn}->set_text ("start recording");
3397
3398	$self->{binding} = [$mod, $sym];
3399	$self->{commands} = $cmds;
3400
3401	$self->{binding_change} = $cb;
3402	$self->{binding_cancel} = $ccb;
3403
3404	$self->update_binding_widgets;
3405	}
3406
3407	# this is a shortcut method that asks for a binding
3408	# and then just binds it.
3409	sub do_quick_binding {
3410	my ($self, $cmds) = @_;
3411	$self->set_binding (undef, undef, $cmds, sub {
3412	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413	});
3414	$self->ask_for_bind (1);
3415	}
3416
3417	sub update_binding_widgets {
3418	my ($self) = @_;
3419	my ($mod, $sym, $cmds) = $self->get_binding;
3420	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421	$self->set_command_list ($cmds);
3422	}
3423
3424	sub get_binding {
3425	my ($self) = @_;
3426	return (
3427	$self->{binding}->[0],
3428	$self->{binding}->[1],
3429	[ grep { defined $_ } @{$self->{commands}} ]
3430	);
3431	}
3432
3433	sub clear_command_list {
3434	my ($self) = @_;
3435	$self->{cmdbox}->clear ();
3436	}
3437
3438	sub set_command_list {
3439	my ($self, $cmds) = @_;
3440
3441	$self->{cmdbox}->clear ();
3442	$self->{commands} = $cmds;
3443
3444	my $idx = 0;
3445
3446	for (@$cmds) {
3447	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449	my $i = $idx;
3450	$hb->add (new CFClient::UI::Label text => $_);
3451	$hb->add (new CFClient::UI::Button
3452	text => "delete",
3453	tooltip => "Deletes the action from the record",
3454	on_activate => sub {
3455	$self->{cmdbox}->remove ($hb);
3456	$cmds->[$i] = undef;
3457	});
3458
3459
3460	$idx++
3461	}	3512	}
3462	}	3513	}
3463		3514
3464	#############################################################################	3515	#############################################################################
3465		3516
…		…
3475	commands => [],	3526	commands => [],
3476	@_,	3527	@_,
3477	)	3528	)
3478	}	3529	}
3479		3530
3480	# XXX: Do sorting? Argl...	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");
		3537	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3538	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3539	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3540	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3541	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3542	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3543
		3544	sub rebuild_spell_list {
		3545	my ($self) = @_;
		3546
		3547	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3548	$self->clear;
		3549
		3550	return unless $::CONN;
		3551
		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);
		3554	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3555	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3556	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3557
		3558	my $row = 0;
		3559
		3560	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3561	my $spell = $self->{spell}{$_};
		3562
		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});
		3590
		3591	$self->add (0, $row, new CFClient::UI::Face
		3592	face => $spell->{face},
		3593	can_hover => 1,
		3594	can_events => 1,
		3595	tooltip => $tooltip,
		3596	on_button_down => $spell_cb,
		3597	);
		3598
		3599	$self->add (1, $row, new CFClient::UI::Label
		3600	expand => 1,
		3601	text => $spell->{name},
		3602	can_hover => 1,
		3603	can_events => 1,
		3604	tooltip => $tooltip,
		3605	on_button_down => $spell_cb,
		3606	);
		3607
		3608	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3609	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3610	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3611	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3612	}
		3613	});
		3614	}
		3615
3481	sub add_spell {	3616	sub add_spell {
3482	my ($self, $spell) = @_;	3617	my ($self, $spell) = @_;
		3618
3483	$self->{spells}->{$spell->{name}} = $spell;	3619	$self->{spell}->{$spell->{name}} = $spell;
3484		3620	$self->rebuild_spell_list;
3485	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486	face => $spell->{face},
3487	can_hover => 1,
3488	can_events => 1,
3489	tooltip => $spell->{message});
3490
3491	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492	text => $spell->{name},
3493	can_hover => 1,
3494	can_events => 1,
3495	tooltip => $spell->{message},
3496	expand => 1);
3497
3498	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501	expand => 1);
3502
3503	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504	text => "bind to key",
3505	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506	}
3507
3508	sub rebuild_spell_list {
3509	my ($self) = @_;
3510	$self->{tbl_idx} = 0;
3511	$self->add_spell ($_) for values %{$self->{spells}};
3512	}	3621	}
3513		3622
3514	sub remove_spell {	3623	sub remove_spell {
3515	my ($self, $spell) = @_;	3624	my ($self, $spell) = @_;
		3625
3516	delete $self->{spells}->{$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} = {};
3517	$self->rebuild_spell_list;	3634	$self->rebuild_spell_list;
3518	}	3635	}
3519		3636
3520	#############################################################################	3637	#############################################################################
3521		3638
…		…
3558	$coord = $max - $size if $coord > $max - $size;	3675	$coord = $max - $size if $coord > $max - $size;
3559		3676
3560	int $coord + 0.5	3677	int $coord + 0.5
3561	}	3678	}
3562		3679
3563	sub size_allocate {	3680	sub invoke_size_allocate {
3564	my ($self, $w, $h) = @_;	3681	my ($self, $w, $h) = @_;
3565		3682
3566	for my $child ($self->children) {	3683	for my $child ($self->children) {
3567	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)};
3568		3685
…		…
3572	$X = _to_pixel $X, $W, $self->{w};	3689	$X = _to_pixel $X, $W, $self->{w};
3573	$Y = _to_pixel $Y, $H, $self->{h};	3690	$Y = _to_pixel $Y, $H, $self->{h};
3574		3691
3575	$child->configure ($X, $Y, $W, $H);	3692	$child->configure ($X, $Y, $W, $H);
3576	}	3693	}
		3694
		3695	1
3577	}	3696	}
3578		3697
3579	sub coord2local {	3698	sub coord2local {
3580	my ($self, $x, $y) = @_;	3699	my ($self, $x, $y) = @_;
3581		3700
…		…
3707	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3826	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3708		3827
3709	$w = 0 if $w < 0;	3828	$w = 0 if $w < 0;
3710	$h = 0 if $h < 0;	3829	$h = 0 if $h < 0;
3711		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
3712	$w = int $w + 0.5;	3837	$w = int $w + 0.5;
3713	$h = int $h + 0.5;	3838	$h = int $h + 0.5;
3714		3839
3715	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}) {
3716	$widget->{old_w} = $widget->{w};	3841	$widget->{old_w} = $widget->{w};

Diff Legend

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