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.288 by root, Mon Jun 5 21:14:40 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
…		…
526	}	525	}
527		526
528	sub reconfigure {	527	sub reconfigure {
529	my ($self) = @_;	528	my ($self) = @_;
530		529
531	# some widgets cache req_w and req_h
532	delete $self->{req_w};
533	delete $self->{req_h};
534
535	$self->realloc;	530	$self->realloc;
536	$self->update;	531	$self->update;
537	}	532	}
538		533
539	# using global variables seems a bit hacky, but passing through all drawing	534	# using global variables seems a bit hacky, but passing through all drawing
…		…
546	return unless $self->{h} && $self->{w};	541	return unless $self->{h} && $self->{w};
547		542
548	# update screen rectangle	543	# update screen rectangle
549	local $draw_x = $draw_x + $self->{x};	544	local $draw_x = $draw_x + $self->{x};
550	local $draw_y = $draw_y + $self->{y};	545	local $draw_y = $draw_y + $self->{y};
551	local $draw_w = $draw_x + $self->{w};
552	local $draw_h = $draw_y + $self->{h};
553		546
554	# skip widgets that are entirely outside the drawing area	547	# skip widgets that are entirely outside the drawing area
555	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
557		550
…		…
596	}	589	}
597		590
598	sub DESTROY {	591	sub DESTROY {
599	my ($self) = @_;	592	my ($self) = @_;
600		593
		594	return if CFClient::in_destruct;
		595
601	delete $WIDGET{$self+0};	596	delete $WIDGET{$self+0};
602	#$self->deactivate;	597
		598	eval { $self->destroy };
		599	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
603	}	600	}
604		601
605	#############################################################################	602	#############################################################################
606		603
607	package CFClient::UI::DrawBG;	604	package CFClient::UI::DrawBG;
…		…
772	}	769	}
773		770
774	sub add {	771	sub add {
775	my ($self, $child) = @_;	772	my ($self, $child) = @_;
776		773
777	$self->{children} = [];	774	$self->SUPER::remove ($_) for @{ $self->{children} };
778
779	$self->SUPER::add ($child);	775	$self->SUPER::add ($child);
780	}	776	}
781		777
782	sub remove {	778	sub remove {
783	my ($self, $widget) = @_;	779	my ($self, $widget) = @_;
…		…
792		788
793	sub size_request {	789	sub size_request {
794	$_[0]{children}[0]->size_request	790	$_[0]{children}[0]->size_request
795	}	791	}
796		792
797	sub size_allocate {	793	sub invoke_size_allocate {
798	my ($self, $w, $h) = @_;	794	my ($self, $w, $h) = @_;
799		795
800	$self->{children}[0]->configure (0, 0, $w, $h);	796	$self->{children}[0]->configure (0, 0, $w, $h);
		797
		798	1
801	}	799	}
802		800
803	#############################################################################	801	#############################################################################
804		802
805	# back-buffered drawing area	803	# back-buffered drawing area
…		…
821		819
822	$ROOT->on_post_alloc ($self => sub { $self->render_child });	820	$ROOT->on_post_alloc ($self => sub { $self->render_child });
823	$self->SUPER::update;	821	$self->SUPER::update;
824	}	822	}
825		823
826	sub size_allocate {	824	sub invoke_size_allocate {
827	my ($self, $w, $h) = @_;	825	my ($self, $w, $h) = @_;
828		826
829	$self->SUPER::size_allocate ($w, $h);
830	$self->update;	827	$self->update;
		828
		829	$self->SUPER::invoke_size_allocate ($w, $h)
831	}	830	}
832		831
833	sub _render {	832	sub _render {
834	my ($self) = @_;	833	my ($self) = @_;
835		834
…		…
896	$h = 10 if $self->{scroll_y};	895	$h = 10 if $self->{scroll_y};
897		896
898	($w, $h)	897	($w, $h)
899	}	898	}
900		899
901	sub size_allocate {	900	sub invoke_size_allocate {
902	my ($self, $w, $h) = @_;	901	my ($self, $w, $h) = @_;
903		902
904	my $child = $self->child;	903	my $child = $self->child;
905		904
906	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	905	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	906	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908		907
909	$self->child->configure (0, 0, $w, $h);	908	$self->child->configure (0, 0, $w, $h);
910	$self->update;	909	$self->update;
		910
		911	1
911	}	912	}
912		913
913	sub set_offset {	914	sub set_offset {
914	my ($self, $x, $y) = @_;	915	my ($self, $x, $y) = @_;
915		916
…		…
989	$self->add ($child) if $child;	990	$self->add ($child) if $child;
990		991
991	$self	992	$self
992	}	993	}
993		994
		995	#TODO# update range on size_allocate depending on child
		996
994	sub add {	997	sub add {
995	my ($self, $widget) = @_;	998	my ($self, $widget) = @_;
996		999
997	$self->{vp}->add ($self->{child} = $widget);	1000	$self->{vp}->add ($self->{child} = $widget);
998	}	1001	}
999		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
1000	sub update {	1017	sub update {
1001	my ($self) = @_;	1018	my ($self) = @_;
1002		1019
1003	$self->SUPER::update;	1020	$self->SUPER::update;
1004		1021
1005	# todo: overwrite size_allocate of child	1022	$self->update_slider;
1006	my $child = $self->{vp}->child;
1007	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1008	}	1023	}
1009		1024
1010	sub size_allocate {	1025	sub invoke_size_allocate {
1011	my ($self, $w, $h) = @_;	1026	my ($self, $w, $h) = @_;
1012		1027
		1028	$self->update_slider;
		1029
1013	$self->SUPER::size_allocate ($w, $h);	1030	$self->SUPER::invoke_size_allocate ($w, $h)
1014
1015	my $child = $self->{vp}->child;
1016	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1017	}	1031	}
1018
1019	#TODO# update range on size_allocate depending on child
1020	# update viewport offset on scroll
1021		1032
1022	#############################################################################	1033	#############################################################################
1023		1034
1024	package CFClient::UI::Frame;	1035	package CFClient::UI::Frame;
1025		1036
…		…
1076	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);
1077		1088
1078	sub new {	1089	sub new {
1079	my ($class, %arg) = @_;	1090	my ($class, %arg) = @_;
1080		1091
1081	my $title = delete $arg{title};
1082
1083	my $self = $class->SUPER::new (	1092	my $self = $class->SUPER::new (
1084	bg => [1, 1, 1, 1],	1093	bg => [1, 1, 1, 1],
1085	border_bg => [1, 1, 1, 1],	1094	border_bg => [1, 1, 1, 1],
1086	border => 0.6,	1095	border => 0.6,
1087	can_events => 1,	1096	can_events => 1,
1088	min_w => 16,	1097	min_w => 64,
1089	min_h => 16,	1098	min_h => 32,
1090	%arg,	1099	%arg,
1091	);	1100	);
1092		1101
1093	$self->{title} = new CFClient::UI::Label	1102	$self->{title_widget} = new CFClient::UI::Label
1094	align => 0,	1103	align => 0,
1095	valign => 1,	1104	valign => 1,
1096	text => $title,	1105	text => $self->{title},
1097	fontsize => $self->{border}	1106	fontsize => $self->{border},
1098	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	}
1099		1117
1100	$self	1118	$self
1101	}	1119	}
1102		1120
1103	sub add {	1121	sub add {
1104	my ($self, @widgets) = @_;	1122	my ($self, @widgets) = @_;
1105		1123
1106	$self->SUPER::add (@widgets);	1124	$self->SUPER::add (@widgets);
		1125	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1126	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108	}	1127	}
