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.326 by root, Sun Jul 16 20:04:08 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
…		…
526	}	523	}
527		524
528	sub reconfigure {	525	sub reconfigure {
529	my ($self) = @_;	526	my ($self) = @_;
530		527
531	# some widgets cache req_w and req_h
532	delete $self->{req_w};
533	delete $self->{req_h};
534
535	$self->realloc;	528	$self->realloc;
536	$self->update;	529	$self->update;
537	}	530	}
538		531
539	# using global variables seems a bit hacky, but passing through all drawing	532	# using global variables seems a bit hacky, but passing through all drawing
…		…
546	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
547		540
548	# update screen rectangle	541	# update screen rectangle
549	local $draw_x = $draw_x + $self->{x};	542	local $draw_x = $draw_x + $self->{x};
550	local $draw_y = $draw_y + $self->{y};	543	local $draw_y = $draw_y + $self->{y};
551	local $draw_w = $draw_x + $self->{w};
552	local $draw_h = $draw_y + $self->{h};
553		544
554	# skip widgets that are entirely outside the drawing area	545	# skip widgets that are entirely outside the drawing area
555	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	546	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	547	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
557		548
…		…
596	}	587	}
597		588
598	sub DESTROY {	589	sub DESTROY {
599	my ($self) = @_;	590	my ($self) = @_;
600		591
		592	return if CFClient::in_destruct;
		593
601	delete $WIDGET{$self+0};	594	delete $WIDGET{$self+0};
602	#$self->deactivate;	595
		596	eval { $self->destroy };
		597	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
603	}	598	}
604		599
605	#############################################################################	600	#############################################################################
606		601
607	package CFClient::UI::DrawBG;	602	package CFClient::UI::DrawBG;
…		…
772	}	767	}
773		768
774	sub add {	769	sub add {
775	my ($self, $child) = @_;	770	my ($self, $child) = @_;
776		771
777	$self->{children} = [];	772	$self->SUPER::remove ($_) for @{ $self->{children} };
778
779	$self->SUPER::add ($child);	773	$self->SUPER::add ($child);
780	}	774	}
781		775
782	sub remove {	776	sub remove {
783	my ($self, $widget) = @_;	777	my ($self, $widget) = @_;
…		…
792		786
793	sub size_request {	787	sub size_request {
794	$_[0]{children}[0]->size_request	788	$_[0]{children}[0]->size_request
795	}	789	}
796		790
797	sub size_allocate {	791	sub invoke_size_allocate {
798	my ($self, $w, $h) = @_;	792	my ($self, $w, $h) = @_;
799		793
800	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
		795
		796	1
801	}	797	}
802		798
803	#############################################################################	799	#############################################################################
804		800
805	# back-buffered drawing area	801	# back-buffered drawing area
…		…
821		817
822	$ROOT->on_post_alloc ($self => sub { $self->render_child });	818	$ROOT->on_post_alloc ($self => sub { $self->render_child });
823	$self->SUPER::update;	819	$self->SUPER::update;
824	}	820	}
825		821
826	sub size_allocate {	822	sub invoke_size_allocate {
827	my ($self, $w, $h) = @_;	823	my ($self, $w, $h) = @_;
828		824
829	$self->SUPER::size_allocate ($w, $h);
830	$self->update;	825	$self->update;
		826
		827	$self->SUPER::invoke_size_allocate ($w, $h)
831	}	828	}
832		829
833	sub _render {	830	sub _render {
834	my ($self) = @_;	831	my ($self) = @_;
835		832
…		…
896	$h = 10 if $self->{scroll_y};	893	$h = 10 if $self->{scroll_y};
897		894
898	($w, $h)	895	($w, $h)
899	}	896	}
900		897
901	sub size_allocate {	898	sub invoke_size_allocate {
902	my ($self, $w, $h) = @_;	899	my ($self, $w, $h) = @_;
903		900
904	my $child = $self->child;	901	my $child = $self->child;
905		902
906	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	903	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	904	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908		905
909	$self->child->configure (0, 0, $w, $h);	906	$self->child->configure (0, 0, $w, $h);
910	$self->update;	907	$self->update;
		908
		909	1
911	}	910	}
912		911
913	sub set_offset {	912	sub set_offset {
914	my ($self, $x, $y) = @_;	913	my ($self, $x, $y) = @_;
915		914
…		…
989	$self->add ($child) if $child;	988	$self->add ($child) if $child;
990		989
991	$self	990	$self
992	}	991	}
993		992
		993	#TODO# update range on size_allocate depending on child
		994
994	sub add {	995	sub add {
995	my ($self, $widget) = @_;	996	my ($self, $widget) = @_;
996		997
997	$self->{vp}->add ($self->{child} = $widget);	998	$self->{vp}->add ($self->{child} = $widget);
998	}	999	}
999		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
1000	sub update {	1007	sub update {
1001	my ($self) = @_;	1008	my ($self) = @_;
1002		1009
1003	$self->SUPER::update;	1010	$self->SUPER::update;
1004		1011
1005	# todo: overwrite size_allocate of child	1012	$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	}	1013	}
1009		1014
1010	sub size_allocate {	1015	sub invoke_size_allocate {
1011	my ($self, $w, $h) = @_;	1016	my ($self, $w, $h) = @_;
1012		1017
		1018	$self->update_slider;
		1019
1013	$self->SUPER::size_allocate ($w, $h);	1020	$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	}	1021	}
1018
1019	#TODO# update range on size_allocate depending on child
1020	# update viewport offset on scroll
1021		1022
1022	#############################################################################	1023	#############################################################################
1023		1024
1024	package CFClient::UI::Frame;	1025	package CFClient::UI::Frame;
1025		1026
…		…
1076	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);
1077		1078
1078	sub new {	1079	sub new {
1079	my ($class, %arg) = @_;	1080	my ($class, %arg) = @_;
1080		1081
1081	my $title = delete $arg{title};
1082
1083	my $self = $class->SUPER::new (	1082	my $self = $class->SUPER::new (
1084	bg => [1, 1, 1, 1],	1083	bg => [1, 1, 1, 1],
1085	border_bg => [1, 1, 1, 1],	1084	border_bg => [1, 1, 1, 1],
1086	border => 0.6,	1085	border => 0.6,
1087	can_events => 1,	1086	can_events => 1,
1088	min_w => 16,	1087	min_w => 64,
1089	min_h => 16,	1088	min_h => 32,
1090	%arg,	1089	%arg,
1091	);	1090	);
1092		1091
1093	$self->{title} = new CFClient::UI::Label	1092	$self->{title_widget} = new CFClient::UI::Label
1094	align => 0,	1093	align => 0,
1095	valign => 1,	1094	valign => 1,
1096	text => $title,	1095	text => $self->{title},
1097	fontsize => $self->{border}	1096	fontsize => $self->{border},
1098	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	}
1099		1107
1100	$self	1108	$self
1101	}	1109	}
1102		1110
1103	sub add {	1111	sub add {
1104	my ($self, @widgets) = @_;	1112	my ($self, @widgets) = @_;
1105		1113
1106	$self->SUPER::add (@widgets);	1114	$self->SUPER::add (@widgets);
		1115	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1116	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108	}	1117	}
