ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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