1109		1128
1110	sub border {	1129	sub border {
1111	int $_[0]{border} * $::FONTSIZE	1130	int $_[0]{border} * $::FONTSIZE
1112	}	1131	}
1113		1132
1114	sub size_request {	1133	sub size_request {
1115	my ($self) = @_;	1134	my ($self) = @_;
1116		1135
1117	$self->{title}->size_request	1136	$self->{title_widget}->size_request
1118	if $self->{title};	1137	if $self->{title_widget};
		1138
		1139	$self->{close_button}->size_request
		1140	if $self->{close_button};
1119		1141
1120	my ($w, $h) = $self->SUPER::size_request;	1142	my ($w, $h) = $self->SUPER::size_request;
1121		1143
1122	(	1144	(
1123	$w + $self->border * 2,	1145	$w + $self->border * 2,
1124	$h + $self->border * 2,	1146	$h + $self->border * 2,
1125	)	1147	)
1126	}	1148	}
1127		1149
1128	sub size_allocate {	1150	sub invoke_size_allocate {
1129	my ($self, $w, $h) = @_;	1151	my ($self, $w, $h) = @_;
1130		1152
1131	if ($self->{title}) {	1153	if ($self->{title_widget}) {
1132	$self->{title}{w} = $w;	1154	$self->{title_widget}{w} = $w;
1133	$self->{title}{h} = $h;	1155	$self->{title_widget}{h} = $h;
1134	$self->{title}->size_allocate ($w, $h);	1156	$self->{title_widget}->invoke_size_allocate ($w, $h);
1135	}	1157	}
1136		1158
1137	my $border = $self->border;	1159	my $border = $self->border;
1138		1160
1139	$h -= List::Util::max 0, $border * 2;	1161	$h -= List::Util::max 0, $border * 2;
1140	$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;
1141		1176
1142	$self->child->configure ($border, $border, $w, $h);	1177	1
1143	}	1178	}
1144		1179
1145	sub button_down {	1180	sub invoke_button_down {
1146	my ($self, $ev, $x, $y) = @_;	1181	my ($self, $ev, $x, $y) = @_;
1147		1182
1148	my ($w, $h) = @$self{qw(w h)};	1183	my ($w, $h) = @$self{qw(w h)};
1149	my $border = $self->border;	1184	my $border = $self->border;
1150		1185
…		…
1181		1216
1182	($x, $y) = ($ev->{x}, $ev->{y});	1217	($x, $y) = ($ev->{x}, $ev->{y});
1183		1218
1184	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1219	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185	# HACK: the next line is required to enforce placement	1220	# HACK: the next line is required to enforce placement
1186	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1221	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187	};	1222	};
1188	} else {	1223	} else {
1189	return 0;	1224	return 0;
1190	}	1225	}
1191		1226
1192	1	1227	1
1193	}	1228	}
1194		1229
1195	sub button_up {	1230	sub invoke_button_up {
1196	my ($self, $ev, $x, $y) = @_;	1231	my ($self, $ev, $x, $y) = @_;
1197		1232
1198	!!delete $self->{motion}	1233	! ! delete $self->{motion}
1199	}	1234	}
1200		1235
1201	sub mouse_motion {	1236	sub invoke_mouse_motion {
1202	my ($self, $ev, $x, $y) = @_;	1237	my ($self, $ev, $x, $y) = @_;
1203		1238
1204	$self->{motion}->($ev, $x, $y) if $self->{motion};	1239	$self->{motion}->($ev, $x, $y) if $self->{motion};
1205		1240
1206	!!$self->{motion}	1241	! ! $self->{motion}
1207	}	1242	}
1208		1243
1209	sub _draw {	1244	sub _draw {
1210	my ($self) = @_;	1245	my ($self) = @_;
1211		1246
…		…
1237		1272
1238	glDisable GL_TEXTURE_2D;	1273	glDisable GL_TEXTURE_2D;
1239		1274
1240	$child->draw;	1275	$child->draw;
1241		1276
1242	if ($self->{title}) {	1277	if ($self->{title_widget}) {
1243	glTranslate 0, $border - $self->{h};	1278	glTranslate 0, $border - $self->{h};
1244	$self->{title}->_draw;	1279	$self->{title_widget}->_draw;
		1280
		1281	glTranslate 0, - ($border - $self->{h});
1245	}	1282	}
		1283
		1284	$self->{close_button}->draw
		1285	if $self->{close_button};
1246	}	1286	}
1247		1287
1248	#############################################################################	1288	#############################################################################
1249		1289
1250	package CFClient::UI::Table;	1290	package CFClient::UI::Table;
…		…
1273		1313
1274	$child->set_parent ($self);	1314	$child->set_parent ($self);
1275	$self->{children}[$y][$x] = $child;	1315	$self->{children}[$y][$x] = $child;
1276		1316
1277	$self->realloc;	1317	$self->realloc;
		1318	}
		1319
		1320	sub remove {
		1321	my ($self, $child) = @_;
		1322
		1323	# TODO: not yet implemented
1278	}	1324	}
1279		1325
1280	# 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?
1281	sub clear {	1327	sub clear {
1282	my ($self) = @_;	1328	my ($self) = @_;
…		…
1323	(sum @$ws),	1369	(sum @$ws),
1324	(sum @$hs),	1370	(sum @$hs),
1325	)	1371	)
1326	}	1372	}
1327		1373
1328	sub size_allocate {	1374	sub invoke_size_allocate {
1329	my ($self, $w, $h) = @_;	1375	my ($self, $w, $h) = @_;
1330		1376
1331	my ($ws, $hs) = $self->get_wh;	1377	my ($ws, $hs) = $self->get_wh;
1332		1378
1333	my $req_w = (sum @$ws) || 1;	1379	my $req_w = (sum @$ws) || 1;
…		…
1365	}	1411	}
1366		1412
1367	$y += $row_h;	1413	$y += $row_h;
1368	}	1414	}
1369		1415
		1416	1
1370	}	1417	}
1371		1418
1372	sub find_widget {	1419	sub find_widget {
1373	my ($self, $x, $y) = @_;	1420	my ($self, $x, $y) = @_;
1374		1421
…		…
1411	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1458	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1459	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1413	)	1460	)
1414	}	1461	}
1415		1462
1416	sub size_allocate {	1463	sub invoke_size_allocate {
1417	my ($self, $w, $h) = @_;	1464	my ($self, $w, $h) = @_;
1418		1465
1419	my $space = $self->{vertical} ? $h : $w;	1466	my $space = $self->{vertical} ? $h : $w;
1420	my $children = $self->{children};	1467	my @children = $self->visible_children;
1421		1468
1422	my @req;	1469	my @req;
1423		1470
1424	if ($self->{homogeneous}) {	1471	if ($self->{homogeneous}) {
1425	@req = ($space / (@$children || 1)) x @$children;	1472	@req = ($space / (@children || 1)) x @children;
1426	} else {	1473	} else {
1427	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1474	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428	my $req = List::Util::sum @req;	1475	my $req = List::Util::sum @req;
1429		1476
1430	if ($req > $space) {	1477	if ($req > $space) {
1431	# ah well, not enough space	1478	# ah well, not enough space
1432	$_ *= $space / $req for @req;	1479	$_ *= $space / $req for @req;
1433	} else {	1480	} else {
1434	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1481	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435		1482
1436	$space = ($space - $req) / $expand; # remaining space to give away	1483	$space = ($space - $req) / $expand; # remaining space to give away
1437		1484
1438	$req[$_] += $space * $children->[$_]{expand}	1485	$req[$_] += $space * $children[$_]{expand}
1439	for 0 .. $#$children;	1486	for 0 .. $#children;
1440	}	1487	}
1441	}	1488	}
1442		1489
1443	CFClient::UI::harmonize \@req;	1490	CFClient::UI::harmonize \@req;
1444		1491
1445	my $pos = 0;	1492	my $pos = 0;
1446	for (0 .. $#$children) {	1493	for (0 .. $#children) {
1447	my $alloc = $req[$_];	1494	my $alloc = $req[$_];
1448	$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));
1449		1496
1450	$pos += $alloc;	1497	$pos += $alloc;
1451	}	1498	}
1452		1499
1453	1	1500	1
…		…
1556	my ($self, $text) = @_;	1603	my ($self, $text) = @_;
1557		1604
1558	return if $self->{text} eq "T$text";	1605	return if $self->{text} eq "T$text";
1559	$self->{text} = "T$text";	1606	$self->{text} = "T$text";
1560		1607
1561	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562	$self->{layout}->set_text ($text);	1608	$self->{layout}->set_text ($text);
1563		1609
1564	delete $self->{req_h};	1610	delete $self->{size_req};
1565	$self->realloc;	1611	$self->realloc;
1566	$self->update;	1612	$self->update;
1567	}	1613	}
1568		1614
1569	sub set_markup {	1615	sub set_markup {
…		…
1572	return if $self->{text} eq "M$markup";	1618	return if $self->{text} eq "M$markup";
1573	$self->{text} = "M$markup";	1619	$self->{text} = "M$markup";
1574		1620
1575	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1621	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576		1622
1577	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578	$self->{layout}->set_markup ($markup);	1623	$self->{layout}->set_markup ($markup);
1579		1624
1580	delete $self->{req_h};	1625	delete $self->{size_req};
1581	$self->realloc;	1626	$self->realloc;
1582	$self->update;	1627	$self->update;
1583	}	1628	}
1584		1629
1585	sub size_request {	1630	sub size_request {
1586	my ($self) = @_;	1631	my ($self) = @_;
1587		1632
1588	if (exists $self->{req_h}) {	1633	$self->{size_req} ||= do {
1589	@$self{qw(req_w req_h)}
1590	} else {
1591	$self->{layout}->set_font ($self->{font}) if $self->{font};	1634	$self->{layout}->set_font ($self->{font}) if $self->{font};
1592	$self->{layout}->set_width ($self->{max_w} || -1);	1635	$self->{layout}->set_width ($self->{max_w} || -1);
1593	$self->{layout}->set_ellipsise ($self->{ellipsise});	1636	$self->{layout}->set_ellipsise ($self->{ellipsise});
1594	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1637	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1638	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596		1639
1597	my ($w, $h) = $self->{layout}->size;	1640	my ($w, $h) = $self->{layout}->size;
1598		1641
1599	if (exists $self->{template}) {	1642	if (exists $self->{template}) {
1600	$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);
1601	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1645	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602		1646
1603	my ($w2, $h2) = $self->{template}->size;	1647	my ($w2, $h2) = $self->{template}->size;
1604		1648
1605	$w = List::Util::max $w, $w2;	1649	$w = List::Util::max $w, $w2;
1606	$h = List::Util::max $h, $h2;	1650	$h = List::Util::max $h, $h2;
1607	}	1651	}
1608		1652
1609	($w, $h)	1653	[$w, $h]
1610	}	1654	};
1611	}
1612		1655
		1656	@{ $self->{size_req} }
		1657	}
		1658
		1659	sub baseline_shift {
		1660	$_[0]{layout}->descent
		1661	}
		1662