1109		1118
1110	sub border {	1119	sub border {
1111	int $_[0]{border} * $::FONTSIZE	1120	int $_[0]{border} * $::FONTSIZE
1112	}	1121	}
1113		1122
1114	sub size_request {	1123	sub size_request {
1115	my ($self) = @_;	1124	my ($self) = @_;
1116		1125
1117	$self->{title}->size_request	1126	$self->{title_widget}->size_request
1118	if $self->{title};	1127	if $self->{title_widget};
		1128
		1129	$self->{close_button}->size_request
		1130	if $self->{close_button};
1119		1131
1120	my ($w, $h) = $self->SUPER::size_request;	1132	my ($w, $h) = $self->SUPER::size_request;
1121		1133
1122	(	1134	(
1123	$w + $self->border * 2,	1135	$w + $self->border * 2,
1124	$h + $self->border * 2,	1136	$h + $self->border * 2,
1125	)	1137	)
1126	}	1138	}
1127		1139
1128	sub size_allocate {	1140	sub invoke_size_allocate {
1129	my ($self, $w, $h) = @_;	1141	my ($self, $w, $h) = @_;
1130		1142
1131	if ($self->{title}) {	1143	if ($self->{title_widget}) {
1132	$self->{title}{w} = $w;	1144	$self->{title_widget}{w} = $w;
1133	$self->{title}{h} = $h;	1145	$self->{title_widget}{h} = $h;
1134	$self->{title}->size_allocate ($w, $h);	1146	$self->{title_widget}->invoke_size_allocate ($w, $h);
1135	}	1147	}
1136		1148
1137	my $border = $self->border;	1149	my $border = $self->border;
1138		1150
1139	$h -= List::Util::max 0, $border * 2;	1151	$h -= List::Util::max 0, $border * 2;
1140	$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;
1141		1166
1142	$self->child->configure ($border, $border, $w, $h);	1167	1
1143	}	1168	}
1144		1169
1145	sub button_down {	1170	sub invoke_button_down {
1146	my ($self, $ev, $x, $y) = @_;	1171	my ($self, $ev, $x, $y) = @_;
1147		1172
1148	my ($w, $h) = @$self{qw(w h)};	1173	my ($w, $h) = @$self{qw(w h)};
1149	my $border = $self->border;	1174	my $border = $self->border;
1150		1175
…		…
1181		1206
1182	($x, $y) = ($ev->{x}, $ev->{y});	1207	($x, $y) = ($ev->{x}, $ev->{y});
1183		1208
1184	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1209	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185	# HACK: the next line is required to enforce placement	1210	# HACK: the next line is required to enforce placement
1186	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1211	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187	};	1212	};
1188	} else {	1213	} else {
1189	return 0;	1214	return 0;
1190	}	1215	}
1191		1216
1192	1	1217	1
1193	}	1218	}
1194		1219
1195	sub button_up {	1220	sub invoke_button_up {
1196	my ($self, $ev, $x, $y) = @_;	1221	my ($self, $ev, $x, $y) = @_;
1197		1222
1198	!!delete $self->{motion}	1223	! ! delete $self->{motion}
1199	}	1224	}
1200		1225
1201	sub mouse_motion {	1226	sub invoke_mouse_motion {
1202	my ($self, $ev, $x, $y) = @_;	1227	my ($self, $ev, $x, $y) = @_;
1203		1228
1204	$self->{motion}->($ev, $x, $y) if $self->{motion};	1229	$self->{motion}->($ev, $x, $y) if $self->{motion};
1205		1230
1206	!!$self->{motion}	1231	! ! $self->{motion}
1207	}	1232	}
1208		1233
1209	sub _draw {	1234	sub _draw {
1210	my ($self) = @_;	1235	my ($self) = @_;
1211		1236
…		…
1237		1262
1238	glDisable GL_TEXTURE_2D;	1263	glDisable GL_TEXTURE_2D;
1239		1264
1240	$child->draw;	1265	$child->draw;
1241		1266
1242	if ($self->{title}) {	1267	if ($self->{title_widget}) {
1243	glTranslate 0, $border - $self->{h};	1268	glTranslate 0, $border - $self->{h};
1244	$self->{title}->_draw;	1269	$self->{title_widget}->_draw;
		1270
		1271	glTranslate 0, - ($border - $self->{h});
1245	}	1272	}
		1273
		1274	$self->{close_button}->draw
		1275	if $self->{close_button};
1246	}	1276	}
1247		1277
1248	#############################################################################	1278	#############################################################################
1249		1279
1250	package CFClient::UI::Table;	1280	package CFClient::UI::Table;
…		…
1273		1303
1274	$child->set_parent ($self);	1304	$child->set_parent ($self);
1275	$self->{children}[$y][$x] = $child;	1305	$self->{children}[$y][$x] = $child;
1276		1306
1277	$self->realloc;	1307	$self->realloc;
		1308	}
		1309
		1310	sub remove {
		1311	my ($self, $child) = @_;
		1312
		1313	# TODO: not yet implemented
1278	}	1314	}
1279		1315
1280	# 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?
1281	sub clear {	1317	sub clear {
1282	my ($self) = @_;	1318	my ($self) = @_;
…		…
1323	(sum @$ws),	1359	(sum @$ws),
1324	(sum @$hs),	1360	(sum @$hs),
1325	)	1361	)
1326	}	1362	}
1327		1363
1328	sub size_allocate {	1364	sub invoke_size_allocate {
1329	my ($self, $w, $h) = @_;	1365	my ($self, $w, $h) = @_;
1330		1366
1331	my ($ws, $hs) = $self->get_wh;	1367	my ($ws, $hs) = $self->get_wh;
1332		1368
1333	my $req_w = (sum @$ws) || 1;	1369	my $req_w = (sum @$ws) || 1;
…		…
1365	}	1401	}
1366		1402
1367	$y += $row_h;	1403	$y += $row_h;
1368	}	1404	}
1369		1405
		1406	1