1613	sub size_allocate {	1663	sub invoke_size_allocate {
1614	my ($self, $w, $h) = @_;	1664	my ($self, $w, $h) = @_;
1615		1665
1616	delete $self->{ox};	1666	delete $self->{ox};
1617		1667
1618	delete $self->{texture}	1668	delete $self->{texture}
1619	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
1620	}	1672	}
1621		1673
1622	sub set_fontsize {	1674	sub set_fontsize {
1623	my ($self, $fontsize) = @_;	1675	my ($self, $fontsize) = @_;
1624		1676
1625	$self->{fontsize} = $fontsize;	1677	$self->{fontsize} = $fontsize;
		1678	delete $self->{size_req};
1626	delete $self->{texture};	1679	delete $self->{texture};
1627		1680
1628	$self->realloc;	1681	$self->realloc;
1629	}	1682	}
1630		1683
		1684	sub reconfigure {
		1685	my ($self) = @_;
		1686
		1687	delete $self->{size_req};
		1688	delete $self->{texture};
		1689
		1690	$self->SUPER::reconfigure;
		1691	}
		1692
1631	sub _draw {	1693	sub _draw {
1632	my ($self) = @_;	1694	my ($self) = @_;
1633		1695
1634	$self->SUPER::_draw; # draw background, if applicable	1696	$self->SUPER::_draw; # draw background, if applicable
1635		1697
1636	my $tex = $self->{texture} ||= do {	1698	my $size = $self->{texture} ||= do {
1637	$self->{layout}->set_foreground (@{$self->{fg}});	1699	$self->{layout}->set_foreground (@{$self->{fg}});
1638	$self->{layout}->set_font ($self->{font}) if $self->{font};	1700	$self->{layout}->set_font ($self->{font}) if $self->{font};
1639	$self->{layout}->set_width ($self->{w});	1701	$self->{layout}->set_width ($self->{w});
1640	$self->{layout}->set_ellipsise ($self->{ellipsise});	1702	$self->{layout}->set_ellipsise ($self->{ellipsise});
1641	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1703	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1704	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643		1705
1644	new_from_layout CFClient::Texture $self->{layout}	1706	[$self->{layout}->size]
1645	};	1707	};
1646		1708
1647	unless (exists $self->{ox}) {	1709	unless (exists $self->{ox}) {
1648	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1710	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1711	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650	: ($self->{w} - $tex->{w}) * 0.5);	1712	: ($self->{w} - $size->[0]) * 0.5);
1651		1713
1652	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1714	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1715	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654	: ($self->{h} - $tex->{h}) * 0.5);	1716	: ($self->{h} - $size->[1]) * 0.5);
1655	};	1717	};
1656		1718
1657	glEnable GL_TEXTURE_2D;	1719	my $w = List::Util::min $self->{w} + 4, $size->[0];
		1720	my $h = List::Util::min $self->{h} + 2, $size->[1];
1658		1721
1659	if ($tex->{format} == GL_ALPHA) {	1722	$self->{layout}->render ($self->{ox}, $self->{oy});
1660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1661	glColor @{$self->{fg}};
1662	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1663	} else {
1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1665	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1666	}
1667
1668	glDisable GL_TEXTURE_2D;
1669	}	1723	}
1670		1724
1671	#############################################################################	1725	#############################################################################
1672		1726
1673	package CFClient::UI::EntryBase;	1727	package CFClient::UI::EntryBase;
…		…
1687	can_hover => 1,	1741	can_hover => 1,
1688	can_focus => 1,	1742	can_focus => 1,
1689	valign => 0,	1743	valign => 0,
1690	can_events => 1,	1744	can_events => 1,
1691	#text => ...	1745	#text => ...
		1746	#hidden => "*",