1370	}	1407	}
1371		1408
1372	sub find_widget {	1409	sub find_widget {
1373	my ($self, $x, $y) = @_;	1410	my ($self, $x, $y) = @_;
1374		1411
…		…
1411	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1448	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1449	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1413	)	1450	)
1414	}	1451	}
1415		1452
1416	sub size_allocate {	1453	sub invoke_size_allocate {
1417	my ($self, $w, $h) = @_;	1454	my ($self, $w, $h) = @_;
1418		1455
1419	my $space = $self->{vertical} ? $h : $w;	1456	my $space = $self->{vertical} ? $h : $w;
1420	my $children = $self->{children};	1457	my @children = $self->visible_children;
1421		1458
1422	my @req;	1459	my @req;
1423		1460
1424	if ($self->{homogeneous}) {	1461	if ($self->{homogeneous}) {
1425	@req = ($space / (@$children || 1)) x @$children;	1462	@req = ($space / (@children || 1)) x @children;
1426	} else {	1463	} else {
1427	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1464	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428	my $req = List::Util::sum @req;	1465	my $req = List::Util::sum @req;
1429		1466
1430	if ($req > $space) {	1467	if ($req > $space) {
1431	# ah well, not enough space	1468	# ah well, not enough space
1432	$_ *= $space / $req for @req;	1469	$_ *= $space / $req for @req;
1433	} else {	1470	} else {
1434	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1471	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435		1472
1436	$space = ($space - $req) / $expand; # remaining space to give away	1473	$space = ($space - $req) / $expand; # remaining space to give away
1437		1474
1438	$req[$_] += $space * $children->[$_]{expand}	1475	$req[$_] += $space * $children[$_]{expand}
1439	for 0 .. $#$children;	1476	for 0 .. $#children;
1440	}	1477	}
1441	}	1478	}
1442		1479
1443	CFClient::UI::harmonize \@req;	1480	CFClient::UI::harmonize \@req;
1444		1481
1445	my $pos = 0;	1482	my $pos = 0;
1446	for (0 .. $#$children) {	1483	for (0 .. $#children) {
1447	my $alloc = $req[$_];	1484	my $alloc = $req[$_];
1448	$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));
1449		1486
1450	$pos += $alloc;	1487	$pos += $alloc;
1451	}	1488	}
1452		1489
1453	1	1490	1
…		…
1556	my ($self, $text) = @_;	1593	my ($self, $text) = @_;
1557		1594
1558	return if $self->{text} eq "T$text";	1595	return if $self->{text} eq "T$text";
1559	$self->{text} = "T$text";	1596	$self->{text} = "T$text";
1560		1597
1561	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562	$self->{layout}->set_text ($text);	1598	$self->{layout}->set_text ($text);
1563		1599
1564	delete $self->{req_h};	1600	delete $self->{size_req};
1565	$self->realloc;	1601	$self->realloc;
1566	$self->update;	1602	$self->update;
1567	}	1603	}
1568		1604
1569	sub set_markup {	1605	sub set_markup {
…		…
1572	return if $self->{text} eq "M$markup";	1608	return if $self->{text} eq "M$markup";
1573	$self->{text} = "M$markup";	1609	$self->{text} = "M$markup";
1574		1610
1575	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1611	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576		1612
1577	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578	$self->{layout}->set_markup ($markup);	1613	$self->{layout}->set_markup ($markup);
1579		1614
1580	delete $self->{req_h};	1615	delete $self->{size_req};
1581	$self->realloc;	1616	$self->realloc;
1582	$self->update;	1617	$self->update;
1583	}	1618	}
1584		1619
1585	sub size_request {	1620	sub size_request {
1586	my ($self) = @_;	1621	my ($self) = @_;
1587		1622
1588	if (exists $self->{req_h}) {	1623	$self->{size_req} ||= do {
1589	@$self{qw(req_w req_h)}
1590	} else {
1591	$self->{layout}->set_font ($self->{font}) if $self->{font};	1624	$self->{layout}->set_font ($self->{font}) if $self->{font};
1592	$self->{layout}->set_width ($self->{max_w} || -1);	1625	$self->{layout}->set_width ($self->{max_w} || -1);
1593	$self->{layout}->set_ellipsise ($self->{ellipsise});	1626	$self->{layout}->set_ellipsise ($self->{ellipsise});
1594	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1627	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1628	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596		1629
1597	my ($w, $h) = $self->{layout}->size;	1630	my ($w, $h) = $self->{layout}->size;
1598		1631
1599	if (exists $self->{template}) {	1632	if (exists $self->{template}) {
1600	$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);
1601	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1635	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602		1636
1603	my ($w2, $h2) = $self->{template}->size;	1637	my ($w2, $h2) = $self->{template}->size;
1604		1638
1605	$w = List::Util::max $w, $w2;	1639	$w = List::Util::max $w, $w2;
1606	$h = List::Util::max $h, $h2;	1640	$h = List::Util::max $h, $h2;
1607	}	1641	}
1608		1642
1609	($w, $h)	1643	[$w, $h]
1610	}	1644	};
1611	}
1612		1645
		1646	@{ $self->{size_req} }
		1647	}
		1648
		1649	sub baseline_shift {
		1650	$_[0]{layout}->descent
		1651	}
		1652
1613	sub size_allocate {	1653	sub invoke_size_allocate {
1614	my ($self, $w, $h) = @_;	1654	my ($self, $w, $h) = @_;
1615		1655
1616	delete $self->{ox};	1656	delete $self->{ox};
1617		1657
1618	delete $self->{texture}	1658	delete $self->{texture}
1619	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
1620	}	1662	}
1621		1663
1622	sub set_fontsize {	1664	sub set_fontsize {
1623	my ($self, $fontsize) = @_;	1665	my ($self, $fontsize) = @_;
1624		1666
1625	$self->{fontsize} = $fontsize;	1667	$self->{fontsize} = $fontsize;
		1668	delete $self->{size_req};
1626	delete $self->{texture};	1669	delete $self->{texture};
1627		1670
1628	$self->realloc;	1671	$self->realloc;
1629	}	1672	}
1630		1673
		1674	sub reconfigure {
		1675	my ($self) = @_;
		1676
		1677	delete $self->{size_req};
		1678	delete $self->{texture};
		1679
		1680	$self->SUPER::reconfigure;
		1681	}
		1682
1631	sub _draw {	1683	sub _draw {
1632	my ($self) = @_;	1684	my ($self) = @_;
1633		1685
1634	$self->SUPER::_draw; # draw background, if applicable	1686	$self->SUPER::_draw; # draw background, if applicable
1635		1687
1636	my $tex = $self->{texture} ||= do {	1688	my $size = $self->{texture} ||= do {
1637	$self->{layout}->set_foreground (@{$self->{fg}});	1689	$self->{layout}->set_foreground (@{$self->{fg}});
1638	$self->{layout}->set_font ($self->{font}) if $self->{font};	1690	$self->{layout}->set_font ($self->{font}) if $self->{font};
1639	$self->{layout}->set_width ($self->{w});	1691	$self->{layout}->set_width ($self->{w});
1640	$self->{layout}->set_ellipsise ($self->{ellipsise});	1692	$self->{layout}->set_ellipsise ($self->{ellipsise});
1641	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1693	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1694	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643		1695
1644	new_from_layout CFClient::Texture $self->{layout}	1696	[$self->{layout}->size]
1645	};	1697	};
1646		1698
1647	unless (exists $self->{ox}) {	1699	unless (exists $self->{ox}) {
1648	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1700	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1701	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650	: ($self->{w} - $tex->{w}) * 0.5);	1702	: ($self->{w} - $size->[0]) * 0.5);
1651		1703
1652	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1704	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1705	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654	: ($self->{h} - $tex->{h}) * 0.5);	1706	: ($self->{h} - $size->[1]) * 0.5);
1655	};	1707	};
1656		1708
1657	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];
1658		1711
1659	if ($tex->{format} == GL_ALPHA) {	1712	$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	}	1713	}
1670		1714
1671	#############################################################################	1715	#############################################################################
1672		1716
1673	package CFClient::UI::EntryBase;	1717	package CFClient::UI::EntryBase;
…		…
1687	can_hover => 1,	1731	can_hover => 1,
1688	can_focus => 1,	1732	can_focus => 1,
1689	valign => 0,	1733	valign => 0,
1690	can_events => 1,	1734	can_events => 1,
1691	#text => ...	1735	#text => ...
		1736	#hidden => "*",