1692	@_	1747	@_
1693	)	1748	)
1694	}	1749	}
1695		1750
1696	sub _set_text {	1751	sub _set_text {
…		…
1703	$self->{last_activity} = $::NOW;	1758	$self->{last_activity} = $::NOW;
1704	$self->{text} = $text;	1759	$self->{text} = $text;
1705		1760
1706	$text =~ s/./*/g if $self->{hidden};	1761	$text =~ s/./*/g if $self->{hidden};
1707	$self->{layout}->set_text ("$text ");	1762	$self->{layout}->set_text ("$text ");
1708	delete $self->{req_h};	1763	delete $self->{size_req};
1709		1764
1710	$self->_emit (changed => $self->{text});	1765	$self->emit (changed => $self->{text});
1711		1766
1712	$self->realloc;	1767	$self->realloc;
1713	$self->update;	1768	$self->update;
1714	}	1769	}
1715		1770
…		…
1730	my ($w, $h) = $self->SUPER::size_request;	1785	my ($w, $h) = $self->SUPER::size_request;
1731		1786
1732	($w + 1, $h) # add 1 for cursor	1787	($w + 1, $h) # add 1 for cursor
1733	}	1788	}
1734		1789
1735	sub key_down {	1790	sub invoke_key_down {
1736	my ($self, $ev) = @_;	1791	my ($self, $ev) = @_;
1737		1792
1738	my $mod = $ev->{mod};	1793	my $mod = $ev->{mod};
1739	my $sym = $ev->{sym};	1794	my $sym = $ev->{sym};
1740	my $uni = $ev->{unicode};	1795	my $uni = $ev->{unicode};
…		…
1752	} elsif ($sym == CFClient::SDLK_HOME) {	1807	} elsif ($sym == CFClient::SDLK_HOME) {
1753	$self->{cursor} = 0;	1808	$self->{cursor} = 0;
1754	} elsif ($sym == CFClient::SDLK_END) {	1809	} elsif ($sym == CFClient::SDLK_END) {
1755	$self->{cursor} = length $text;	1810	$self->{cursor} = length $text;
1756	} elsif ($uni == 27) {	1811	} elsif ($uni == 27) {
1757	$self->_emit ('escape');	1812	$self->emit ('escape');
1758	} elsif ($uni) {	1813	} elsif ($uni) {
1759	substr $text, $self->{cursor}++, 0, chr $uni;	1814	substr $text, $self->{cursor}++, 0, chr $uni;
1760	} else {	1815	} else {
1761	return 0;	1816	return 0;
1762	}	1817	}
…		…
1766	$self->realloc;	1821	$self->realloc;
1767		1822
1768	1	1823	1
1769	}	1824	}
1770		1825
1771	sub focus_in {	1826	sub invoke_focus_in {
1772	my ($self) = @_;	1827	my ($self) = @_;
1773		1828
1774	$self->{last_activity} = $::NOW;	1829	$self->{last_activity} = $::NOW;
1775		1830
1776	$self->SUPER::focus_in;	1831	$self->SUPER::invoke_focus_in
1777	}	1832	}
1778		1833
1779	sub button_down {	1834	sub invoke_button_down {
1780	my ($self, $ev, $x, $y) = @_;	1835	my ($self, $ev, $x, $y) = @_;
1781		1836
1782	$self->SUPER::button_down ($ev, $x, $y);	1837	$self->SUPER::invoke_button_down ($ev, $x, $y);
1783		1838
1784	my $idx = $self->{layout}->xy_to_index ($x, $y);	1839	my $idx = $self->{layout}->xy_to_index ($x, $y);
1785		1840
1786	# byte-index to char-index	1841	# byte-index to char-index
1787	my $text = $self->{text};	1842	my $text = $self->{text};
1788	utf8::encode $text;	1843	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789	$self->{cursor} = length substr $text, 0, $idx;	1844	$self->{cursor} = length $text;
1790		1845
1791	$self->_set_text ($self->{text});	1846	$self->_set_text ($self->{text});
1792	$self->update;	1847	$self->update;
1793		1848
1794	1	1849	1
1795	}	1850	}
1796		1851
1797	sub mouse_motion {	1852	sub invoke_mouse_motion {
1798	my ($self, $ev, $x, $y) = @_;	1853	my ($self, $ev, $x, $y) = @_;
1799	# 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#
1800		1855
1801	0	1856	1
1802	}	1857	}
1803		1858
1804	sub _draw {	1859	sub _draw {
1805	my ($self) = @_;	1860	my ($self) = @_;
1806		1861
…		…
1847		1902
1848	our @ISA = CFClient::UI::EntryBase::;	1903	our @ISA = CFClient::UI::EntryBase::;
1849		1904
1850	use CFClient::OpenGL;	1905	use CFClient::OpenGL;
1851		1906
1852	sub key_down {	1907	sub invoke_key_down {
1853	my ($self, $ev) = @_;	1908	my ($self, $ev) = @_;
1854		1909
1855	my $sym = $ev->{sym};	1910	my $sym = $ev->{sym};
1856		1911
1857	if ($sym == 13) {	1912	if ($sym == 13) {
1858	unshift @{$self->{history}},	1913	unshift @{$self->{history}},
1859	my $txt = $self->get_text;	1914	my $txt = $self->get_text;
		1915
1860	$self->{history_pointer} = -1;	1916	$self->{history_pointer} = -1;
1861	$self->{history_saveback} = '';	1917	$self->{history_saveback} = '';
1862	$self->_emit (activate => $txt);	1918	$self->emit (activate => $txt);
1863	$self->update;	1919	$self->update;
1864		1920
1865	} elsif ($sym == CFClient::SDLK_UP) {	1921	} elsif ($sym == CFClient::SDLK_UP) {
1866	if ($self->{history_pointer} < 0) {	1922	if ($self->{history_pointer} < 0) {
1867	$self->{history_saveback} = $self->get_text;	1923	$self->{history_saveback} = $self->get_text;
…		…
1883	} else {	1939	} else {
1884	$self->set_text ($self->{history_saveback});	1940	$self->set_text ($self->{history_saveback});
1885	}	1941	}
1886		1942
1887	} else {	1943	} else {
1888	return $self->SUPER::key_down ($ev)	1944	return $self->SUPER::invoke_key_down ($ev)
1889	}	1945	}
1890		1946
1891	1	1947	1
1892	}	1948	}
1893		1949
…		…
1917	can_events => 1,	1973	can_events => 1,
1918	@_	1974	@_
1919	)	1975	)
1920	}	1976	}
1921		1977
1922	sub activate { }
1923
1924	sub button_up {	1978	sub invoke_button_up {
1925	my ($self, $ev, $x, $y) = @_;	1979	my ($self, $ev, $x, $y) = @_;
1926		1980
1927	$self->emit ("activate")	1981	$self->emit ("activate")
1928	if $x >= 0 && $x < $self->{w}	1982	if $x >= 0 && $x < $self->{w}
1929	&& $y >= 0 && $y < $self->{h};	1983	&& $y >= 0 && $y < $self->{h};
…		…
1943	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1997	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1944		1998
1945	glDisable GL_TEXTURE_2D;	1999	glDisable GL_TEXTURE_2D;
1946		2000
1947	$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
1948	}	2038	}
1949		2039
1950	#############################################################################	2040	#############################################################################
1951		2041
1952	package CFClient::UI::CheckBox;	2042	package CFClient::UI::CheckBox;
…		…
1979	my ($self) = @_;	2069	my ($self) = @_;
1980		2070
1981	(6) x 2	2071	(6) x 2
1982	}	2072	}
1983		2073
		2074	sub toggle {
		2075	my ($self) = @_;
		2076
		2077	$self->{state} = !$self->{state};
		2078	$self->emit (changed => $self->{state});
		2079	$self->update;
		2080	}
		2081