1692	@_	1737	@_
1693	)	1738	)
1694	}	1739	}
1695		1740
1696	sub _set_text {	1741	sub _set_text {
…		…
1703	$self->{last_activity} = $::NOW;	1748	$self->{last_activity} = $::NOW;
1704	$self->{text} = $text;	1749	$self->{text} = $text;
1705		1750
1706	$text =~ s/./*/g if $self->{hidden};	1751	$text =~ s/./*/g if $self->{hidden};
1707	$self->{layout}->set_text ("$text ");	1752	$self->{layout}->set_text ("$text ");
1708	delete $self->{req_h};	1753	delete $self->{size_req};
1709		1754
1710	$self->_emit (changed => $self->{text});	1755	$self->emit (changed => $self->{text});
1711		1756
1712	$self->realloc;	1757	$self->realloc;
1713	$self->update;	1758	$self->update;
1714	}	1759	}
1715		1760
…		…
1730	my ($w, $h) = $self->SUPER::size_request;	1775	my ($w, $h) = $self->SUPER::size_request;
1731		1776
1732	($w + 1, $h) # add 1 for cursor	1777	($w + 1, $h) # add 1 for cursor
1733	}	1778	}
1734		1779
1735	sub key_down {	1780	sub invoke_key_down {
1736	my ($self, $ev) = @_;	1781	my ($self, $ev) = @_;
1737		1782
1738	my $mod = $ev->{mod};	1783	my $mod = $ev->{mod};
1739	my $sym = $ev->{sym};	1784	my $sym = $ev->{sym};
1740	my $uni = $ev->{unicode};	1785	my $uni = $ev->{unicode};
…		…
1752	} elsif ($sym == CFClient::SDLK_HOME) {	1797	} elsif ($sym == CFClient::SDLK_HOME) {
1753	$self->{cursor} = 0;	1798	$self->{cursor} = 0;
1754	} elsif ($sym == CFClient::SDLK_END) {	1799	} elsif ($sym == CFClient::SDLK_END) {
1755	$self->{cursor} = length $text;	1800	$self->{cursor} = length $text;
1756	} elsif ($uni == 27) {	1801	} elsif ($uni == 27) {
1757	$self->_emit ('escape');	1802	$self->emit ('escape');
1758	} elsif ($uni) {	1803	} elsif ($uni) {
1759	substr $text, $self->{cursor}++, 0, chr $uni;	1804	substr $text, $self->{cursor}++, 0, chr $uni;
1760	} else {	1805	} else {
1761	return 0;	1806	return 0;
1762	}	1807	}
…		…
1766	$self->realloc;	1811	$self->realloc;
1767		1812
1768	1	1813	1
1769	}	1814	}
1770		1815
1771	sub focus_in {	1816	sub invoke_focus_in {
1772	my ($self) = @_;	1817	my ($self) = @_;
1773		1818
1774	$self->{last_activity} = $::NOW;	1819	$self->{last_activity} = $::NOW;
1775		1820
1776	$self->SUPER::focus_in;	1821	$self->SUPER::invoke_focus_in
1777	}	1822	}
1778		1823
1779	sub button_down {	1824	sub invoke_button_down {
1780	my ($self, $ev, $x, $y) = @_;	1825	my ($self, $ev, $x, $y) = @_;
1781		1826
1782	$self->SUPER::button_down ($ev, $x, $y);	1827	$self->SUPER::invoke_button_down ($ev, $x, $y);
1783		1828
1784	my $idx = $self->{layout}->xy_to_index ($x, $y);	1829	my $idx = $self->{layout}->xy_to_index ($x, $y);
1785		1830
1786	# byte-index to char-index	1831	# byte-index to char-index
1787	my $text = $self->{text};	1832	my $text = $self->{text};
1788	utf8::encode $text;	1833	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789	$self->{cursor} = length substr $text, 0, $idx;	1834	$self->{cursor} = length $text;
1790		1835
1791	$self->_set_text ($self->{text});	1836	$self->_set_text ($self->{text});
1792	$self->update;	1837	$self->update;
1793		1838
1794	1	1839	1
1795	}	1840	}
1796		1841
1797	sub mouse_motion {	1842	sub invoke_mouse_motion {
1798	my ($self, $ev, $x, $y) = @_;	1843	my ($self, $ev, $x, $y) = @_;
1799	# 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#
1800		1845
1801	0	1846	1
1802	}	1847	}
1803		1848
1804	sub _draw {	1849	sub _draw {
1805	my ($self) = @_;	1850	my ($self) = @_;
1806		1851
…		…
1847		1892
1848	our @ISA = CFClient::UI::EntryBase::;	1893	our @ISA = CFClient::UI::EntryBase::;
1849		1894
1850	use CFClient::OpenGL;	1895	use CFClient::OpenGL;
1851		1896
1852	sub key_down {	1897	sub invoke_key_down {
1853	my ($self, $ev) = @_;	1898	my ($self, $ev) = @_;
1854		1899
1855	my $sym = $ev->{sym};	1900	my $sym = $ev->{sym};
1856		1901
1857	if ($sym == 13) {	1902	if ($sym == 13) {
1858	unshift @{$self->{history}},	1903	unshift @{$self->{history}},
1859	my $txt = $self->get_text;	1904	my $txt = $self->get_text;
		1905
1860	$self->{history_pointer} = -1;	1906	$self->{history_pointer} = -1;
1861	$self->{history_saveback} = '';	1907	$self->{history_saveback} = '';
1862	$self->_emit (activate => $txt);	1908	$self->emit (activate => $txt);
1863	$self->update;	1909	$self->update;
1864		1910
1865	} elsif ($sym == CFClient::SDLK_UP) {	1911	} elsif ($sym == CFClient::SDLK_UP) {
1866	if ($self->{history_pointer} < 0) {	1912	if ($self->{history_pointer} < 0) {
1867	$self->{history_saveback} = $self->get_text;	1913	$self->{history_saveback} = $self->get_text;
…		…
1883	} else {	1929	} else {
1884	$self->set_text ($self->{history_saveback});	1930	$self->set_text ($self->{history_saveback});
1885	}	1931	}
1886		1932
1887	} else {	1933	} else {
1888	return $self->SUPER::key_down ($ev)	1934	return $self->SUPER::invoke_key_down ($ev)
1889	}	1935	}
1890		1936
1891	1	1937	1
1892	}	1938	}
1893		1939
…		…
1917	can_events => 1,	1963	can_events => 1,
1918	@_	1964	@_
1919	)	1965	)
1920	}	1966	}
1921		1967
1922	sub activate { }
1923
1924	sub button_up {	1968	sub invoke_button_up {
1925	my ($self, $ev, $x, $y) = @_;	1969	my ($self, $ev, $x, $y) = @_;
1926		1970
1927	$self->emit ("activate")	1971	$self->emit ("activate")
1928	if $x >= 0 && $x < $self->{w}	1972	if $x >= 0 && $x < $self->{w}
1929	&& $y >= 0 && $y < $self->{h};	1973	&& $y >= 0 && $y < $self->{h};
…		…
1943	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1987	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1944		1988
1945	glDisable GL_TEXTURE_2D;	1989	glDisable GL_TEXTURE_2D;
1946		1990
1947	$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
1948	}	2028	}
1949		2029
1950	#############################################################################	2030	#############################################################################
1951		2031
1952	package CFClient::UI::CheckBox;	2032	package CFClient::UI::CheckBox;
…		…
1979	my ($self) = @_;	2059	my ($self) = @_;
1980		2060
1981	(6) x 2	2061	(6) x 2
1982	}	2062	}
1983		2063
		2064	sub toggle {
		2065	my ($self) = @_;
		2066
		2067	$self->{state} = !$self->{state};
		2068	$self->emit (changed => $self->{state});
		2069	$self->update;
		2070	}
		2071