1984	sub button_down {	2082	sub invoke_button_down {
1985	my ($self, $ev, $x, $y) = @_;	2083	my ($self, $ev, $x, $y) = @_;
1986		2084
1987	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989	$self->{state} = !$self->{state};	2087	$self->toggle;
1990	$self->_emit (changed => $self->{state});
1991	} else {	2088	} else {
1992	return 0	2089	return 0
1993	}	2090	}
1994		2091
1995	1	2092	1
…		…
2020	package CFClient::UI::Image;	2117	package CFClient::UI::Image;
2021		2118
2022	our @ISA = CFClient::UI::Base::;	2119	our @ISA = CFClient::UI::Base::;
2023		2120
2024	use CFClient::OpenGL;	2121	use CFClient::OpenGL;
2025	use Carp qw/confess/;
2026		2122
2027	our %loaded_images;	2123	our %texture_cache;
2028		2124
2029	sub new {	2125	sub new {
2030	my $class = shift;	2126	my $class = shift;
2031		2127
2032	my $self = $class->SUPER::new (can_events => 0, @_);	2128	my $self = $class->SUPER::new (
		2129	can_events => 0,
		2130	@_,
		2131	);
2033		2132
2034	$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";
2035		2135
2036	$loaded_images{$self->{image}} ||=	2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2037	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;
2038		2138
2039	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2040		2140
2041	Scalar::Util::weaken $loaded_images{$self->{image}};	2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043	$self->{aspect} = $tex->{w} / $tex->{h};
2044		2142
2045	$self	2143	$self
2046	}	2144	}
2047		2145
2048	sub size_request {	2146	sub size_request {
2049	my ($self) = @_;	2147	my ($self) = @_;
2050		2148
2051	($self->{tex}->{w}, $self->{tex}->{h})	2149	($self->{tex}{w}, $self->{tex}{h})
2052	}	2150	}
2053		2151
2054	sub _draw {	2152	sub _draw {
2055	my ($self) = @_;	2153	my ($self) = @_;
2056		2154
…		…
2165	my $ycut1 = max 0, min 1, $ycut;	2263	my $ycut1 = max 0, min 1, $ycut;
2166	my $ycut2 = max 0, min 1, $ycut - 1;	2264	my $ycut2 = max 0, min 1, $ycut - 1;
2167		2265
2168	my $h1 = $self->{h} * (1 - $ycut1);	2266	my $h1 = $self->{h} * (1 - $ycut1);
2169	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);
2170		2271
2171	glEnable GL_BLEND;	2272	glEnable GL_BLEND;
2172	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2273	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2274	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174	glEnable GL_TEXTURE_2D;	2275	glEnable GL_TEXTURE_2D;
…		…
2193		2294
2194	if ($t3) {	2295	if ($t3) {
2195	glBindTexture GL_TEXTURE_2D, $t3->{name};	2296	glBindTexture GL_TEXTURE_2D, $t3->{name};
2196	glBegin GL_QUADS;	2297	glBegin GL_QUADS;
2197	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2298	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2299	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2300	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2301	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201	glEnd;	2302	glEnd;
2202	}	2303	}
2203		2304
2204	glDisable GL_BLEND;	2305	glDisable GL_BLEND;
…		…
2292	$self->update;	2393	$self->update;
2293		2394
2294	$self	2395	$self
2295	}	2396	}
2296		2397
2297	sub changed { }
2298
2299	sub set_range {	2398	sub set_range {
2300	my ($self, $range) = @_;	2399	my ($self, $range) = @_;
2301		2400
2302	($range, $self->{range}) = ($self->{range}, $range);	2401	($range, $self->{range}) = ($self->{range}, $range);
2303		2402
2304	$self->update
2305	if "@$range" ne "@{$self->{range}}";	2403	if ("@$range" ne "@{$self->{range}}") {
		2404	$self->update;
		2405	$self->set_value ($self->{range}[0]);
		2406	}
2306	}	2407	}
2307		2408
2308	sub set_value {	2409	sub set_value {
2309	my ($self, $value) = @_;	2410	my ($self, $value) = @_;
2310		2411
…		…
2321	if $unit;	2422	if $unit;
2322		2423
2323	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2424	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324		2425
2325	if ($value != $old_value) {	2426	if ($value != $old_value) {
2326	$self->_emit (changed => $value);	2427	$self->emit (changed => $value);
2327	$self->update;	2428	$self->update;
2328	}	2429	}
2329	}	2430	}
2330		2431
2331	sub size_request {	2432	sub size_request {
2332	my ($self) = @_;	2433	my ($self) = @_;
2333		2434
2334	($self->{req_w}, $self->{req_h})	2435	($self->{req_w}, $self->{req_h})
2335	}	2436	}
2336		2437
2337	sub button_down {	2438	sub invoke_button_down {
2338	my ($self, $ev, $x, $y) = @_;	2439	my ($self, $ev, $x, $y) = @_;
2339		2440
2340	$self->SUPER::button_down ($ev, $x, $y);	2441	$self->SUPER::invoke_button_down ($ev, $x, $y);
2341		2442
2342	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2443	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343		2444
2344	$self->mouse_motion ($ev, $x, $y)	2445	$self->invoke_mouse_motion ($ev, $x, $y)
2345	}	2446	}
2346		2447
2347	sub mouse_motion {	2448	sub invoke_mouse_motion {
2348	my ($self, $ev, $x, $y) = @_;	2449	my ($self, $ev, $x, $y) = @_;
2349		2450
2350	if ($GRAB == $self) {	2451	if ($GRAB == $self) {
2351	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2452	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352		2453
…		…
2457	sub set_range { shift->{slider}->set_range (@_) }	2558	sub set_range { shift->{slider}->set_range (@_) }
2458	sub set_value { shift->{slider}->set_value (@_) }	2559	sub set_value { shift->{slider}->set_value (@_) }
2459		2560
2460	#############################################################################	2561	#############################################################################
2461		2562
2462	package CFClient::UI::TextView;	2563	package CFClient::UI::TextScroller;
2463		2564
2464	our @ISA = CFClient::UI::HBox::;	2565	our @ISA = CFClient::UI::HBox::;
2465		2566
2466	use CFClient::OpenGL;	2567	use CFClient::OpenGL;
2467		2568
…		…
2469	my $class = shift;	2570	my $class = shift;
2470		2571
2471	my $self = $class->SUPER::new (	2572	my $self = $class->SUPER::new (
2472	fontsize => 1,	2573	fontsize => 1,
2473	can_events => 0,	2574	can_events => 0,
		2575	indent => 0,
2474	#font => default_font	2576	#font => default_font
2475	@_,	2577	@_,
2476		2578
2477	layout => (new CFClient::Layout 1),	2579	layout => (new CFClient::Layout),
2478	par => [],	2580	par => [],
2479	height => 0,	2581	height => 0,
2480	children => [	2582	children => [
2481	(new CFClient::UI::Empty expand => 1),	2583	(new CFClient::UI::Empty expand => 1),
2482	(new CFClient::UI::Slider vertical => 1),	2584	(new CFClient::UI::Slider vertical => 1),
…		…
2493		2595
2494	$self->{fontsize} = $fontsize;	2596	$self->{fontsize} = $fontsize;
2495	$self->reflow;	2597	$self->reflow;
2496	}	2598	}
2497		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
2498	sub size_allocate {	2609	sub invoke_size_allocate {
2499	my ($self, $w, $h) = @_;	2610	my ($self, $w, $h) = @_;
2500		2611
2501	$self->SUPER::size_allocate ($w, $h);	2612	my ($empty, $slider, @other) = @{ $self->{children} };
		2613	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502		2614
2503	$self->{layout}->set_font ($self->{font}) if $self->{font};	2615	$self->{layout}->set_font ($self->{font}) if $self->{font};
2504	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2616	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505	$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});
2506		2619
2507	$self->reflow;	2620	$self->reflow;
2508	}
2509		2621
2510	sub text_size {	2622	local $self->{children} = [$empty, $slider];
2511	my ($self, $text, $indent) = @_;	2623	$self->SUPER::invoke_size_allocate ($w, $h)
		2624	}
		2625
		2626	sub get_layout {
		2627	my ($self, $para) = @_;
2512		2628
2513	my $layout = $self->{layout};	2629	my $layout = $self->{layout};
2514		2630
		2631	$layout->set_font ($self->{font}) if $self->{font};
		2632	$layout->set_foreground (@{$para->{fg}});
2515	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2633	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516	$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});
2517	$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}}
2518		2642	);
		2643
2519	$layout->size	2644	$layout
2520	}	2645	}
2521		2646
2522	sub reflow {	2647	sub reflow {
2523	my ($self) = @_;	2648	my ($self) = @_;
2524		2649
…		…
2533	$self->{children}[1]->set_value ($offset);	2658	$self->{children}[1]->set_value ($offset);
2534	}	2659	}
2535		2660
2536	sub clear {	2661	sub clear {
2537	my ($self) = @_;	2662	my ($self) = @_;
		2663
		2664	my (undef, undef, @other) = @{ $self->{children} };
		2665	$self->remove ($_) for @other;
2538		2666
2539	$self->{par} = [];	2667	$self->{par} = [];
2540	$self->{height} = 0;	2668	$self->{height} = 0;
2541	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542	}	2670	}
2543		2671
2544	sub add_paragraph {	2672	sub add_paragraph {
2545	my ($self, $color, $text, $indent) = @_;	2673	my ($self, $color, $para, $indent) = @_;
2546		2674
2547	for my $line (split /\n/, $text) {	2675	my ($text, @w) = ref $para ? @$para : $para;
2548	my ($w, $h) = $self->text_size ($line);	2676
2549	$self->{height} += $h;	2677	$para = {
2550	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,
2551	}	2684	};
2552		2685
2553	$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;
2554	}	2698	}
2555		2699
2556	sub update {	2700	sub update {
2557	my ($self) = @_;	2701	my ($self) = @_;
2558		2702
…		…
2560		2704
2561	return unless $self->{h} > 0;	2705	return unless $self->{h} > 0;
2562		2706
2563	delete $self->{texture};	2707	delete $self->{texture};
2564		2708
2565	$ROOT->on_post_alloc ($self, sub {	2709	$ROOT->on_post_alloc ($self => sub {
2566	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567		2711
2568	if (delete $self->{need_reflow}) {	2712	if (delete $self->{need_reflow}) {
2569	my $height = 0;	2713	my $height = 0;
2570		2714
2571	my $layout = $self->{layout};
2572
2573	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2575	for (@{$self->{par}}) {	2715	for my $para (@{$self->{par}}) {
2576	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2577	$layout->set_width ($W - $_->[3]);	2717	my $layout = $self->get_layout ($para);
2578	$layout->set_markup ($_->[4]);
2579	my ($w, $h) = $layout->size;	2718	my ($w, $h) = $layout->size;
2580	$_->[0] = $w + $_->[3];	2719
2581	$_->[1] = $h;	2720	$para->{w} = $w + $para->{indent};
		2721	$para->{h} = $h;
		2722	$para->{wrapped} = $layout->has_wrapped;
2582	}	2723	}
2583		2724
2584	$height += $_->[1];	2725	$height += $para->{h};
2585	}	2726	}
2586		2727
2587	$self->{height} = $height;	2728	$self->{height} = $height;
2588		2729
2589	$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]);
2590		2731
2591	delete $self->{texture};	2732	delete $self->{texture};
		2733	}
		2734
		2735	if (delete $self->{scroll_to_bottom}) {
		2736	$self->{children}[1]->set_value (1e10);
2592	}	2737	}
2593		2738
2594	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2595	glClearColor 0, 0, 0, 0;	2740	glClearColor 0, 0, 0, 0;
2596	glClear GL_COLOR_BUFFER_BIT;	2741	glClear GL_COLOR_BUFFER_BIT;
…		…
2600	my $y0 = $top;	2745	my $y0 = $top;
2601	my $y1 = $top + $H;	2746	my $y1 = $top + $H;
2602		2747
2603	my $y = 0;	2748	my $y = 0;
2604		2749
2605	my $layout = $self->{layout};
2606
2607	$layout->set_font ($self->{font}) if $self->{font};
2608
2609	glEnable GL_BLEND;
2610	#TODO# not correct in windows where rgba is forced off
2611	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2612
2613	for my $par (@{$self->{par}}) {	2750	for my $para (@{$self->{par}}) {
2614	my $h = $par->[1];	2751	my $h = $para->{h};
2615		2752
2616	if ($y0 < $y + $h && $y < $y1) {	2753	if ($y0 < $y + $h && $y < $y1) {
2617	$layout->set_foreground (@{ $par->[2] });
2618	$layout->set_width ($W - $par->[3]);
2619	$layout->set_markup ($par->[4]);
2620		2754
2621	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2755	my $layout = $self->get_layout ($para);
2622		2756
2623	glRasterPos $par->[3], $y - $y0;	2757	$layout->render ($para->{indent}, $y - $y0);
2624	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	}
2625	}	2771	}
2626		2772
2627	$y += $h;	2773	$y += $h;
2628	}	2774	}
2629
2630	glDisable GL_BLEND;
2631	};	2775	};
2632	});	2776	});
		2777	}
		2778
		2779	sub reconfigure {
		2780	my ($self) = @_;
		2781
		2782	$self->SUPER::reconfigure;
		2783
		2784	$_->{w} = 1e10 for @{ $self->{par} };
		2785	$self->reflow;
2633	}	2786	}
2634		2787
2635	sub _draw {	2788	sub _draw {
2636	my ($self) = @_;	2789	my ($self) = @_;
2637		2790
…		…
2640	glColor 0, 0, 0, 1;	2793	glColor 0, 0, 0, 1;
2641	$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});
2642	glDisable GL_TEXTURE_2D;	2795	glDisable GL_TEXTURE_2D;
2643		2796
2644	$self->{children}[1]->draw;	2797	$self->{children}[1]->draw;
2645
2646	}	2798	}
2647		2799
2648	#############################################################################	2800	#############################################################################
2649		2801
2650	package CFClient::UI::Animator;	2802	package CFClient::UI::Animator;
…		…
2737	$tooltip .= "\n\n" . (ref $widget) . "\n"	2889	$tooltip .= "\n\n" . (ref $widget) . "\n"
2738	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2890	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739	. "req $widget->{req_w} $widget->{req_h}\n"	2891	. "req $widget->{req_w} $widget->{req_h}\n"
2740	. "visible $widget->{visible}";	2892	. "visible $widget->{visible}";
2741	}	2893	}
		2894
		2895	$tooltip =~ s/^\n+//;
		2896	$tooltip =~ s/\n+$//;
2742		2897
2743	$self->add (new CFClient::UI::Label	2898	$self->add (new CFClient::UI::Label
2744	markup => $tooltip,	2899	markup => $tooltip,
2745	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746	fontsize => 0.8,	2901	fontsize => 0.8,
…		…
2756	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2911	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757		2912
2758	($w + 4, $h + 4)	2913	($w + 4, $h + 4)
2759	}	2914	}
2760		2915
2761	sub size_allocate {	2916	sub invoke_size_allocate {
2762	my ($self, $w, $h) = @_;	2917	my ($self, $w, $h) = @_;
2763		2918
2764	$self->SUPER::size_allocate ($w - 4, $h - 4);	2919	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765	}	2920	}
2766		2921
2767	sub visibility_change {	2922	sub invoke_visibility_change {
2768	my ($self, $visible) = @_;	2923	my ($self, $visible) = @_;
2769		2924
2770	return unless $visible;	2925	return unless $visible;
2771		2926
2772	$self->{root}->on_post_alloc ("move_$self" => sub {	2927	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2774	or return;	2929	or return;
2775		2930
2776	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777		2932
2778	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779	if $x + $self->{w} > $::WIDTH;	2934	if $x + $self->{w} > $self->{root}{w};
2780		2935
2781	$self->move_abs ($x, $y);	2936	$self->move_abs ($x, $y);
2782	});	2937	});
2783	}	2938	}
2784		2939
…		…
2879	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3034	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880	glDisable GL_TEXTURE_2D;	3035	glDisable GL_TEXTURE_2D;
2881	}	3036	}
2882	}	3037	}
2883		3038
2884	sub DESTROY {	3039	sub destroy {
2885	my ($self) = @_;	3040	my ($self) = @_;
2886		3041
2887	$self->{timer}->cancel	3042	$self->{timer}->cancel
2888	if $self->{timer};	3043	if $self->{timer};
2889		3044
2890	$self->SUPER::DESTROY;	3045	$self->SUPER::destroy;
2891	}	3046	}
2892		3047
2893	#############################################################################	3048	#############################################################################
2894		3049
2895	package CFClient::UI::Buttonbar;	3050	package CFClient::UI::Buttonbar;
…		…
2916	);	3071	);
2917		3072
2918	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3073	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2919		3074
2920	for my $item (@{ $self->{items} }) {	3075	for my $item (@{ $self->{items} }) {
2921	my ($widget, $cb) = @$item;	3076	my ($widget, $cb, $tooltip) = @$item;
2922		3077
2923	# handle various types of items, only text for now	3078	# handle various types of items, only text for now
2924	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 {
2925	$widget = new CFClient::UI::Label	3094	$widget = new CFClient::UI::Label
2926	can_hover => 1,	3095	can_hover => 1,
2927	can_events => 1,	3096	can_events => 1,
2928	text => $widget;	3097	markup => $widget,
		3098	tooltip => $tooltip;
		3099	}
2929	}	3100	}
2930		3101
2931	$self->{item}{$widget} = $item;	3102	$self->{item}{$widget} = $item;
2932		3103
2933	$self->{vbox}->add ($widget);	3104	$self->{vbox}->add ($widget);
…		…
2938		3109
2939	# 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)
2940	sub popup {	3111	sub popup {
2941	my ($self, $ev) = @_;	3112	my ($self, $ev) = @_;
2942		3113
2943	$self->_emit ("popdown");	3114	$self->emit ("popdown");
2944		3115
2945	# maybe save $GRAB? must be careful about events...	3116	# maybe save $GRAB? must be careful about events...
2946	$GRAB = $self;	3117	$GRAB = $self;
2947	$self->{button} = $ev->{button};	3118	$self->{button} = $ev->{button};
2948		3119
2949	$self->show;	3120	$self->show;
2950	$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);
2951	}	3122	}
2952		3123
2953	sub mouse_motion {	3124	sub invoke_mouse_motion {
2954	my ($self, $ev, $x, $y) = @_;	3125	my ($self, $ev, $x, $y) = @_;
2955		3126
2956	# TODO: should use vbox->find_widget or so	3127	# TODO: should use vbox->find_widget or so
2957	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3128	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958	$self->{hover} = $self->{item}{$HOVER};	3129	$self->{hover} = $self->{item}{$HOVER};
2959		3130
2960	0	3131	0
2961	}	3132	}
2962		3133
2963	sub button_up {	3134	sub invoke_button_up {
2964	my ($self, $ev, $x, $y) = @_;	3135	my ($self, $ev, $x, $y) = @_;
2965		3136
2966	if ($ev->{button} == $self->{button}) {	3137	if ($ev->{button} == $self->{button}) {
2967	undef $GRAB;	3138	undef $GRAB;
2968	$self->hide;	3139	$self->hide;
2969		3140
2970	$self->_emit ("popdown");	3141	$self->emit ("popdown");
2971	$self->{hover}[1]->() if $self->{hover};	3142	$self->{hover}[1]->() if $self->{hover};
2972	} else {	3143	} else {
2973	return 0	3144	return 0
2974	}	3145	}
2975		3146
…		…
3002		3173
3003	$self->{current} = $self->{children}[0]	3174	$self->{current} = $self->{children}[0]
3004	if @{ $self->{children} };	3175	if @{ $self->{children} };
3005	}	3176	}
3006		3177
		3178	sub get_current_page {
		3179	my ($self) = @_;
		3180
		3181	$self->{current}
		3182	}
		3183