1984	sub button_down {	2072	sub invoke_button_down {
1985	my ($self, $ev, $x, $y) = @_;	2073	my ($self, $ev, $x, $y) = @_;
1986		2074
1987	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2075	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2076	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989	$self->{state} = !$self->{state};	2077	$self->toggle;
1990	$self->_emit (changed => $self->{state});
1991	} else {	2078	} else {
1992	return 0	2079	return 0
1993	}	2080	}
1994		2081
1995	1	2082	1
…		…
2020	package CFClient::UI::Image;	2107	package CFClient::UI::Image;
2021		2108
2022	our @ISA = CFClient::UI::Base::;	2109	our @ISA = CFClient::UI::Base::;
2023		2110
2024	use CFClient::OpenGL;	2111	use CFClient::OpenGL;
2025	use Carp qw/confess/;
2026		2112
2027	our %loaded_images;	2113	our %texture_cache;
2028		2114
2029	sub new {	2115	sub new {
2030	my $class = shift;	2116	my $class = shift;
2031		2117
2032	my $self = $class->SUPER::new (can_events => 0, @_);	2118	my $self = $class->SUPER::new (
		2119	can_events => 0,
		2120	@_,
		2121	);
2033		2122
2034	$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";
2035		2125
2036	$loaded_images{$self->{image}} ||=	2126	$self->{tex} = $texture_cache{$self->{path}} ||=
2037	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;
2038		2128
2039	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2129	Scalar::Util::weaken $texture_cache{$self->{path}};
2040		2130
2041	Scalar::Util::weaken $loaded_images{$self->{image}};	2131	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043	$self->{aspect} = $tex->{w} / $tex->{h};
2044		2132
2045	$self	2133	$self
2046	}	2134	}
2047		2135
2048	sub size_request {	2136	sub size_request {
2049	my ($self) = @_;	2137	my ($self) = @_;
2050		2138
2051	($self->{tex}->{w}, $self->{tex}->{h})	2139	($self->{tex}{w}, $self->{tex}{h})
2052	}	2140	}
2053		2141
2054	sub _draw {	2142	sub _draw {
2055	my ($self) = @_;	2143	my ($self) = @_;
2056		2144
…		…
2165	my $ycut1 = max 0, min 1, $ycut;	2253	my $ycut1 = max 0, min 1, $ycut;
2166	my $ycut2 = max 0, min 1, $ycut - 1;	2254	my $ycut2 = max 0, min 1, $ycut - 1;
2167		2255
2168	my $h1 = $self->{h} * (1 - $ycut1);	2256	my $h1 = $self->{h} * (1 - $ycut1);
2169	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);
2170		2261
2171	glEnable GL_BLEND;	2262	glEnable GL_BLEND;
2172	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2263	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2264	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174	glEnable GL_TEXTURE_2D;	2265	glEnable GL_TEXTURE_2D;
…		…
2193		2284
2194	if ($t3) {	2285	if ($t3) {
2195	glBindTexture GL_TEXTURE_2D, $t3->{name};	2286	glBindTexture GL_TEXTURE_2D, $t3->{name};
2196	glBegin GL_QUADS;	2287	glBegin GL_QUADS;
2197	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2288	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2289	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2290	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2291	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201	glEnd;	2292	glEnd;
2202	}	2293	}
2203		2294
2204	glDisable GL_BLEND;	2295	glDisable GL_BLEND;
…		…
2292	$self->update;	2383	$self->update;
2293		2384
2294	$self	2385	$self
2295	}	2386	}
2296		2387
2297	sub changed { }
2298
2299	sub set_range {	2388	sub set_range {
2300	my ($self, $range) = @_;	2389	my ($self, $range) = @_;
2301		2390
2302	($range, $self->{range}) = ($self->{range}, $range);	2391	($range, $self->{range}) = ($self->{range}, $range);
2303		2392
2304	$self->update
2305	if "@$range" ne "@{$self->{range}}";	2393	if ("@$range" ne "@{$self->{range}}") {
		2394	$self->update;
		2395	$self->set_value ($self->{range}[0]);
		2396	}
2306	}	2397	}
2307		2398
2308	sub set_value {	2399	sub set_value {
2309	my ($self, $value) = @_;	2400	my ($self, $value) = @_;
2310		2401
…		…
2321	if $unit;	2412	if $unit;
2322		2413
2323	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2414	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324		2415
2325	if ($value != $old_value) {	2416	if ($value != $old_value) {
2326	$self->_emit (changed => $value);	2417	$self->emit (changed => $value);
2327	$self->update;	2418	$self->update;
2328	}	2419	}
2329	}	2420	}
2330		2421
2331	sub size_request {	2422	sub size_request {
2332	my ($self) = @_;	2423	my ($self) = @_;
2333		2424
2334	($self->{req_w}, $self->{req_h})	2425	($self->{req_w}, $self->{req_h})
2335	}	2426	}
2336		2427
2337	sub button_down {	2428	sub invoke_button_down {
2338	my ($self, $ev, $x, $y) = @_;	2429	my ($self, $ev, $x, $y) = @_;
2339		2430
2340	$self->SUPER::button_down ($ev, $x, $y);	2431	$self->SUPER::invoke_button_down ($ev, $x, $y);
2341		2432
2342	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2433	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343		2434
2344	$self->mouse_motion ($ev, $x, $y)	2435	$self->invoke_mouse_motion ($ev, $x, $y)
2345	}	2436	}
2346		2437
2347	sub mouse_motion {	2438	sub invoke_mouse_motion {
2348	my ($self, $ev, $x, $y) = @_;	2439	my ($self, $ev, $x, $y) = @_;
2349		2440
2350	if ($GRAB == $self) {	2441	if ($GRAB == $self) {
2351	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2442	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352		2443
…		…
2457	sub set_range { shift->{slider}->set_range (@_) }	2548	sub set_range { shift->{slider}->set_range (@_) }
2458	sub set_value { shift->{slider}->set_value (@_) }	2549	sub set_value { shift->{slider}->set_value (@_) }
2459		2550
2460	#############################################################################	2551	#############################################################################
2461		2552
2462	package CFClient::UI::TextView;	2553	package CFClient::UI::TextScroller;
2463		2554
2464	our @ISA = CFClient::UI::HBox::;	2555	our @ISA = CFClient::UI::HBox::;
2465		2556
2466	use CFClient::OpenGL;	2557	use CFClient::OpenGL;
2467		2558
…		…
2469	my $class = shift;	2560	my $class = shift;
2470		2561
2471	my $self = $class->SUPER::new (	2562	my $self = $class->SUPER::new (
2472	fontsize => 1,	2563	fontsize => 1,
2473	can_events => 0,	2564	can_events => 0,
		2565	indent => 0,
2474	#font => default_font	2566	#font => default_font
2475	@_,	2567	@_,
2476		2568
2477	layout => (new CFClient::Layout 1),	2569	layout => (new CFClient::Layout),
2478	par => [],	2570	par => [],
2479	height => 0,	2571	height => 0,
2480	children => [	2572	children => [
2481	(new CFClient::UI::Empty expand => 1),	2573	(new CFClient::UI::Empty expand => 1),
2482	(new CFClient::UI::Slider vertical => 1),	2574	(new CFClient::UI::Slider vertical => 1),
…		…
2493		2585
2494	$self->{fontsize} = $fontsize;	2586	$self->{fontsize} = $fontsize;
2495	$self->reflow;	2587	$self->reflow;
2496	}	2588	}
2497		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
2498	sub size_allocate {	2599	sub invoke_size_allocate {
2499	my ($self, $w, $h) = @_;	2600	my ($self, $w, $h) = @_;
2500		2601
2501	$self->SUPER::size_allocate ($w, $h);	2602	my ($empty, $slider, @other) = @{ $self->{children} };
		2603	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502		2604
2503	$self->{layout}->set_font ($self->{font}) if $self->{font};	2605	$self->{layout}->set_font ($self->{font}) if $self->{font};
2504	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2606	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505	$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});
2506		2609
2507	$self->reflow;	2610	$self->reflow;
2508	}
2509		2611
2510	sub text_size {	2612	local $self->{children} = [$empty, $slider];
2511	my ($self, $text, $indent) = @_;	2613	$self->SUPER::invoke_size_allocate ($w, $h)
		2614	}
		2615
		2616	sub get_layout {
		2617	my ($self, $para) = @_;
2512		2618
2513	my $layout = $self->{layout};	2619	my $layout = $self->{layout};
2514		2620
		2621	$layout->set_font ($self->{font}) if $self->{font};
		2622	$layout->set_foreground (@{$para->{fg}});
2515	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2623	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516	$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});
2517	$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}}
2518		2632	);
		2633
2519	$layout->size	2634	$layout
2520	}	2635	}
2521		2636
2522	sub reflow {	2637	sub reflow {
2523	my ($self) = @_;	2638	my ($self) = @_;
2524		2639
…		…
2533	$self->{children}[1]->set_value ($offset);	2648	$self->{children}[1]->set_value ($offset);
2534	}	2649	}
2535		2650
2536	sub clear {	2651	sub clear {
2537	my ($self) = @_;	2652	my ($self) = @_;
		2653
		2654	my (undef, undef, @other) = @{ $self->{children} };
		2655	$self->remove ($_) for @other;
2538		2656
2539	$self->{par} = [];	2657	$self->{par} = [];
2540	$self->{height} = 0;	2658	$self->{height} = 0;
2541	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2659	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542	}	2660	}
2543		2661
2544	sub add_paragraph {	2662	sub add_paragraph {
2545	my ($self, $color, $text, $indent) = @_;	2663	my ($self, $color, $para, $indent) = @_;
2546		2664
2547	for my $line (split /\n/, $text) {	2665	my ($text, @w) = ref $para ? @$para : $para;
2548	my ($w, $h) = $self->text_size ($line);	2666
2549	$self->{height} += $h;	2667	$para = {
2550	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,
2551	}	2674	};
2552		2675
2553	$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;
2554	}	2688	}
2555		2689
2556	sub update {	2690	sub update {
2557	my ($self) = @_;	2691	my ($self) = @_;
2558		2692
…		…
2560		2694
2561	return unless $self->{h} > 0;	2695	return unless $self->{h} > 0;
2562		2696
2563	delete $self->{texture};	2697	delete $self->{texture};
2564		2698
2565	$ROOT->on_post_alloc ($self, sub {	2699	$ROOT->on_post_alloc ($self => sub {
2566	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2700	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567		2701
2568	if (delete $self->{need_reflow}) {	2702	if (delete $self->{need_reflow}) {
2569	my $height = 0;	2703	my $height = 0;
2570		2704
2571	my $layout = $self->{layout};
2572
2573	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2575	for (@{$self->{par}}) {	2705	for my $para (@{$self->{par}}) {
2576	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2706	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2577	$layout->set_width ($W - $_->[3]);	2707	my $layout = $self->get_layout ($para);
2578	$layout->set_markup ($_->[4]);
2579	my ($w, $h) = $layout->size;	2708	my ($w, $h) = $layout->size;
2580	$_->[0] = $w + $_->[3];	2709
2581	$_->[1] = $h;	2710	$para->{w} = $w + $para->{indent};
		2711	$para->{h} = $h;
		2712	$para->{wrapped} = $layout->has_wrapped;
2582	}	2713	}
2583		2714
2584	$height += $_->[1];	2715	$height += $para->{h};
2585	}	2716	}
2586		2717
2587	$self->{height} = $height;	2718	$self->{height} = $height;
2588		2719
2589	$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]);
2590		2721
2591	delete $self->{texture};	2722	delete $self->{texture};
		2723	}
		2724
		2725	if (delete $self->{scroll_to_bottom}) {
		2726	$self->{children}[1]->set_value (1e10);
2592	}	2727	}
2593		2728
2594	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2729	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2595	glClearColor 0, 0, 0, 0;	2730	glClearColor 0, 0, 0, 0;
2596	glClear GL_COLOR_BUFFER_BIT;	2731	glClear GL_COLOR_BUFFER_BIT;
…		…
2600	my $y0 = $top;	2735	my $y0 = $top;
2601	my $y1 = $top + $H;	2736	my $y1 = $top + $H;
2602		2737
2603	my $y = 0;	2738	my $y = 0;
2604		2739
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}}) {	2740	for my $para (@{$self->{par}}) {
2614	my $h = $par->[1];	2741	my $h = $para->{h};
2615		2742
2616	if ($y0 < $y + $h && $y < $y1) {	2743	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		2744
2621	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2745	my $layout = $self->get_layout ($para);
2622		2746
2623	glRasterPos $par->[3], $y - $y0;	2747	$layout->render ($para->{indent}, $y - $y0);
2624	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	}
2625	}	2761	}
2626		2762
2627	$y += $h;	2763	$y += $h;
2628	}	2764	}
2629
2630	glDisable GL_BLEND;
2631	};	2765	};
2632	});	2766	});
		2767	}
		2768
		2769	sub reconfigure {
		2770	my ($self) = @_;
		2771
		2772	$self->SUPER::reconfigure;
		2773
		2774	$_->{w} = 1e10 for @{ $self->{par} };
		2775	$self->reflow;
2633	}	2776	}
2634		2777
2635	sub _draw {	2778	sub _draw {
2636	my ($self) = @_;	2779	my ($self) = @_;
2637		2780
…		…
2640	glColor 0, 0, 0, 1;	2783	glColor 0, 0, 0, 1;
2641	$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});
2642	glDisable GL_TEXTURE_2D;	2785	glDisable GL_TEXTURE_2D;
2643		2786
2644	$self->{children}[1]->draw;	2787	$self->{children}[1]->draw;
2645
2646	}	2788	}
2647		2789
2648	#############################################################################	2790	#############################################################################
2649		2791
2650	package CFClient::UI::Animator;	2792	package CFClient::UI::Animator;
…		…
2737	$tooltip .= "\n\n" . (ref $widget) . "\n"	2879	$tooltip .= "\n\n" . (ref $widget) . "\n"
2738	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2880	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739	. "req $widget->{req_w} $widget->{req_h}\n"	2881	. "req $widget->{req_w} $widget->{req_h}\n"
2740	. "visible $widget->{visible}";	2882	. "visible $widget->{visible}";
2741	}	2883	}
		2884
		2885	$tooltip =~ s/^\n+//;
		2886	$tooltip =~ s/\n+$//;