3007	sub set_current_page {	3184	sub set_current_page {
3008	my ($self, $page_or_widget) = @_;	3185	my ($self, $page_or_widget) = @_;
3009		3186
3010	my $widget = ref $page_or_widget	3187	my $widget = ref $page_or_widget
3011	? $page_or_widget	3188	? $page_or_widget
3012	: $self->{children}[$page_or_widget];	3189	: $self->{children}[$page_or_widget];
3013		3190
3014	$self->{current} = $widget;	3191	$self->{current} = $widget;
3015	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3192	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016		3193
3017	$self->_emit (page_changed => $self->{current});	3194	$self->emit (page_changed => $self->{current});
3018		3195
3019	$self->realloc;	3196	$self->realloc;
3020	}	3197	}
3021		3198
3022	sub visible_children {	3199	sub visible_children {
…		…
3027	my ($self) = @_;	3204	my ($self) = @_;
3028		3205
3029	$self->{current}->size_request	3206	$self->{current}->size_request
3030	}	3207	}
3031		3208
3032	sub size_allocate {	3209	sub invoke_size_allocate {
3033	my ($self, $w, $h) = @_;	3210	my ($self, $w, $h) = @_;
3034		3211
3035	$self->{current}->configure (0, 0, $w, $h);	3212	$self->{current}->configure (0, 0, $w, $h);
		3213
		3214	1
3036	}	3215	}
3037		3216
3038	sub _draw {	3217	sub _draw {
3039	my ($self) = @_;	3218	my ($self) = @_;
3040		3219
…		…
3075	);	3254	);
3076		3255
3077	$self->{multiplexer}->add ($widget);	3256	$self->{multiplexer}->add ($widget);
3078	}	3257	}
3079		3258
		3259	sub get_current_page {
		3260	my ($self) = @_;
		3261
		3262	$self->{multiplexer}->get_current_page
		3263	}
		3264
3080	sub set_current_page {	3265	sub set_current_page {
3081	my ($self, $page) = @_;	3266	my ($self, $page) = @_;
3082		3267
3083	$self->{multiplexer}->set_current_page ($page);	3268	$self->{multiplexer}->set_current_page ($page);
3084	$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);
3085	}	3326	}
3086		3327
3087	#############################################################################	3328	#############################################################################
3088		3329
3089	package CFClient::UI::Statusbox;	3330	package CFClient::UI::Statusbox;
…		…
3188	$item->{count}++;	3429	$item->{count}++;
3189	} else {	3430	} else {
3190	$item->{count} = 1;	3431	$item->{count} = 1;
3191	$item->{text} = $item->{tooltip} = $text;	3432	$item->{text} = $item->{tooltip} = $text;
3192	}	3433	}
3193	$item->{id} = ++$self->{id};	3434	$item->{id} += 0.2;#d#
3194	$item->{timeout} = $timeout;	3435	$item->{timeout} = $timeout;
3195	delete $item->{label};	3436	delete $item->{label};
3196	} else {	3437	} else {
3197	$self->{item}{$group} = {	3438	$self->{item}{$group} = {
3198	id => ++$self->{id},	3439	id => ++$self->{id},
…		…
3204	count => 1,	3445	count => 1,
3205	%arg,	3446	%arg,
3206	};	3447	};
3207	}	3448	}
3208		3449
		3450	$ROOT->on_refresh (reorder => sub {
3209	$self->reorder;	3451	$self->reorder;
		3452	});
3210	}	3453	}
3211		3454
3212	sub reconfigure {	3455	sub reconfigure {
3213	my ($self) = @_;	3456	my ($self) = @_;
3214		3457
…		…
3217		3460
3218	$self->reorder;	3461	$self->reorder;
3219	$self->SUPER::reconfigure;	3462	$self->SUPER::reconfigure;
3220	}	3463	}
3221		3464
3222	sub DESTROY {	3465	sub destroy {
3223	my ($self) = @_;	3466	my ($self) = @_;
3224		3467
3225	$self->{timer}->cancel;	3468	$self->{timer}->cancel;
3226		3469
3227	$self->SUPER::DESTROY;	3470	$self->SUPER::destroy;
3228	}	3471	}
3229		3472
3230	#############################################################################	3473	#############################################################################
3231		3474
3232	package CFClient::UI::Inventory;	3475	package CFClient::UI::Inventory;
3233		3476
3234	our @ISA = CFClient::UI::ScrolledWindow::;	3477	our @ISA = CFClient::UI::Table::;
3235		3478
3236	sub new {	3479	sub new {
3237	my $class = shift;	3480	my $class = shift;
3238		3481
3239	my $self = $class->SUPER::new (	3482	my $self = $class->SUPER::new (
3240	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3483	col_expand => [0, 1, 0],
3241	@_,	3484	@_,
3242	);	3485	);
3243		3486
3244	$self	3487	$self
3245	}	3488	}
3246		3489
3247	sub set_items {	3490	sub set_items {
3248	my ($self, $items) = @_;	3491	my ($self, $items) = @_;
3249		3492
3250	$self->{child}->clear;	3493	$self->clear;
3251	return unless $items;	3494	return unless $items;
3252		3495
3253	my @items = sort {	3496	my @items = sort {
3254	($a->{type} <=> $b->{type})	3497	($a->{type} <=> $b->{type})
3255	or ($a->{name} cmp $b->{name})	3498	or ($a->{name} cmp $b->{name})
3256	} @$items;	3499	} values %$items;
3257		3500
3258	$self->{real_items} = \@items;	3501	$self->{real_items} = \@items;
3259		3502
3260	my $row = 0;	3503	my $row = 0;
3261	for my $item (@items) {	3504	for my $item (@items) {
3262	CFClient::Item::update_widgets $item;	3505	CFClient::Item::update_widgets $item;
3263		3506
3264	$self->{child}->add (0, $row, $item->{face_widget});	3507	$self->add (0, $row, $item->{face_widget});
3265	$self->{child}->add (1, $row, $item->{desc_widget});	3508	$self->add (1, $row, $item->{desc_widget});
3266	$self->{child}->add (2, $row, $item->{weight_widget});	3509	$self->add (2, $row, $item->{weight_widget});
3267		3510
3268	$row++;	3511	$row++;
3269	}
3270	}
3271
3272	#############################################################################
3273
3274	package CFClient::UI::BindEditor;
3275
3276	our @ISA = CFClient::UI::FancyFrame::;
3277
3278	sub new {
3279	my $class = shift;
3280
3281	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283	$self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287	text => "start recording",
3288	tooltip => "Start/Stops recording of actions."
3289	."All subsequent actions after the recording started will be captured."
3290	."The actions are displayed after the record was stopped."
3291	."To bind the action you have to click on the 'Bind' button",
3292	on_activate => sub {
3293	unless ($self->{recording}) {
3294	$self->start;
3295	} else {
3296	$self->stop;
3297	}
3298	});
3299
3300	$vb->add (new CFClient::UI::Label text => "Actions:");
3301	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3304	$vb->add (my $hb = new CFClient::UI::HBox);
3305	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306	$hb->add (new CFClient::UI::Button
3307	text => "bind",
3308	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309	on_activate => sub {
3310	$self->ask_for_bind;
3311	});
3312
3313	$vb->add (my $hb = new CFClient::UI::HBox);
3314	$hb->add (new CFClient::UI::Button
3315	text => "ok",
3316	expand => 1,
3317	tooltip => "This closes the binding editor and saves the binding",
3318	on_activate => sub {
3319	$self->hide;
3320	$self->commit;
3321	});
3322
3323	$hb->add (new CFClient::UI::Button
3324	text => "cancel",
3325	expand => 1,
3326	tooltip => "This closes the binding editor without saving",
3327	on_activate => sub {
3328	$self->hide;
3329	$self->{binding_cancel}->()
3330	if $self->{binding_cancel};
3331	});
3332
3333	$self->update_binding_widgets;
3334
3335	$self
3336	}
3337
3338	sub commit {
3339	my ($self) = @_;
3340	my ($mod, $sym, $cmds) = $self->get_binding;
3341	if ($sym != 0 && @$cmds > 0) {
3342	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343	."'. Don't forget 'Save Config'!");
3344	$self->{binding_change}->($mod, $sym, $cmds)
3345	if $self->{binding_change};
3346	} else {
3347	$::STATUSBOX->add ("No action bound, no key or action specified!");
3348	$self->{binding_cancel}->()
3349	if $self->{binding_cancel};
3350	}
3351	}
3352
3353	sub start {
3354	my ($self) = @_;
3355
3356	$self->{rec_btn}->set_text ("stop recording");
3357	$self->{recording} = 1;
3358	$self->clear_command_list;
3359	$::CONN->start_record if $::CONN;
3360	}
3361
3362	sub stop {
3363	my ($self) = @_;
3364
3365	$self->{rec_btn}->set_text ("start recording");
3366	$self->{recording} = 0;
3367
3368	my $rec;
3369	$rec = $::CONN->stop_record if $::CONN;
3370	return unless ref $rec eq 'ARRAY';
3371	$self->set_command_list ($rec);
3372	}
3373
3374
3375	sub ask_for_bind_and_commit {
3376	my ($self) = @_;
3377	$self->ask_for_bind (1);
3378	}
3379
3380	sub ask_for_bind {
3381	my ($self, $commit) = @_;
3382
3383	CFClient::Binder::open_binding_dialog (sub {
3384	my ($mod, $sym) = @_;
3385	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386	$self->update_binding_widgets;
3387	$self->commit if $commit;
3388	});
3389	}
3390
3391	# $mod and $sym are the modifiers and key symbol
3392	# $cmds is a array ref of strings (the commands)
3393	# $cb is the callback that is executed on OK
3394	# $ccb is the callback that is executed on CANCEL and
3395	# when the binding was unsuccessful on OK
3396	sub set_binding {
3397	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399	$self->clear_command_list;
3400	$self->{recording} = 0;
3401	$self->{rec_btn}->set_text ("start recording");
3402
3403	$self->{binding} = [$mod, $sym];
3404	$self->{commands} = $cmds;
3405
3406	$self->{binding_change} = $cb;
3407	$self->{binding_cancel} = $ccb;
3408
3409	$self->update_binding_widgets;
3410	}
3411
3412	# this is a shortcut method that asks for a binding
3413	# and then just binds it.
3414	sub do_quick_binding {
3415	my ($self, $cmds) = @_;
3416	$self->set_binding (undef, undef, $cmds, sub {
3417	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418	});
3419	$self->ask_for_bind (1);
3420	}
3421
3422	sub update_binding_widgets {
3423	my ($self) = @_;
3424	my ($mod, $sym, $cmds) = $self->get_binding;
3425	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426	$self->set_command_list ($cmds);
3427	}
3428
3429	sub get_binding {
3430	my ($self) = @_;
3431	return (
3432	$self->{binding}->[0],
3433	$self->{binding}->[1],
3434	[ grep { defined $_ } @{$self->{commands}} ]
3435	);
3436	}
3437
3438	sub clear_command_list {
3439	my ($self) = @_;
3440	$self->{cmdbox}->clear ();
3441	}
3442
3443	sub set_command_list {
3444	my ($self, $cmds) = @_;
3445
3446	$self->{cmdbox}->clear ();
3447	$self->{commands} = $cmds;
3448
3449	my $idx = 0;
3450
3451	for (@$cmds) {
3452	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454	my $i = $idx;
3455	$hb->add (new CFClient::UI::Label text => $_);
3456	$hb->add (new CFClient::UI::Button
3457	text => "delete",
3458	tooltip => "Deletes the action from the record",
3459	on_activate => sub {
3460	$self->{cmdbox}->remove ($hb);
3461	$cmds->[$i] = undef;
3462	});
3463
3464
3465	$idx++
3466	}	3512	}
3467	}	3513	}
3468		3514
3469	#############################################################################	3515	#############################################################################
3470		3516
…		…
3480	commands => [],	3526	commands => [],
3481	@_,	3527	@_,
3482	)	3528	)
3483	}	3529	}
3484		3530
3485	# 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
3486	sub add_spell {	3616	sub add_spell {
3487	my ($self, $spell) = @_;	3617	my ($self, $spell) = @_;
		3618
3488	$self->{spells}->{$spell->{name}} = $spell;	3619	$self->{spell}->{$spell->{name}} = $spell;
3489		3620	$self->rebuild_spell_list;
3490	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491	face => $spell->{face},
3492	can_hover => 1,
3493	can_events => 1,
3494	tooltip => $spell->{message});
3495
3496	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497	text => $spell->{name},
3498	can_hover => 1,
3499	can_events => 1,
3500	tooltip => $spell->{message},
3501	expand => 1);
3502
3503	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506	expand => 1);
3507
3508	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509	text => "bind to key",
3510	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511	}
3512
3513	sub rebuild_spell_list {
3514	my ($self) = @_;
3515	$self->{tbl_idx} = 0;
3516	$self->add_spell ($_) for values %{$self->{spells}};
3517	}	3621	}
3518		3622
3519	sub remove_spell {	3623	sub remove_spell {
3520	my ($self, $spell) = @_;	3624	my ($self, $spell) = @_;
		3625
3521	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} = {};
3522	$self->rebuild_spell_list;	3634	$self->rebuild_spell_list;
3523	}	3635	}
3524		3636
3525	#############################################################################	3637	#############################################################################
3526		3638
…		…
3563	$coord = $max - $size if $coord > $max - $size;	3675	$coord = $max - $size if $coord > $max - $size;
3564		3676
3565	int $coord + 0.5	3677	int $coord + 0.5
3566	}	3678	}
3567		3679
3568	sub size_allocate {	3680	sub invoke_size_allocate {
3569	my ($self, $w, $h) = @_;	3681	my ($self, $w, $h) = @_;
3570		3682
3571	for my $child ($self->children) {	3683	for my $child ($self->children) {
3572	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)};
3573		3685
…		…
3577	$X = _to_pixel $X, $W, $self->{w};	3689	$X = _to_pixel $X, $W, $self->{w};
3578	$Y = _to_pixel $Y, $H, $self->{h};	3690	$Y = _to_pixel $Y, $H, $self->{h};
3579		3691
3580	$child->configure ($X, $Y, $W, $H);	3692	$child->configure ($X, $Y, $W, $H);
3581	}	3693	}
		3694
		3695	1
3582	}	3696	}
3583		3697
3584	sub coord2local {	3698	sub coord2local {
3585	my ($self, $x, $y) = @_;	3699	my ($self, $x, $y) = @_;
3586		3700
…		…
3712	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3826	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713		3827
3714	$w = 0 if $w < 0;	3828	$w = 0 if $w < 0;
3715	$h = 0 if $h < 0;	3829	$h = 0 if $h < 0;
3716		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
3717	$w = int $w + 0.5;	3837	$w = int $w + 0.5;
3718	$h = int $h + 0.5;	3838	$h = int $h + 0.5;
3719		3839
3720	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}) {
3721	$widget->{old_w} = $widget->{w};	3841	$widget->{old_w} = $widget->{w};

Diff Legend

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