2742		2887
2743	$self->add (new CFClient::UI::Label	2888	$self->add (new CFClient::UI::Label
2744	markup => $tooltip,	2889	markup => $tooltip,
2745	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746	fontsize => 0.8,	2891	fontsize => 0.8,
…		…
2756	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2901	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757		2902
2758	($w + 4, $h + 4)	2903	($w + 4, $h + 4)
2759	}	2904	}
2760		2905
2761	sub size_allocate {	2906	sub invoke_size_allocate {
2762	my ($self, $w, $h) = @_;	2907	my ($self, $w, $h) = @_;
2763		2908
2764	$self->SUPER::size_allocate ($w - 4, $h - 4);	2909	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765	}	2910	}
2766		2911
2767	sub visibility_change {	2912	sub invoke_visibility_change {
2768	my ($self, $visible) = @_;	2913	my ($self, $visible) = @_;
2769		2914
2770	return unless $visible;	2915	return unless $visible;
2771		2916
2772	$self->{root}->on_post_alloc ("move_$self" => sub {	2917	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2774	or return;	2919	or return;
2775		2920
2776	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777		2922
2778	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779	if $x + $self->{w} > $::WIDTH;	2924	if $x + $self->{w} > $self->{root}{w};
2780		2925
2781	$self->move_abs ($x, $y);	2926	$self->move_abs ($x, $y);
2782	});	2927	});
2783	}	2928	}
2784		2929
…		…
2879	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3024	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880	glDisable GL_TEXTURE_2D;	3025	glDisable GL_TEXTURE_2D;
2881	}	3026	}
2882	}	3027	}
2883		3028
2884	sub DESTROY {	3029	sub destroy {
2885	my ($self) = @_;	3030	my ($self) = @_;
2886		3031
2887	$self->{timer}->cancel	3032	$self->{timer}->cancel
2888	if $self->{timer};	3033	if $self->{timer};
2889		3034
2890	$self->SUPER::DESTROY;	3035	$self->SUPER::destroy;
2891	}	3036	}
2892		3037
2893	#############################################################################	3038	#############################################################################
2894		3039
2895	package CFClient::UI::Buttonbar;	3040	package CFClient::UI::Buttonbar;
…		…
2916	);	3061	);
2917		3062
2918	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2919		3064
2920	for my $item (@{ $self->{items} }) {	3065	for my $item (@{ $self->{items} }) {
2921	my ($widget, $cb) = @$item;	3066	my ($widget, $cb, $tooltip) = @$item;
2922		3067
2923	# handle various types of items, only text for now	3068	# handle various types of items, only text for now
2924	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 {
2925	$widget = new CFClient::UI::Label	3084	$widget = new CFClient::UI::Label
2926	can_hover => 1,	3085	can_hover => 1,
2927	can_events => 1,	3086	can_events => 1,
2928	text => $widget;	3087	markup => $widget,
		3088	tooltip => $tooltip;
		3089	}
2929	}	3090	}
2930		3091
2931	$self->{item}{$widget} = $item;	3092	$self->{item}{$widget} = $item;
2932		3093
2933	$self->{vbox}->add ($widget);	3094	$self->{vbox}->add ($widget);
…		…
2938		3099
2939	# 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)
2940	sub popup {	3101	sub popup {
2941	my ($self, $ev) = @_;	3102	my ($self, $ev) = @_;
2942		3103
2943	$self->_emit ("popdown");	3104	$self->emit ("popdown");
2944		3105
2945	# maybe save $GRAB? must be careful about events...	3106	# maybe save $GRAB? must be careful about events...
2946	$GRAB = $self;	3107	$GRAB = $self;
2947	$self->{button} = $ev->{button};	3108	$self->{button} = $ev->{button};
2948		3109
2949	$self->show;	3110	$self->show;
2950	$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);
2951	}	3112	}
2952		3113
2953	sub mouse_motion {	3114	sub invoke_mouse_motion {
2954	my ($self, $ev, $x, $y) = @_;	3115	my ($self, $ev, $x, $y) = @_;
2955		3116
2956	# TODO: should use vbox->find_widget or so	3117	# TODO: should use vbox->find_widget or so
2957	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3118	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958	$self->{hover} = $self->{item}{$HOVER};	3119	$self->{hover} = $self->{item}{$HOVER};
2959		3120
2960	0	3121	0
2961	}	3122	}
2962		3123
2963	sub button_up {	3124	sub invoke_button_up {
2964	my ($self, $ev, $x, $y) = @_;	3125	my ($self, $ev, $x, $y) = @_;
2965		3126
2966	if ($ev->{button} == $self->{button}) {	3127	if ($ev->{button} == $self->{button}) {
2967	undef $GRAB;	3128	undef $GRAB;
2968	$self->hide;	3129	$self->hide;
2969		3130
2970	$self->_emit ("popdown");	3131	$self->emit ("popdown");
2971	$self->{hover}[1]->() if $self->{hover};	3132	$self->{hover}[1]->() if $self->{hover};
2972	} else {	3133	} else {
2973	return 0	3134	return 0
2974	}	3135	}
2975		3136
…		…
3002		3163
3003	$self->{current} = $self->{children}[0]	3164	$self->{current} = $self->{children}[0]
3004	if @{ $self->{children} };	3165	if @{ $self->{children} };
3005	}	3166	}
3006		3167
		3168	sub get_current_page {
		3169	my ($self) = @_;
		3170
		3171	$self->{current}
		3172	}
		3173
3007	sub set_current_page {	3174	sub set_current_page {
3008	my ($self, $page_or_widget) = @_;	3175	my ($self, $page_or_widget) = @_;
3009		3176
3010	my $widget = ref $page_or_widget	3177	my $widget = ref $page_or_widget
3011	? $page_or_widget	3178	? $page_or_widget
3012	: $self->{children}[$page_or_widget];	3179	: $self->{children}[$page_or_widget];
3013		3180
3014	$self->{current} = $widget;	3181	$self->{current} = $widget;
3015	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3182	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016		3183
3017	$self->_emit (page_changed => $self->{current});	3184	$self->emit (page_changed => $self->{current});
3018		3185
3019	$self->realloc;	3186	$self->realloc;
3020	}	3187	}
3021		3188
3022	sub visible_children {	3189	sub visible_children {
…		…
3027	my ($self) = @_;	3194	my ($self) = @_;
3028		3195
3029	$self->{current}->size_request	3196	$self->{current}->size_request
3030	}	3197	}
3031		3198
3032	sub size_allocate {	3199	sub invoke_size_allocate {
3033	my ($self, $w, $h) = @_;	3200	my ($self, $w, $h) = @_;
3034		3201
3035	$self->{current}->configure (0, 0, $w, $h);	3202	$self->{current}->configure (0, 0, $w, $h);
		3203
		3204	1
3036	}	3205	}
3037		3206
3038	sub _draw {	3207	sub _draw {
3039	my ($self) = @_;	3208	my ($self) = @_;
3040		3209
…		…
3075	);	3244	);
3076		3245
3077	$self->{multiplexer}->add ($widget);	3246	$self->{multiplexer}->add ($widget);
3078	}	3247	}
3079		3248
		3249	sub get_current_page {
		3250	my ($self) = @_;
		3251
		3252	$self->{multiplexer}->get_current_page
		3253	}
		3254
3080	sub set_current_page {	3255	sub set_current_page {
3081	my ($self, $page) = @_;	3256	my ($self, $page) = @_;
3082		3257
3083	$self->{multiplexer}->set_current_page ($page);	3258	$self->{multiplexer}->set_current_page ($page);
3084	$self->_emit (page_changed => $self->{multiplexer}{current});	3259	$self->emit (page_changed => $self->{multiplexer}{current});
		3260	}
		3261
		3262	#############################################################################
		3263
		3264	package CFClient::UI::Combobox;
		3265
		3266	use utf8;
		3267
		3268	our @ISA = CFClient::UI::Button::;
		3269
		3270	sub new {
		3271	my $class = shift;
		3272
		3273	my $self = $class->SUPER::new (
		3274	options => [], # [value, title, longdesc], ...
		3275	value => undef,
		3276	@_,
		3277	);
		3278
		3279	$self->_set_value ($self->{value});
		3280
		3281	$self
		3282	}
		3283
		3284	sub invoke_button_down {
		3285	my ($self, $ev) = @_;
		3286
		3287	my @menu_items;
		3288
		3289	for (@{ $self->{options} }) {
		3290	my ($value, $title, $tooltip) = @$_;
		3291
		3292	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3293	}
		3294
		3295	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3296	}
		3297
		3298	sub _set_value {
		3299	my ($self, $value) = @_;
		3300
		3301	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3302	or return;
		3303
		3304	$self->{value} = $item->[0];
		3305	$self->set_markup ("$item->[1] ⇓");
		3306	$self->set_tooltip ($item->[2]);
		3307	}
		3308
		3309	sub set_value {
		3310	my ($self, $value) = @_;
		3311
		3312	return unless $self->{value} ne $value;
		3313
		3314	$self->_set_value ($value);
		3315	$self->emit (changed => $value);
3085	}	3316	}
3086		3317
3087	#############################################################################	3318	#############################################################################
3088		3319
3089	package CFClient::UI::Statusbox;	3320	package CFClient::UI::Statusbox;
…		…
3188	$item->{count}++;	3419	$item->{count}++;
3189	} else {	3420	} else {
3190	$item->{count} = 1;	3421	$item->{count} = 1;
3191	$item->{text} = $item->{tooltip} = $text;	3422	$item->{text} = $item->{tooltip} = $text;
3192	}	3423	}
3193	$item->{id} = ++$self->{id};	3424	$item->{id} += 0.2;#d#
3194	$item->{timeout} = $timeout;	3425	$item->{timeout} = $timeout;
3195	delete $item->{label};	3426	delete $item->{label};
3196	} else {	3427	} else {
3197	$self->{item}{$group} = {	3428	$self->{item}{$group} = {
3198	id => ++$self->{id},	3429	id => ++$self->{id},
…		…
3204	count => 1,	3435	count => 1,
3205	%arg,	3436	%arg,
3206	};	3437	};
3207	}	3438	}
3208		3439
		3440	$ROOT->on_refresh (reorder => sub {
3209	$self->reorder;	3441	$self->reorder;
		3442	});
3210	}	3443	}
3211		3444
3212	sub reconfigure {	3445	sub reconfigure {
3213	my ($self) = @_;	3446	my ($self) = @_;
3214		3447
…		…
3217		3450
3218	$self->reorder;	3451	$self->reorder;
3219	$self->SUPER::reconfigure;	3452	$self->SUPER::reconfigure;
3220	}	3453	}
3221		3454
3222	sub DESTROY {	3455	sub destroy {
3223	my ($self) = @_;	3456	my ($self) = @_;
3224		3457
3225	$self->{timer}->cancel;	3458	$self->{timer}->cancel;
3226		3459
3227	$self->SUPER::DESTROY;	3460	$self->SUPER::destroy;
3228	}	3461	}
3229		3462
3230	#############################################################################	3463	#############################################################################
3231		3464
3232	package CFClient::UI::Inventory;	3465	package CFClient::UI::Inventory;
3233		3466
3234	our @ISA = CFClient::UI::ScrolledWindow::;	3467	our @ISA = CFClient::UI::Table::;
3235		3468
3236	sub new {	3469	sub new {
3237	my $class = shift;	3470	my $class = shift;
3238		3471
3239	my $self = $class->SUPER::new (	3472	my $self = $class->SUPER::new (
3240	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3473	col_expand => [0, 1, 0],
3241	@_,	3474	@_,
3242	);	3475	);
3243		3476
3244	$self	3477	$self
3245	}	3478	}
3246		3479
3247	sub set_items {	3480	sub set_items {
3248	my ($self, $items) = @_;	3481	my ($self, $items) = @_;
3249		3482
3250	$self->{child}->clear;	3483	$self->clear;
3251	return unless $items;	3484	return unless $items;
3252		3485
3253	my @items = sort {	3486	my @items = sort {
3254	($a->{type} <=> $b->{type})	3487	($a->{type} <=> $b->{type})
3255	or ($a->{name} cmp $b->{name})	3488	or ($a->{name} cmp $b->{name})
3256	} @$items;	3489	} values %$items;
3257		3490
3258	$self->{real_items} = \@items;	3491	$self->{real_items} = \@items;
3259		3492
3260	my $row = 0;	3493	my $row = 0;
3261	for my $item (@items) {	3494	for my $item (@items) {
3262	CFClient::Item::update_widgets $item;	3495	CFClient::Item::update_widgets $item;
3263		3496
3264	$self->{child}->add (0, $row, $item->{face_widget});	3497	$self->add (0, $row, $item->{face_widget});
3265	$self->{child}->add (1, $row, $item->{desc_widget});	3498	$self->add (1, $row, $item->{desc_widget});
3266	$self->{child}->add (2, $row, $item->{weight_widget});	3499	$self->add (2, $row, $item->{weight_widget});
3267		3500
3268	$row++;	3501	$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	}	3502	}
3467	}	3503	}
3468		3504
3469	#############################################################################	3505	#############################################################################
3470		3506
…		…
3480	commands => [],	3516	commands => [],
3481	@_,	3517	@_,
3482	)	3518	)
3483	}	3519	}
3484		3520
3485	# XXX: Do sorting? Argl...	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");
		3527	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3528	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3529	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3530	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3531	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3532	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3533
		3534	sub rebuild_spell_list {
		3535	my ($self) = @_;
		3536
		3537	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3538	$self->clear;
		3539
		3540	return unless $::CONN;
		3541
		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);
		3544	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3545	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3546	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3547
		3548	my $row = 0;
		3549
		3550	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3551	my $spell = $self->{spell}{$_};
		3552
		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});
		3580
		3581	$self->add (0, $row, new CFClient::UI::Face
		3582	face => $spell->{face},
		3583	can_hover => 1,
		3584	can_events => 1,
		3585	tooltip => $tooltip,
		3586	on_button_down => $spell_cb,
		3587	);
		3588
		3589	$self->add (1, $row, new CFClient::UI::Label
		3590	expand => 1,
		3591	text => $spell->{name},
		3592	can_hover => 1,
		3593	can_events => 1,
		3594	tooltip => $tooltip,
		3595	on_button_down => $spell_cb,
		3596	);
		3597
		3598	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3599	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3600	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3601	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3602	}
		3603	});
		3604	}
		3605
3486	sub add_spell {	3606	sub add_spell {
3487	my ($self, $spell) = @_;	3607	my ($self, $spell) = @_;
		3608
3488	$self->{spells}->{$spell->{name}} = $spell;	3609	$self->{spell}->{$spell->{name}} = $spell;
3489		3610	$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	}	3611	}
3518		3612
3519	sub remove_spell {	3613	sub remove_spell {
3520	my ($self, $spell) = @_;	3614	my ($self, $spell) = @_;
		3615
3521	delete $self->{spells}->{$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} = {};
3522	$self->rebuild_spell_list;	3624	$self->rebuild_spell_list;
3523	}	3625	}
3524		3626
3525	#############################################################################	3627	#############################################################################
3526		3628
…		…
3563	$coord = $max - $size if $coord > $max - $size;	3665	$coord = $max - $size if $coord > $max - $size;
3564		3666
3565	int $coord + 0.5	3667	int $coord + 0.5
3566	}	3668	}
3567		3669
3568	sub size_allocate {	3670	sub invoke_size_allocate {
3569	my ($self, $w, $h) = @_;	3671	my ($self, $w, $h) = @_;
3570		3672
3571	for my $child ($self->children) {	3673	for my $child ($self->children) {
3572	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)};
3573		3675
…		…
3577	$X = _to_pixel $X, $W, $self->{w};	3679	$X = _to_pixel $X, $W, $self->{w};
3578	$Y = _to_pixel $Y, $H, $self->{h};	3680	$Y = _to_pixel $Y, $H, $self->{h};
3579		3681
3580	$child->configure ($X, $Y, $W, $H);	3682	$child->configure ($X, $Y, $W, $H);
3581	}	3683	}
		3684
		3685	1
3582	}	3686	}
3583		3687
3584	sub coord2local {	3688	sub coord2local {
3585	my ($self, $x, $y) = @_;	3689	my ($self, $x, $y) = @_;
3586		3690
…		…
3712	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3816	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713		3817
3714	$w = 0 if $w < 0;	3818	$w = 0 if $w < 0;
3715	$h = 0 if $h < 0;	3819	$h = 0 if $h < 0;
3716		3820
		3821	$w = max $widget->{min_w}, $w;
		3822	$h = max $widget->{min_h}, $h;
		3823
		3824	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3825	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3826
3717	$w = int $w + 0.5;	3827	$w = int $w + 0.5;
3718	$h = int $h + 0.5;	3828	$h = int $h + 0.5;
3719		3829
3720	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3830	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721	$widget->{old_w} = $widget->{w};	3831	$widget->{old_w} = $widget->{w};

Diff Legend

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