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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.394 by root, Sat Jul 21 13:54:03 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
278	delete $self->{root};	312	delete $self->{root};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->emit ("focus_out");	320	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
…		…
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
335	sub size_request {	369	sub size_request {
336	require Carp;	370	require Carp;
337	Carp::confess "size_request is abstract";	371	Carp::confess "size_request is abstract";
338	}	372	}
339		373
		374	sub baseline_shift {
		375	0
		376	}
		377
340	sub configure {	378	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
342		380
343	if ($self->{aspect}) {	381	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
345		383
346	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		386
349	# use alignment to adjust x, y	387	# use alignment to adjust x, y
350		388
351	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
393		431
394	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
395		433
396	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
397		435
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	439	}
402	}	440	}
403		441
404	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
405	sub coord2local {	443	sub coord2local {
406	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
407		445
		446	Carp::confess unless $self->{parent};#d#
		447
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	449	}
410		450
411	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
412	sub coord2global {	452	sub coord2global {
413	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
414		454
		455	Carp::confess unless $self->{parent};#d#
		456
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	458	}
417		459
418	sub invoke_focus_in {	460	sub invoke_focus_in {
419	my ($self) = @_;	461	my ($self) = @_;
420		462
421	return if $FOCUS == $self;	463	return if $FOCUS == $self;
422	return unless $self->{can_focus};	464	return unless $self->{can_focus};
423		465
424	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
425		467
426	$focus->update if $focus;	468	$self->update;
427	$FOCUS->update;
428		469
429	0	470	0
430	}	471	}
431		472
432	sub invoke_focus_out {	473	sub invoke_focus_out {
433	my ($self) = @_;	474	my ($self) = @_;
434		475
435	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
436		477
437	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
438		479
439	$focus->update if $focus; #?	480	$self->update;
440		481
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	483	unless $FOCUS;
443		484
444	0	485	0
445	}	486	}
446		487
447	sub grab_focus {	488	sub grab_focus {
448	my ($self) = @_;	489	my ($self) = @_;
449		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	492	$self->emit ("focus_in");
451	}	493	}
452		494
453	sub invoke_mouse_motion { 1 }	495	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	496	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	497	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
457		500
458	sub invoke_button_down {	501	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
460		503
461	$self->grab_focus;	504	$self->grab_focus;
462		505
463	1	506	0
464	}	507	}
465		508
466	sub connect {	509	sub connect {
467	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
468		511
469	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
470	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
471		532
472	sub emit {	533	sub emit {
473	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
474		535
475	#d##TODO# stop propagating at first true, do not use sum	536	# I do not really like this solution, but I do not like duplication
476	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
477	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
478	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
479	}	554	}
480		555
481	sub find_widget {	556	#sub find_widget {
482	my ($self, $x, $y) = @_;	557	# in .xs
483
484	return () unless $self->{can_events};
485
486	return $self
487	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
488	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
489
490	()
491	}
492		558
493	sub set_parent {	559	sub set_parent {
494	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
495		561
496	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
497	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
498	}	564	}
499		565
500	sub realloc {	566	sub realloc {
501	my ($self) = @_;	567	my ($self) = @_;
…		…
535	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
536		602
537	# update screen rectangle	603	# update screen rectangle
538	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
539	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
540	local $draw_w = $draw_x + $self->{w};
541	local $draw_h = $draw_y + $self->{h};
542		606
543	# skip widgets that are entirely outside the drawing area	607	# skip widgets that are entirely outside the drawing area
544	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546		610
…		…
569	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
570	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
571	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
572	glEnd;	636	glEnd;
573	glPopMatrix;	637	glPopMatrix;
574	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575	}	639	}
576		640
577	$self->_draw;	641	$self->_draw;
578	glPopMatrix;	642	glPopMatrix;
579	}	643	}
…		…
582	my ($self) = @_;	646	my ($self) = @_;
583		647
584	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
585	}	649	}
586		650
		651	my $cntx;#d#
587	sub DESTROY {	652	sub DESTROY {
588	my ($self) = @_;	653	my ($self) = @_;
589		654
590	delete $WIDGET{$self+0};	655	return if CFPlus::in_destruct;
591		656
592	eval { $self->destroy };	657	eval { $self->destroy };
593	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
594	}	661	}
595		662
596	#############################################################################	663	#############################################################################
597		664
598	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
599		666
600	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
601		668
602	use strict;	669	use strict;
603	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
604		671
605	sub new {	672	sub new {
606	my $class = shift;	673	my $class = shift;
607		674
608	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
639	}	706	}
640	}	707	}
641		708
642	#############################################################################	709	#############################################################################
643		710
644	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
645		712
646	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
647		714
648	sub new {	715	sub new {
649	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
650	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
651	}	718	}
…		…
658		725
659	sub draw { }	726	sub draw { }
660		727
661	#############################################################################	728	#############################################################################
662		729
663	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
664		731
665	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
666		733
667	sub new {	734	sub new {
668	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
669		736
670	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
674	can_events => 0,	741	can_events => 0,
675	%arg,	742	%arg,
676	);	743	);
677		744
678	$self->add (@$children)	745	$self->add (@$children)
679	if $children;	746	if $children && @$children;
680		747
681	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
682	}	757	}
683		758
684	sub add {	759	sub add {
685	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
686		761
687	$_->set_parent ($self)	762	$_->set_parent ($self)
688	for @widgets;	763	for @widgets;
689		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
690	use sort 'stable';	766	use sort 'stable';
691		767
692	$self->{children} = [	768	$self->{children} = [
693	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
694	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
…		…
713	}	789	}
714		790
715	sub clear {	791	sub clear {
716	my ($self) = @_;	792	my ($self) = @_;
717		793
718	my $children = delete $self->{children};	794	my $children = $self->{children};
719	$self->{children} = [];	795	$self->{children} = [];
720		796
721	for (@$children) {	797	for (@$children) {
722	delete $_->{parent};	798	delete $_->{parent};
723	$_->hide;	799	$_->hide;
…		…
748	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
749	}	825	}
750		826
751	#############################################################################	827	#############################################################################
752		828
753	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
754		830
755	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
756		832
757	sub new {	833	sub new {
758	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
759		835
760	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761		837
762	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
763	}	839	}
764		840
765	sub add {	841	sub add {
…		…
772	sub remove {	848	sub remove {
773	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
774		850
775	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
776		852
777	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
778	unless @{$self->{children}};	854	unless @{$self->{children}};
779	}	855	}
780		856
781	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
782		858
…		…
794		870
795	#############################################################################	871	#############################################################################
796		872
797	# back-buffered drawing area	873	# back-buffered drawing area
798		874
799	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
800		876
801	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
802		878
803	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
804		880
805	sub new {	881	sub new {
806	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
807		883
808	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
830	}	906	}
831		907
832	sub render_child {	908	sub render_child {
833	my ($self) = @_;	909	my ($self) = @_;
834		910
835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
837	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
838		914
839	{	915	{
840	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
841		917
842	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
843	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
844	}	922	}
845
846	$self->_render;
847	};	923	};
848	}	924	}
849		925
850	sub _draw {	926	sub _draw {
851	my ($self) = @_;	927	my ($self) = @_;
852
853	my ($w, $h) = @$self{qw(w h)};
854		928
855	my $tex = $self->{texture}	929	my $tex = $self->{texture}
856	or return;	930	or return;
857		931
858	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
861		935
862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
863		937
864	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
865	}	939	}
866		940
867	#############################################################################	941	#############################################################################
868		942
869	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
870		944
		945	use List::Util qw(min max);
		946
871	our @ISA = CFClient::UI::Window::;	947	our @ISA = CFPlus::UI::Window::;
872		948
873	sub new {	949	sub new {
874	my $class = shift;	950	my $class = shift;
875		951
876	$class->SUPER::new (	952	$class->SUPER::new (
…		…
883	sub size_request {	959	sub size_request {
884	my ($self) = @_;	960	my ($self) = @_;
885		961
886	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	962	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
887		963
888	$w = 10 if $self->{scroll_x};	964	$w = 1 if $self->{scroll_x};
889	$h = 10 if $self->{scroll_y};	965	$h = 1 if $self->{scroll_y};
890		966
891	($w, $h)	967	($w, $h)
892	}	968	}
893		969
894	sub invoke_size_allocate {	970	sub invoke_size_allocate {
…		…
906	}	982	}
907		983
908	sub set_offset {	984	sub set_offset {
909	my ($self, $x, $y) = @_;	985	my ($self, $x, $y) = @_;
910		986
		987	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		988	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		989
		990	if ($x != $self->{view_x} or $y != $self->{view_y}) {
911	$self->{view_x} = int $x;	991	$self->{view_x} = $x;
912	$self->{view_y} = int $y;	992	$self->{view_y} = $y;
913		993
		994	$self->emit (changed => $x, $y);
914	$self->update;	995	$self->update;
		996	}
915	}	997	}
916		998
917	# hmm, this does not work for topleft of $self... but we should not ask for that	999	# hmm, this does not work for topleft of $self... but we should not ask for that
918	sub coord2local {	1000	sub coord2local {
919	my ($self, $x, $y) = @_;	1001	my ($self, $x, $y) = @_;
…		…
934	my ($self, $x, $y) = @_;	1016	my ($self, $x, $y) = @_;
935		1017
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1018	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1019	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	1020	) {
939	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1021	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940	} else {	1022	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1023	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1024	}
943	}	1025	}
944		1026
945	sub _render {	1027	sub _render {
946	my ($self) = @_;	1028	my ($self) = @_;
947		1029
948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1030	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1031	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950		1032
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1033	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1034
953	$self->SUPER::_render;	1035	$self->SUPER::_render;
954	}	1036	}
955		1037
956	#############################################################################	1038	#############################################################################
957		1039
958	package CFClient::UI::ScrolledWindow;	1040	package CFPlus::UI::ScrolledWindow;
959		1041
960	our @ISA = CFClient::UI::HBox::;	1042	our @ISA = CFPlus::UI::Table::;
961		1043
962	sub new {	1044	sub new {
963	my ($class, %arg) = @_;	1045	my ($class, %arg) = @_;
964		1046
965	my $child = delete $arg{child};	1047	my $child = delete $arg{child};
966		1048
967	my $self;	1049	my $self;
968		1050
969	my $slider = new CFClient::UI::Slider	1051	my $hslider = new CFPlus::UI::Slider
		1052	col => 0,
		1053	row => 1,
		1054	vertical => 0,
		1055	range => [0, 0, 1, 0.01], # HACK fix
		1056	on_changed => sub {
		1057	$self->{hpos} = $_[1];
		1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1059	},
		1060	;
		1061
		1062	my $vslider = new CFPlus::UI::Slider
		1063	col => 1,
		1064	row => 0,
970	vertical => 1,	1065	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1067	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974	},	1070	},
975	;	1071	;
976		1072
977	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
		1076	can_events => 1,
979	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
980	%arg,	1081	%arg,
981	);	1082	);
982		1083
		1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	col => 0,
		1086	row => 0,
		1087	expand => 1,
		1088	scroll_x => $self->{scroll_x},
		1089	scroll_y => $self->{scroll_y},
		1090	on_changed => sub {
		1091	my ($vp, $x, $y) = @_;
		1092
		1093	$vp->{parent}{hslider}->set_value ($x);
		1094	$vp->{parent}{vslider}->set_value ($y);
		1095
		1096	0
		1097	},
		1098	;
		1099
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1100	$self->SUPER::add ($self->{vp});
		1101
984	$self->add ($child) if $child;	1102	$self->add ($child) if $child;
985		1103
986	$self	1104	$self
987	}	1105	}
		1106
		1107	#TODO# update range on size_allocate depending on child?
988		1108
989	sub add {	1109	sub add {
990	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
991		1111
992	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
993	}	1113	}
994		1114
		1115	sub update_slider {
		1116	my ($self) = @_;
		1117
		1118	my $child = ($self->{vp} or return)->child;
		1119
		1120	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider_visible}) {
		1125	$self->{hslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{hslider})
		1127	: $self->SUPER::remove ($self->{hslider});
		1128	}
		1129
		1130	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1131	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1132
		1133	my $visible = $h1 > $h2;
		1134	if ($visible != $self->{vslider_visible}) {
		1135	$self->{vslider_visible} = $visible;
		1136	$visible ? $self->SUPER::add ($self->{vslider})
		1137	: $self->SUPER::remove ($self->{vslider});
		1138	}
		1139	}
		1140
995	sub update {	1141	sub update {
996	my ($self) = @_;	1142	my ($self) = @_;
997		1143
		1144	$self->update_slider;
998	$self->SUPER::update;	1145	$self->SUPER::update;
		1146	}
999		1147
1000	# todo: overwrite size_allocate of child	1148	sub invoke_mouse_wheel {
1001	my $child = $self->{vp}->child;	1149	my ($self, $ev) = @_;
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1150
		1151	$self->{vslider}->emit (mouse_wheel => $ev)
		1152	if $ev->{dy};
		1153
		1154	$self->{hslider}->emit (mouse_wheel => $ev)
		1155	if $ev->{dx};
		1156
		1157	1
		1158	}
		1159
		1160	sub invoke_button_down {
		1161	my ($self, $ev, $x, $y) = @_;
		1162
		1163	if ($ev->{button} == 2) {
		1164	$self->grab_focus;
		1165
		1166	my $ox = $self->{vp}{view_x} + $ev->{x};
		1167	my $oy = $self->{vp}{view_y} + $ev->{y};
		1168
		1169	$self->{motion} = sub {
		1170	my ($ev, $x, $y) = @_;
		1171
		1172	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1173	$self->update;
		1174	};
		1175
		1176	return 1;
		1177	}
		1178
		1179	0
		1180	}
		1181
		1182	sub invoke_button_up {
		1183	my ($self, $ev, $x, $y) = @_;
		1184
		1185	if (delete $self->{motion}) {
		1186	return 1;
		1187	}
		1188
		1189	0
		1190	}
		1191
		1192	sub invoke_mouse_motion {
		1193	my ($self, $ev, $x, $y) = @_;
		1194
		1195	if ($self->{motion}) {
		1196	$self->{motion}->($ev, $x, $y);
		1197	return 1;
		1198	}
		1199
		1200	0
1003	}	1201	}
1004		1202
1005	sub invoke_size_allocate {	1203	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1204	my ($self, $w, $h) = @_;
1007		1205
1008	my $child = $self->{vp}->child;	1206	$self->update_slider;
1009	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011	$self->SUPER::invoke_size_allocate ($w, $h)	1207	$self->SUPER::invoke_size_allocate ($w, $h)
1012	}	1208	}
1013		1209
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016
1017	#############################################################################	1210	#############################################################################
1018		1211
1019	package CFClient::UI::Frame;	1212	package CFPlus::UI::Frame;
1020		1213
1021	our @ISA = CFClient::UI::Bin::;	1214	our @ISA = CFPlus::UI::Bin::;
1022		1215
1023	use CFClient::OpenGL;	1216	use CFPlus::OpenGL;
1024		1217
1025	sub new {	1218	sub new {
1026	my $class = shift;	1219	my $class = shift;
1027		1220
1028	$class->SUPER::new (	1221	$class->SUPER::new (
…		…
1054	$self->SUPER::_draw;	1247	$self->SUPER::_draw;
1055	}	1248	}
1056		1249
1057	#############################################################################	1250	#############################################################################
1058		1251
1059	package CFClient::UI::FancyFrame;	1252	package CFPlus::UI::FancyFrame;
1060		1253
1061	our @ISA = CFClient::UI::Bin::;	1254	our @ISA = CFPlus::UI::Bin::;
1062		1255
1063	use CFClient::OpenGL;	1256	use CFPlus::OpenGL;
		1257
		1258	sub new {
		1259	my ($class, %arg) = @_;
		1260
		1261	if ((exists $arg{label}) && !ref $arg{label}) {
		1262	$arg{label} = new CFPlus::UI::Label
		1263	align => 1,
		1264	valign => 0,
		1265	text => $arg{label},
		1266	fontsize => ($arg{border} || 0.8) * 0.75;
		1267	}
		1268
		1269	my $self = $class->SUPER::new (
		1270	# label => "",
		1271	fg => [0.6, 0.3, 0.1],
		1272	border => 0.8,
		1273	style => 'single',
		1274	%arg,
		1275	);
		1276
		1277	$self
		1278	}
		1279
		1280	sub add {
		1281	my ($self, @widgets) = @_;
		1282
		1283	$self->SUPER::add (@widgets);
		1284	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1285	}
		1286
		1287	sub border {
		1288	int $_[0]{border} * $::FONTSIZE
		1289	}
		1290
		1291	sub size_request {
		1292	my ($self) = @_;
		1293
		1294	($self->{label_w}, undef) = $self->{label}->size_request
		1295	if $self->{label};
		1296
		1297	my ($w, $h) = $self->SUPER::size_request;
		1298
		1299	(
		1300	$w + $self->border * 2,
		1301	$h + $self->border * 2,
		1302	)
		1303	}
		1304
		1305	sub invoke_size_allocate {
		1306	my ($self, $w, $h) = @_;
		1307
		1308	my $border = $self->border;
		1309
		1310	$w -= List::Util::max 0, $border * 2;
		1311	$h -= List::Util::max 0, $border * 2;
		1312
		1313	if (my $label = $self->{label}) {
		1314	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1315	$label->{h} = List::Util::min $h, $border;
		1316	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1317	}
		1318
		1319	$self->child->configure ($border, $border, $w, $h);
		1320
		1321	1
		1322	}
		1323
		1324	sub _draw {
		1325	my ($self) = @_;
		1326
		1327	my $child = $self->{children}[0];
		1328
		1329	my $border = $self->border;
		1330	my ($w, $h) = ($self->{w}, $self->{h});
		1331
		1332	$child->draw;
		1333
		1334	glColor @{$self->{fg}};
		1335	glBegin GL_LINE_STRIP;
		1336	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1337	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1338	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1339	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1340	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1341	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1342	glEnd;
		1343
		1344	if ($self->{label}) {
		1345	glTranslate $border * 2, 0;
		1346	$self->{label}->_draw;
		1347	}
		1348	}
		1349
		1350	#############################################################################
		1351
		1352	package CFPlus::UI::Toplevel;
		1353
		1354	our @ISA = CFPlus::UI::Bin::;
		1355
		1356	use CFPlus::OpenGL;
1064		1357
1065	my $bg =	1358	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1359	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;	1360	mipmap => 1, wrap => 1;
1068		1361
1069	my @border =	1362	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1364	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1365
		1366	my @icon =
		1367	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1368	qw(x1_move.png x1_resize.png);
1072		1369
1073	sub new {	1370	sub new {
1074	my ($class, %arg) = @_;	1371	my ($class, %arg) = @_;
1075		1372
1076	my $self = $class->SUPER::new (	1373	my $self = $class->SUPER::new (
1077	bg => [1, 1, 1, 1],	1374	bg => [1, 1, 1, 1],
1078	border_bg => [1, 1, 1, 1],	1375	border_bg => [1, 1, 1, 1],
1079	border => 0.6,	1376	border => 0.6,
1080	can_events => 1,	1377	can_events => 1,
1081	min_w => 16,	1378	min_w => 64,
1082	min_h => 16,	1379	min_h => 32,
1083	%arg,	1380	%arg,
1084	);	1381	);
1085		1382
1086	$self->{title_widget} = new CFClient::UI::Label	1383	$self->{title_widget} = new CFPlus::UI::Label
1087	align => 0,	1384	align => 0,
1088	valign => 1,	1385	valign => 1,
1089	text => $self->{title},	1386	text => $self->{title},
1090	fontsize => $self->{border},	1387	fontsize => $self->{border},
1091	if exists $self->{title};	1388	if exists $self->{title};
1092		1389
1093	if ($self->{has_close_button}) {	1390	if ($self->{has_close_button}) {
1094	$self->{close_button} =	1391	$self->{close_button} =
1095	new CFClient::UI::ImageButton	1392	new CFPlus::UI::ImageButton
1096	image => 'x1_close.png',	1393	path => 'x1_close.png',
1097	on_activate => sub { $self->hide };	1394	on_activate => sub { $self->emit ("delete") };
1098		1395
1099	$self->CFClient::UI::Container::add ($self->{close_button});	1396	$self->CFPlus::UI::Container::add ($self->{close_button});
1100	}	1397	}
1101		1398
1102	$self	1399	$self
1103	}	1400	}
1104		1401
1105	sub add {	1402	sub add {
1106	my ($self, @widgets) = @_;	1403	my ($self, @widgets) = @_;
1107		1404
1108	$self->SUPER::add (@widgets);	1405	$self->SUPER::add (@widgets);
1109	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1406	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1407	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111	}	1408	}
1112		1409
1113	sub border {	1410	sub border {
1114	int $_[0]{border} * $::FONTSIZE	1411	int $_[0]{border} * $::FONTSIZE
1115	}	1412	}
…		…
1148	$self->child->configure ($border, $border, $w, $h);	1445	$self->child->configure ($border, $border, $w, $h);
1149		1446
1150	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1447	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151	if $self->{close_button};	1448	if $self->{close_button};
1152		1449
		1450	1
		1451	}
		1452
		1453	sub invoke_delete {
		1454	my ($self) = @_;
		1455
		1456	$self->hide;
		1457
1153	1	1458	1
1154	}	1459	}
1155		1460
1156	sub invoke_button_down {	1461	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1462	my ($self, $ev, $x, $y) = @_;
…		…
1215	$self->{motion}->($ev, $x, $y) if $self->{motion};	1520	$self->{motion}->($ev, $x, $y) if $self->{motion};
1216		1521
1217	! ! $self->{motion}	1522	! ! $self->{motion}
1218	}	1523	}
1219		1524
		1525	sub invoke_visibility_change {
		1526	my ($self, $visible) = @_;
		1527
		1528	delete $self->{motion} unless $visible;
		1529
		1530	0
		1531	}
		1532
1220	sub _draw {	1533	sub _draw {
1221	my ($self) = @_;	1534	my ($self) = @_;
1222		1535
1223	my $child = $self->{children}[0];	1536	my $child = $self->{children}[0];
1224		1537
…		…
1229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1542	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1230		1543
1231	my $border = $self->border;	1544	my $border = $self->border;
1232		1545
1233	glColor @{ $self->{border_bg} };	1546	glColor @{ $self->{border_bg} };
1234	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1547	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1235	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1548	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1236	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1549	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1237	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1550	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1551
		1552	# move
		1553	my $w2 = ($w - $border) * .5;
		1554	my $h2 = ($h - $border) * .5;
		1555	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1556	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1557	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1558
		1559	# resize
		1560	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1561	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1562	unless $self->{has_close_button};
		1563	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1564	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1238		1565
1239	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1566	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1240	glColor @{ $self->{bg} };	1567	glColor @{ $self->{bg} };
1241		1568
1242	# TODO: repeat texture not scale	1569	# TODO: repeat texture not scale
…		…
1261	if $self->{close_button};	1588	if $self->{close_button};
1262	}	1589	}
1263		1590
1264	#############################################################################	1591	#############################################################################
1265		1592
1266	package CFClient::UI::Table;	1593	package CFPlus::UI::Table;
1267		1594
1268	our @ISA = CFClient::UI::Base::;	1595	our @ISA = CFPlus::UI::Container::;
1269		1596
1270	use List::Util qw(max sum);	1597	use List::Util qw(max sum);
1271		1598
1272	use CFClient::OpenGL;	1599	use CFPlus::OpenGL;
1273		1600
1274	sub new {	1601	sub new {
1275	my $class = shift;	1602	my $class = shift;
1276		1603
1277	$class->SUPER::new (	1604	$class->SUPER::new (
1278	col_expand => [],	1605	col_expand => [],
		1606	row_expand => [],
1279	@_,	1607	@_,
1280	)	1608	)
1281	}	1609	}
1282		1610
1283	sub children {
1284	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285	}
1286
1287	sub add {	1611	sub add {
1288	my ($self, $x, $y, $child) = @_;	1612	my ($self, @widgets) = @_;
1289		1613
1290	$child->set_parent ($self);	1614	for my $child (@widgets) {
1291	$self->{children}[$y][$x] = $child;	1615	$child->{rowspan} ||= 1;
		1616	$child->{colspan} ||= 1;
		1617	}
1292		1618
1293	$self->realloc;	1619	$self->SUPER::add (@widgets);
1294	}	1620	}
1295		1621
1296	sub remove {	1622	sub add_at {
		1623	my $self = shift;
		1624
		1625	my @widgets;
		1626
		1627	while (@_) {
		1628	my ($col, $row, $child) = splice @_, 0, 3, ();
		1629
		1630	$child->{row} = $row;
		1631	$child->{col} = $col;
		1632
		1633	push @widgets, $child;
		1634	}
		1635
		1636	$self->add (@widgets);
		1637	}
		1638
		1639	sub get_wh {
1297	my ($self, $child) = @_;	1640	my ($self) = @_;
1298		1641
1299	# TODO: not yet implemented	1642	my (@w, @h);
1300	}
1301
1302	# TODO: move to container class maybe? send children a signal on removal?
1303	sub clear {
1304	my ($self) = @_;
1305		1643
1306	my @children = $self->children;	1644	my @children = $self->children;
1307	delete $self->{children};	1645
		1646	# first pass, columns
		1647	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1648	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1649
		1650	my $sw = sum @w[$c .. $c + $cs - 1];
		1651
		1652	if ($w > $sw) {
		1653	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1654	}
1308		1655	}
1309	for (@children) {
1310	delete $_->{parent};
1311	$_->hide;
1312	}
1313		1656
1314	$self->realloc;	1657	# second pass, rows
1315	}	1658	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1316
1317	sub get_wh {
1318	my ($self) = @_;
1319
1320	my (@w, @h);
1321
1322	for my $y (0 .. $#{$self->{children}}) {
1323	my $row = $self->{children}[$y]
1324	or next;
1325
1326	for my $x (0 .. $#$row) {
1327	my $widget = $row->[$x]
1328	or next;
1329	my ($w, $h) = @$widget{qw(req_w req_h)};	1659	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1330		1660
1331	$w[$x] = max $w[$x], $w;	1661	my $sh = sum @h[$r .. $r + $rs - 1];
1332	$h[$y] = max $h[$y], $h;	1662
		1663	if ($h > $sh) {
		1664	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1333	}	1665	}
1334	}	1666	}
1335		1667
1336	(\@w, \@h)	1668	(\@w, \@h)
1337	}	1669	}
…		…
1353	my ($ws, $hs) = $self->get_wh;	1685	my ($ws, $hs) = $self->get_wh;
1354		1686
1355	my $req_w = (sum @$ws) || 1;	1687	my $req_w = (sum @$ws) || 1;
1356	my $req_h = (sum @$hs) || 1;	1688	my $req_h = (sum @$hs) || 1;
1357		1689
1358	# TODO: nicer code && do row_expand	1690	# now linearly scale the rows/columns to the allocated size
1359	my @col_expand = @{$self->{col_expand}};	1691	my @col_expand = @{$self->{col_expand}};
1360	@col_expand = (1) x @$ws unless @col_expand;	1692	@col_expand = (1) x @$ws unless @col_expand;
1361	my $col_expand = (sum @col_expand) || 1;	1693	my $col_expand = (sum @col_expand) || 1;
1362		1694
1363	# linearly scale sizes
1364	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1695	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366		1696
1367	CFClient::UI::harmonize $ws;	1697	CFPlus::UI::harmonize $ws;
		1698
		1699	my @row_expand = @{$self->{row_expand}};
		1700	@row_expand = (1) x @$ws unless @row_expand;
		1701	my $row_expand = (sum @row_expand) || 1;
		1702
		1703	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1704
1368	CFClient::UI::harmonize $hs;	1705	CFPlus::UI::harmonize $hs;
1369		1706
1370	my $y;	1707	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1708	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1371		1709
1372	for my $r (0 .. $#{$self->{children}}) {	1710	for my $widget ($self->children) {
1373	my $row = $self->{children}[$r]	1711	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1374	or next;
1375		1712
1376	my $x = 0;	1713	$widget->configure (
1377	my $row_h = $hs->[$r];	1714	$x[$c], $y[$r],
		1715	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1378		1716	);
1379	for my $c (0 .. $#$row) {	1717	}
1380	my $col_w = $ws->[$c];
1381		1718
1382	if (my $widget = $row->[$c]) {	1719	1
1383	$widget->configure ($x, $y, $col_w, $row_h);	1720	}
1384	}
1385		1721
1386	$x += $col_w;	1722	#############################################################################
		1723
		1724	package CFPlus::UI::Fixed;
		1725
		1726	use List::Util qw(min max);
		1727
		1728	our @ISA = CFPlus::UI::Container::;
		1729
		1730	sub add {
		1731	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1732
		1733	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1734	$self->SUPER::add ($child);
		1735	}
		1736
		1737	sub _scale($$$) {
		1738	my ($mode, $val, $max) = @_;
		1739
		1740	$mode eq "abs" ? $val
		1741	: $mode eq "rel" ? $val * $max
		1742	: 0
		1743	}
		1744
		1745	sub size_request {
		1746	my ($self) = @_;
		1747
		1748	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1749
		1750	# determine overall size by querying abs widgets
		1751	for my $child ($self->visible_children) {
		1752	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1753
		1754	if ($pos eq "abs") {
		1755	$w = _scale $size, $w, $child->{req_w};
		1756	$h = _scale $size, $h, $child->{req_h};
		1757
		1758	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1759	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1387	}	1760	}
		1761	}
1388		1762
1389	$y += $row_h;	1763	my $W = $x2 - $x1;
		1764	my $H = $y2 - $y1;
		1765
		1766	# now layout remaining widgets
		1767	for my $child ($self->visible_children) {
		1768	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1769
		1770	if ($pos ne "abs") {
		1771	$x = _scale $pos, $x, $W;
		1772	$y = _scale $pos, $x, $H;
		1773	$w = _scale $size, $w, $child->{req_w};
		1774	$h = _scale $size, $h, $child->{req_h};
		1775
		1776	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1777	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1778	}
		1779	}
		1780
		1781	my $W = $x2 - $x1;
		1782	my $H = $y2 - $y1;
		1783
		1784	($W, $H)
		1785	}
		1786
		1787	sub invoke_size_allocate {
		1788	my ($self, $W, $H) = @_;
		1789
		1790	for my $child ($self->visible_children) {
		1791	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1792
		1793	$x = _scale $pos, $x, $W;
		1794	$y = _scale $pos, $x, $H;
		1795	$w = _scale $size, $w, $child->{req_w};
		1796	$h = _scale $size, $h, $child->{req_h};
		1797
		1798	$child->configure ($x, $y, $w, $h);
1390	}	1799	}
1391		1800
1392	1	1801	1
1393	}	1802	}
1394		1803
1395	sub find_widget {
1396	my ($self, $x, $y) = @_;
1397
1398	$x -= $self->{x};
1399	$y -= $self->{y};
1400
1401	my $res;
1402
1403	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1404	$res = $_->find_widget ($x, $y)
1405	and return $res;
1406	}
1407
1408	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1409	}
1410
1411	sub _draw {
1412	my ($self) = @_;
1413
1414	for (grep $_, @{$self->{children}}) {
1415	$_->draw for grep $_, @$_;
1416	}
1417	}
1418
1419	#############################################################################	1804	#############################################################################
1420		1805
1421	package CFClient::UI::Box;	1806	package CFPlus::UI::Box;
1422		1807
1423	our @ISA = CFClient::UI::Container::;	1808	our @ISA = CFPlus::UI::Container::;
1424		1809
1425	sub size_request {	1810	sub size_request {
1426	my ($self) = @_;	1811	my ($self) = @_;
1427		1812
1428	$self->{vertical}	1813	$self->{vertical}
…		…
1438		1823
1439	sub invoke_size_allocate {	1824	sub invoke_size_allocate {
1440	my ($self, $w, $h) = @_;	1825	my ($self, $w, $h) = @_;
1441		1826
1442	my $space = $self->{vertical} ? $h : $w;	1827	my $space = $self->{vertical} ? $h : $w;
1443	my $children = $self->{children};	1828	my @children = $self->visible_children;
1444		1829
1445	my @req;	1830	my @req;
1446		1831
1447	if ($self->{homogeneous}) {	1832	if ($self->{homogeneous}) {
1448	@req = ($space / (@$children || 1)) x @$children;	1833	@req = ($space / (@children || 1)) x @children;
1449	} else {	1834	} else {
1450	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1835	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451	my $req = List::Util::sum @req;	1836	my $req = List::Util::sum @req;
1452		1837
1453	if ($req > $space) {	1838	if ($req > $space) {
1454	# ah well, not enough space	1839	# ah well, not enough space
1455	$_ *= $space / $req for @req;	1840	$_ *= $space / $req for @req;
1456	} else {	1841	} else {
1457	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1842	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458		1843
1459	$space = ($space - $req) / $expand; # remaining space to give away	1844	$space = ($space - $req) / $expand; # remaining space to give away
1460		1845
1461	$req[$_] += $space * $children->[$_]{expand}	1846	$req[$_] += $space * $children[$_]{expand}
1462	for 0 .. $#$children;	1847	for 0 .. $#children;
1463	}	1848	}
1464	}	1849	}
1465		1850
1466	CFClient::UI::harmonize \@req;	1851	CFPlus::UI::harmonize \@req;
1467		1852
1468	my $pos = 0;	1853	my $pos = 0;
1469	for (0 .. $#$children) {	1854	for (0 .. $#children) {
1470	my $alloc = $req[$_];	1855	my $alloc = $req[$_];
1471	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1856	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472		1857
1473	$pos += $alloc;	1858	$pos += $alloc;
1474	}	1859	}
1475		1860
1476	1	1861	1
1477	}	1862	}
1478		1863
1479	#############################################################################	1864	#############################################################################
1480		1865
1481	package CFClient::UI::HBox;	1866	package CFPlus::UI::HBox;
1482		1867
1483	our @ISA = CFClient::UI::Box::;	1868	our @ISA = CFPlus::UI::Box::;
1484		1869
1485	sub new {	1870	sub new {
1486	my $class = shift;	1871	my $class = shift;
1487		1872
1488	$class->SUPER::new (	1873	$class->SUPER::new (
…		…
1491	)	1876	)
1492	}	1877	}
1493		1878
1494	#############################################################################	1879	#############################################################################
1495		1880
1496	package CFClient::UI::VBox;	1881	package CFPlus::UI::VBox;
1497		1882
1498	our @ISA = CFClient::UI::Box::;	1883	our @ISA = CFPlus::UI::Box::;
1499		1884
1500	sub new {	1885	sub new {
1501	my $class = shift;	1886	my $class = shift;
1502		1887
1503	$class->SUPER::new (	1888	$class->SUPER::new (
…		…
1506	)	1891	)
1507	}	1892	}
1508		1893
1509	#############################################################################	1894	#############################################################################
1510		1895
1511	package CFClient::UI::Label;	1896	package CFPlus::UI::Label;
1512		1897
1513	our @ISA = CFClient::UI::DrawBG::;	1898	our @ISA = CFPlus::UI::DrawBG::;
1514		1899
1515	use CFClient::OpenGL;	1900	use CFPlus::OpenGL;
1516		1901
1517	sub new {	1902	sub new {
1518	my ($class, %arg) = @_;	1903	my ($class, %arg) = @_;
1519		1904
1520	my $self = $class->SUPER::new (	1905	my $self = $class->SUPER::new (
…		…
1523	#active_bg => none	1908	#active_bg => none
1524	#font => default_font	1909	#font => default_font
1525	#text => initial text	1910	#text => initial text
1526	#markup => initial narkup	1911	#markup => initial narkup
1527	#max_w => maximum pixel width	1912	#max_w => maximum pixel width
		1913	#style => 0, # render flags
1528	ellipsise => 3, # end	1914	ellipsise => 3, # end
1529	layout => (new CFClient::Layout),	1915	layout => (new CFPlus::Layout),
1530	fontsize => 1,	1916	fontsize => 1,
1531	align => -1,	1917	align => -1,
1532	valign => -1,	1918	valign => -1,
1533	padding_x => 2,	1919	padding_x => 2,
1534	padding_y => 2,	1920	padding_y => 2,
1535	can_events => 0,	1921	can_events => 0,
1536	%arg	1922	%arg
1537	);	1923	);
1538		1924
1539	if (exists $self->{template}) {	1925	if (exists $self->{template}) {
1540	my $layout = new CFClient::Layout;	1926	my $layout = new CFPlus::Layout;
1541	$layout->set_text (delete $self->{template});	1927	$layout->set_text (delete $self->{template});
1542	$self->{template} = $layout;	1928	$self->{template} = $layout;
1543	}	1929	}
1544		1930
1545	if (exists $self->{markup}) {	1931	if (exists $self->{markup}) {
…		…
1549	}	1935	}
1550		1936
1551	$self	1937	$self
1552	}	1938	}
1553		1939
1554	sub escape($) {
1555	local $_ = $_[0];
1556
1557	s/&/&amp;/g;
1558	s/>/&gt;/g;
1559	s/</&lt;/g;
1560
1561	$_
1562	}
1563
1564	sub update {	1940	sub update {
1565	my ($self) = @_;	1941	my ($self) = @_;
1566		1942
1567	delete $self->{texture};	1943	delete $self->{texture};
1568	$self->SUPER::update;	1944	$self->SUPER::update;
…		…
1579	my ($self, $text) = @_;	1955	my ($self, $text) = @_;
1580		1956
1581	return if $self->{text} eq "T$text";	1957	return if $self->{text} eq "T$text";
1582	$self->{text} = "T$text";	1958	$self->{text} = "T$text";
1583		1959
1584	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585	$self->{layout}->set_text ($text);	1960	$self->{layout}->set_text ($text);
1586		1961
1587	delete $self->{size_req};	1962	delete $self->{size_req};
1588	$self->realloc;	1963	$self->realloc;
1589	$self->update;	1964	$self->update;
…		…
1595	return if $self->{text} eq "M$markup";	1970	return if $self->{text} eq "M$markup";
1596	$self->{text} = "M$markup";	1971	$self->{text} = "M$markup";
1597		1972
1598	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1973	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599		1974
1600	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601	$self->{layout}->set_markup ($markup);	1975	$self->{layout}->set_markup ($markup);
1602		1976
1603	delete $self->{size_req};	1977	delete $self->{size_req};
1604	$self->realloc;	1978	$self->realloc;
1605	$self->update;	1979	$self->update;
…		…
1617		1991
1618	my ($w, $h) = $self->{layout}->size;	1992	my ($w, $h) = $self->{layout}->size;
1619		1993
1620	if (exists $self->{template}) {	1994	if (exists $self->{template}) {
1621	$self->{template}->set_font ($self->{font}) if $self->{font};	1995	$self->{template}->set_font ($self->{font}) if $self->{font};
		1996	$self->{template}->set_width ($self->{max_w} || -1);
1622	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1997	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623		1998
1624	my ($w2, $h2) = $self->{template}->size;	1999	my ($w2, $h2) = $self->{template}->size;
1625		2000
1626	$w = List::Util::max $w, $w2;	2001	$w = List::Util::max $w, $w2;
…		…
1631	};	2006	};
1632		2007
1633	@{ $self->{size_req} }	2008	@{ $self->{size_req} }
1634	}	2009	}
1635		2010
		2011	sub baseline_shift {
		2012	$_[0]{layout}->descent
		2013	}
		2014
1636	sub invoke_size_allocate {	2015	sub invoke_size_allocate {
1637	my ($self, $w, $h) = @_;	2016	my ($self, $w, $h) = @_;
1638		2017
1639	delete $self->{ox};	2018	delete $self->{ox};
1640		2019
…		…
1646		2025
1647	sub set_fontsize {	2026	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	2027	my ($self, $fontsize) = @_;
1649		2028
1650	$self->{fontsize} = $fontsize;	2029	$self->{fontsize} = $fontsize;
		2030	delete $self->{size_req};
1651	delete $self->{texture};	2031	delete $self->{texture};
1652		2032
1653	$self->realloc;	2033	$self->realloc;
1654	}	2034	}
1655		2035
1656	sub reconfigure {	2036	sub reconfigure {
1657	my ($self) = @_;	2037	my ($self) = @_;
1658		2038
1659	delete $self->{size_req};	2039	delete $self->{size_req};
		2040	delete $self->{texture};
1660		2041
1661	$self->SUPER::reconfigure;	2042	$self->SUPER::reconfigure;
1662	}	2043	}
1663		2044
1664	sub _draw {	2045	sub _draw {
1665	my ($self) = @_;	2046	my ($self) = @_;
1666		2047
1667	$self->SUPER::_draw; # draw background, if applicable	2048	$self->SUPER::_draw; # draw background, if applicable
1668		2049
1669	my $tex = $self->{texture} ||= do {	2050	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	2051	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	2052	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	2053	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	2054	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2055	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2056	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		2057
1677	new_from_layout CFClient::Texture $self->{layout}	2058	[$self->{layout}->size]
1678	};	2059	};
1679		2060
1680	unless (exists $self->{ox}) {	2061	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2062	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2063	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	2064	: ($self->{w} - $size->[0]) * 0.5);
1684		2065
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2066	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2067	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	2068	: ($self->{h} - $size->[1]) * 0.5);
1688	};	2069	};
1689		2070
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2071	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2072	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		2073
1695	if ($tex->{format} == GL_ALPHA) {	2074	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697	glColor @{$self->{fg}};
1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699	} else {
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702	}
1703
1704	glDisable GL_TEXTURE_2D;
1705	}	2075	}
1706		2076
1707	#############################################################################	2077	#############################################################################
1708		2078
1709	package CFClient::UI::EntryBase;	2079	package CFPlus::UI::EntryBase;
1710		2080
1711	our @ISA = CFClient::UI::Label::;	2081	our @ISA = CFPlus::UI::Label::;
1712		2082
1713	use CFClient::OpenGL;	2083	use CFPlus::OpenGL;
1714		2084
1715	sub new {	2085	sub new {
1716	my $class = shift;	2086	my $class = shift;
1717		2087
1718	$class->SUPER::new (	2088	$class->SUPER::new (
…		…
1722	active_fg => [0, 0, 0],	2092	active_fg => [0, 0, 0],
1723	can_hover => 1,	2093	can_hover => 1,
1724	can_focus => 1,	2094	can_focus => 1,
1725	valign => 0,	2095	valign => 0,
1726	can_events => 1,	2096	can_events => 1,
		2097	ellipsise => 0,
1727	#text => ...	2098	#text => ...
1728	#hidden => "*",	2099	#hidden => "*",
1729	@_	2100	@_
1730	)	2101	)
1731	}	2102	}
…		…
1776	my $sym = $ev->{sym};	2147	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	2148	my $uni = $ev->{unicode};
1778		2149
1779	my $text = $self->get_text;	2150	my $text = $self->get_text;
1780		2151
		2152	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2153
1781	if ($uni == 8) {	2154	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2155	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	2156	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	2157	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	2158	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	2159	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	2160	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	2161	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	2162	} elsif ($sym == CFPlus::SDLK_HOME) {
		2163	# what a hack
		2164	$self->{cursor} =
		2165	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2166	? length $1
		2167	: 0;
		2168	} elsif ($sym == CFPlus::SDLK_END) {
		2169	# uh, again
		2170	$self->{cursor} =
		2171	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2172	? $self->{cursor} + length $1
		2173	: length $self->{text};
		2174	} elsif ($uni == 21) { # ctrl-u
		2175	$text = "";
1790	$self->{cursor} = 0;	2176	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	2177	} elsif ($uni == 27) {
1794	$self->emit ('escape');	2178	$self->emit ('escape');
1795	} elsif ($uni) {	2179	} elsif ($uni == 0x0d) {
		2180	substr $text, $self->{cursor}++, 0, "\012";
		2181	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2182	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2183	} else {
1798	return 0;	2184	return 0;
1799	}	2185	}
1800		2186
1801	$self->_set_text ($text);	2187	$self->_set_text ($text);
1802		2188
1803	$self->realloc;	2189	$self->realloc;
		2190	$self->update;
1804		2191
1805	1	2192	1
1806	}	2193	}
1807		2194
1808	sub invoke_focus_in {	2195	sub invoke_focus_in {
…		…
1820		2207
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2208	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2209
1823	# byte-index to char-index	2210	# byte-index to char-index
1824	my $text = $self->{text};	2211	my $text = $self->{text};
1825	utf8::encode $text;	2212	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2213	$self->{cursor} = length $text;
1827		2214
1828	$self->_set_text ($self->{text});	2215	$self->_set_text ($self->{text});
1829	$self->update;	2216	$self->update;
1830		2217
1831	1	2218	1
…		…
1870	utf8::encode $text;	2257	utf8::encode $text;
1871		2258
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2259	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873	}	2260	}
1874		2261
1875	glColor @{$self->{fg}};
1876	glBegin GL_LINES;	2262	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2263	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2264	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2265	glEnd;
1880	}	2266	}
1881	}	2267	}
1882		2268
		2269	#############################################################################
		2270
1883	package CFClient::UI::Entry;	2271	package CFPlus::UI::Entry;
1884		2272
1885	our @ISA = CFClient::UI::EntryBase::;	2273	our @ISA = CFPlus::UI::EntryBase::;
1886		2274
1887	use CFClient::OpenGL;	2275	use CFPlus::OpenGL;
1888		2276
1889	sub invoke_key_down {	2277	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2278	my ($self, $ev) = @_;
1891		2279
1892	my $sym = $ev->{sym};	2280	my $sym = $ev->{sym};
1893		2281
1894	if ($sym == 13) {	2282	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2283	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2284	my $txt = $self->get_text;
1897		2285
1898	$self->{history_pointer} = -1;	2286	$self->{history_pointer} = -1;
1899	$self->{history_saveback} = '';	2287	$self->{history_saveback} = '';
1900	$self->emit (activate => $txt);	2288	$self->emit (activate => $txt);
1901	$self->update;	2289	$self->update;
1902		2290
1903	} elsif ($sym == CFClient::SDLK_UP) {	2291	} elsif ($sym == CFPlus::SDLK_UP) {
1904	if ($self->{history_pointer} < 0) {	2292	if ($self->{history_pointer} < 0) {
1905	$self->{history_saveback} = $self->get_text;	2293	$self->{history_saveback} = $self->get_text;
1906	}	2294	}
1907	if (@{$self->{history} || []} > 0) {	2295	if (@{$self->{history} || []} > 0) {
1908	$self->{history_pointer}++;	2296	$self->{history_pointer}++;
…		…
1910	$self->{history_pointer} = @{$self->{history} || []} - 1;	2298	$self->{history_pointer} = @{$self->{history} || []} - 1;
1911	}	2299	}
1912	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2300	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1913	}	2301	}
1914		2302
1915	} elsif ($sym == CFClient::SDLK_DOWN) {	2303	} elsif ($sym == CFPlus::SDLK_DOWN) {
1916	$self->{history_pointer}--;	2304	$self->{history_pointer}--;
1917	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2305	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918		2306
1919	if ($self->{history_pointer} >= 0) {	2307	if ($self->{history_pointer} >= 0) {
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2308	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1929	1	2317	1
1930	}	2318	}
1931		2319
1932	#############################################################################	2320	#############################################################################
1933		2321
		2322	package CFPlus::UI::TextEdit;
		2323
		2324	our @ISA = CFPlus::UI::EntryBase::;
		2325
		2326	use CFPlus::OpenGL;
		2327
		2328	sub move_cursor_ver {
		2329	my ($self, $dy) = @_;
		2330
		2331	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2332
		2333	$y += $dy;
		2334
		2335	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2336	$self->{cursor} = $index;
		2337	delete $self->{cur_h};
		2338	$self->update;
		2339	return;
		2340	}
		2341	}
		2342
		2343	sub invoke_key_down {
		2344	my ($self, $ev) = @_;
		2345
		2346	my $sym = $ev->{sym};
		2347
		2348	if ($sym == CFPlus::SDLK_UP) {
		2349	$self->move_cursor_ver (-1);
		2350	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2351	$self->move_cursor_ver (+1);
		2352	} else {
		2353	return $self->SUPER::invoke_key_down ($ev)
		2354	}
		2355
		2356	1
		2357	}
		2358
		2359	#############################################################################
		2360
1934	package CFClient::UI::Button;	2361	package CFPlus::UI::Button;
1935		2362
1936	our @ISA = CFClient::UI::Label::;	2363	our @ISA = CFPlus::UI::Label::;
1937		2364
1938	use CFClient::OpenGL;	2365	use CFPlus::OpenGL;
1939		2366
1940	my @tex =	2367	my @tex =
1941	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942	qw(b1_button_active.png);	2369	qw(b1_button_inactive.png b1_button_active.png);
1943		2370
1944	sub new {	2371	sub new {
1945	my $class = shift;	2372	my $class = shift;
1946		2373
1947	$class->SUPER::new (	2374	$class->SUPER::new (
1948	padding_x => 4,	2375	padding_x => 4,
1949	padding_y => 4,	2376	padding_y => 4,
1950	fg => [1, 1, 1],	2377	fg => [1.0, 1.0, 1.0],
1951	active_fg => [0, 0, 1],	2378	active_fg => [0.8, 0.8, 0.8],
1952	can_hover => 1,	2379	can_hover => 1,
1953	align => 0,	2380	align => 0,
1954	valign => 0,	2381	valign => 0,
1955	can_events => 1,	2382	can_events => 1,
1956	@_	2383	@_
…		…
1974		2401
1975	glEnable GL_TEXTURE_2D;	2402	glEnable GL_TEXTURE_2D;
1976	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2403	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1977	glColor 0, 0, 0, 1;	2404	glColor 0, 0, 0, 1;
1978		2405
		2406	my $tex = $tex[$GRAB == $self];
1979	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2407	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1980		2408
1981	glDisable GL_TEXTURE_2D;	2409	glDisable GL_TEXTURE_2D;
1982		2410
1983	$self->SUPER::_draw;	2411	$self->SUPER::_draw;
1984	}	2412	}
1985		2413
1986	#############################################################################	2414	#############################################################################
1987		2415
		2416	package CFPlus::UI::CheckBox;
		2417
		2418	our @ISA = CFPlus::UI::DrawBG::;
		2419
		2420	my @tex =
		2421	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2422	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2423
		2424	use CFPlus::OpenGL;
		2425
		2426	sub new {
		2427	my $class = shift;
		2428
		2429	$class->SUPER::new (
		2430	padding_x => 2,
		2431	padding_y => 2,
		2432	fg => [1, 1, 1],
		2433	active_fg => [1, 1, 0],
		2434	bg => [0, 0, 0, 0.2],
		2435	active_bg => [1, 1, 1, 0.5],
		2436	state => 0,
		2437	can_hover => 1,
		2438	@_
		2439	)
		2440	}
		2441
		2442	sub size_request {
		2443	my ($self) = @_;
		2444
		2445	(6) x 2
		2446	}
		2447
		2448	sub toggle {
		2449	my ($self) = @_;
		2450
		2451	$self->{state} = !$self->{state};
		2452	$self->emit (changed => $self->{state});
		2453	$self->update;
		2454	}
		2455
		2456	sub invoke_button_down {
		2457	my ($self, $ev, $x, $y) = @_;
		2458
		2459	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2460	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2461	$self->toggle;
		2462	} else {
		2463	return 0
		2464	}
		2465
		2466	1
		2467	}
		2468
		2469	sub _draw {
		2470	my ($self) = @_;
		2471
		2472	$self->SUPER::_draw;
		2473
		2474	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2475
		2476	my ($w, $h) = @$self{qw(w h)};
		2477
		2478	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2479
		2480	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2481
		2482	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2483
		2484	glEnable GL_TEXTURE_2D;
		2485	$tex->draw_quad_alpha (0, 0, $s, $s);
		2486	glDisable GL_TEXTURE_2D;
		2487	}
		2488
		2489	#############################################################################
		2490
		2491	package CFPlus::UI::Image;
		2492
		2493	our @ISA = CFPlus::UI::Base::;
		2494
		2495	use CFPlus::OpenGL;
		2496
		2497	our %texture_cache;
		2498
		2499	sub new {
		2500	my $class = shift;
		2501
		2502	my $self = $class->SUPER::new (
		2503	can_events => 0,
		2504	@_,
		2505	);
		2506
		2507	$self->{path} || $self->{tex}
		2508	or Carp::croak "'path' or 'tex' attributes required";
		2509
		2510	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2511	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2512
		2513	CFPlus::weaken $texture_cache{$self->{path}};
		2514
		2515	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2516
		2517	$self
		2518	}
		2519
		2520	sub STORABLE_freeze {
		2521	my ($self, $cloning) = @_;
		2522
		2523	$self->{path}
		2524	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2525
		2526	$self->{path}
		2527	}
		2528
		2529	sub STORABLE_attach {
		2530	my ($self, $cloning, $path) = @_;
		2531
		2532	$self->new (path => $path)
		2533	}
		2534
		2535	sub size_request {
		2536	my ($self) = @_;
		2537
		2538	($self->{tex}{w}, $self->{tex}{h})
		2539	}
		2540
		2541	sub _draw {
		2542	my ($self) = @_;
		2543
		2544	my $tex = $self->{tex};
		2545
		2546	my ($w, $h) = ($self->{w}, $self->{h});
		2547
		2548	if ($self->{rot90}) {
		2549	glRotate 90, 0, 0, 1;
		2550	glTranslate 0, -$self->{w}, 0;
		2551
		2552	($w, $h) = ($h, $w);
		2553	}
		2554
		2555	glEnable GL_TEXTURE_2D;
		2556	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2557
		2558	$tex->draw_quad (0, 0, $w, $h);
		2559
		2560	glDisable GL_TEXTURE_2D;
		2561	}
		2562
		2563	#############################################################################
		2564
1988	package CFClient::UI::ImageButton;	2565	package CFPlus::UI::ImageButton;
1989		2566
1990	our @ISA = CFClient::UI::Image::;	2567	our @ISA = CFPlus::UI::Image::;
1991		2568
1992	use CFClient::OpenGL;	2569	use CFPlus::OpenGL;
1993		2570
1994	my %textures;	2571	my %textures;
1995		2572
1996	sub new {	2573	sub new {
1997	my $class = shift;	2574	my $class = shift;
…		…
2019	1	2596	1
2020	}	2597	}
2021		2598
2022	#############################################################################	2599	#############################################################################
2023		2600
2024	package CFClient::UI::CheckBox;
2025
2026	our @ISA = CFClient::UI::DrawBG::;
2027
2028	my @tex =
2029	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032	use CFClient::OpenGL;
2033
2034	sub new {
2035	my $class = shift;
2036
2037	$class->SUPER::new (
2038	padding_x => 2,
2039	padding_y => 2,
2040	fg => [1, 1, 1],
2041	active_fg => [1, 1, 0],
2042	bg => [0, 0, 0, 0.2],
2043	active_bg => [1, 1, 1, 0.5],
2044	state => 0,
2045	can_hover => 1,
2046	@_
2047	)
2048	}
2049
2050	sub size_request {
2051	my ($self) = @_;
2052
2053	(6) x 2
2054	}
2055
2056	sub invoke_button_down {
2057	my ($self, $ev, $x, $y) = @_;
2058
2059	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061	$self->{state} = !$self->{state};
2062	$self->emit (changed => $self->{state});
2063	} else {
2064	return 0
2065	}
2066
2067	1
2068	}
2069
2070	sub _draw {
2071	my ($self) = @_;
2072
2073	$self->SUPER::_draw;
2074
2075	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077	my ($w, $h) = @$self{qw(w h)};
2078
2079	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083	my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085	glEnable GL_TEXTURE_2D;
2086	$tex->draw_quad_alpha (0, 0, $s, $s);
2087	glDisable GL_TEXTURE_2D;
2088	}
2089
2090	#############################################################################
2091
2092	package CFClient::UI::Image;	2601	package CFPlus::UI::VGauge;
2093		2602
2094	our @ISA = CFClient::UI::Base::;	2603	our @ISA = CFPlus::UI::Base::;
2095
2096	use CFClient::OpenGL;
2097	use Carp qw/confess/;
2098
2099	our %loaded_images;
2100
2101	sub new {
2102	my $class = shift;
2103
2104	my $self = $class->SUPER::new (can_events => 0, @_);
2105
2106	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2107
2108	$loaded_images{$self->{image}} ||=
2109	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2110
2111	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2112
2113	Scalar::Util::weaken $loaded_images{$self->{image}};
2114
2115	$self->{aspect} = $tex->{w} / $tex->{h};
2116
2117	$self
2118	}
2119
2120	sub size_request {
2121	my ($self) = @_;
2122
2123	($self->{tex}->{w}, $self->{tex}->{h})
2124	}
2125
2126	sub _draw {
2127	my ($self) = @_;
2128
2129	my $tex = $self->{tex};
2130
2131	my ($w, $h) = ($self->{w}, $self->{h});
2132
2133	if ($self->{rot90}) {
2134	glRotate 90, 0, 0, 1;
2135	glTranslate 0, -$self->{w}, 0;
2136
2137	($w, $h) = ($h, $w);
2138	}
2139
2140	glEnable GL_TEXTURE_2D;
2141	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2142
2143	$tex->draw_quad_alpha (0, 0, $w, $h);
2144
2145	glDisable GL_TEXTURE_2D;
2146	}
2147
2148	#############################################################################
2149
2150	package CFClient::UI::VGauge;
2151
2152	our @ISA = CFClient::UI::Base::;
2153		2604
2154	use List::Util qw(min max);	2605	use List::Util qw(min max);
2155		2606
2156	use CFClient::OpenGL;	2607	use CFPlus::OpenGL;
2157		2608
2158	my %tex = (	2609	my %tex = (
2159	food => [	2610	food => [
2160	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2611	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2612	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162	],	2613	],
2163	grace => [	2614	grace => [
2164	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2615	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2616	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166	],	2617	],
2167	hp => [	2618	hp => [
2168	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2619	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2620	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170	],	2621	],
2171	mana => [	2622	mana => [
2172	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2623	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2173	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2624	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174	],	2625	],
2175	);	2626	);
2176		2627
2177	# eg. VGauge->new (gauge => 'food'), default gauge: food	2628	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2237	my $ycut1 = max 0, min 1, $ycut;	2688	my $ycut1 = max 0, min 1, $ycut;
2238	my $ycut2 = max 0, min 1, $ycut - 1;	2689	my $ycut2 = max 0, min 1, $ycut - 1;
2239		2690
2240	my $h1 = $self->{h} * (1 - $ycut1);	2691	my $h1 = $self->{h} * (1 - $ycut1);
2241	my $h2 = $self->{h} * (1 - $ycut2);	2692	my $h2 = $self->{h} * (1 - $ycut2);
		2693	my $h3 = $self->{h};
		2694
		2695	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242		2696
2243	glEnable GL_BLEND;	2697	glEnable GL_BLEND;
2244	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2698	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2699	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246	glEnable GL_TEXTURE_2D;	2700	glEnable GL_TEXTURE_2D;
…		…
2265		2719
2266	if ($t3) {	2720	if ($t3) {
2267	glBindTexture GL_TEXTURE_2D, $t3->{name};	2721	glBindTexture GL_TEXTURE_2D, $t3->{name};
2268	glBegin GL_QUADS;	2722	glBegin GL_QUADS;
2269	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2723	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2724	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2725	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2726	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273	glEnd;	2727	glEnd;
2274	}	2728	}
2275		2729
2276	glDisable GL_BLEND;	2730	glDisable GL_BLEND;
2277	glDisable GL_TEXTURE_2D;	2731	glDisable GL_TEXTURE_2D;
2278	}	2732	}
2279		2733
2280	#############################################################################	2734	#############################################################################
2281		2735
2282	package CFClient::UI::Gauge;	2736	package CFPlus::UI::Gauge;
2283		2737
2284	our @ISA = CFClient::UI::VBox::;	2738	our @ISA = CFPlus::UI::VBox::;
2285		2739
2286	sub new {	2740	sub new {
2287	my ($class, %arg) = @_;	2741	my ($class, %arg) = @_;
2288		2742
2289	my $self = $class->SUPER::new (	2743	my $self = $class->SUPER::new (
…		…
2291	can_hover => 1,	2745	can_hover => 1,
2292	can_events => 1,	2746	can_events => 1,
2293	%arg,	2747	%arg,
2294	);	2748	);
2295		2749
2296	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2750	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2297	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2751	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2298	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2752	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299		2753
2300	$self	2754	$self
2301	}	2755	}
2302		2756
2303	sub set_fontsize {	2757	sub set_fontsize {
…		…
2324	$self->{value}->set_text ($val);	2778	$self->{value}->set_text ($val);
2325	}	2779	}
2326		2780
2327	#############################################################################	2781	#############################################################################
2328		2782
2329	package CFClient::UI::Slider;	2783	package CFPlus::UI::Slider;
2330		2784
2331	use strict;	2785	use strict;
2332		2786
2333	use CFClient::OpenGL;	2787	use CFPlus::OpenGL;
2334		2788
2335	our @ISA = CFClient::UI::DrawBG::;	2789	our @ISA = CFPlus::UI::DrawBG::;
2336		2790
2337	my @tex =	2791	my @tex =
2338	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2792	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339	qw(s1_slider.png s1_slider_bg.png);	2793	qw(s1_slider.png s1_slider_bg.png);
2340		2794
2341	sub new {	2795	sub new {
2342	my $class = shift;	2796	my $class = shift;
2343		2797
…		…
2432	}	2886	}
2433		2887
2434	1	2888	1
2435	}	2889	}
2436		2890
		2891	sub invoke_mouse_wheel {
		2892	my ($self, $ev) = @_;
		2893
		2894	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2895
		2896	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2897
		2898	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2899
		2900	! ! $delta
		2901	}
		2902
2437	sub update {	2903	sub update {
2438	my ($self) = @_;	2904	my ($self) = @_;
2439		2905
2440	delete $self->{knob_w};	2906	delete $self->{knob_w};
2441	$self->SUPER::update;	2907	$self->SUPER::update;
…		…
2488	glDisable GL_TEXTURE_2D;	2954	glDisable GL_TEXTURE_2D;
2489	}	2955	}
2490		2956
2491	#############################################################################	2957	#############################################################################
2492		2958
2493	package CFClient::UI::ValSlider;	2959	package CFPlus::UI::ValSlider;
2494		2960
2495	our @ISA = CFClient::UI::HBox::;	2961	our @ISA = CFPlus::UI::HBox::;
2496		2962
2497	sub new {	2963	sub new {
2498	my ($class, %arg) = @_;	2964	my ($class, %arg) = @_;
2499		2965
2500	my $range = delete $arg{range};	2966	my $range = delete $arg{range};
2501		2967
2502	my $self = $class->SUPER::new (	2968	my $self = $class->SUPER::new (
2503	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2969	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2970	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505	to_value => sub { shift },	2971	to_value => sub { shift },
2506	from_value => sub { shift },	2972	from_value => sub { shift },
2507	%arg,	2973	%arg,
2508	);	2974	);
2509		2975
…		…
2529	sub set_range { shift->{slider}->set_range (@_) }	2995	sub set_range { shift->{slider}->set_range (@_) }
2530	sub set_value { shift->{slider}->set_value (@_) }	2996	sub set_value { shift->{slider}->set_value (@_) }
2531		2997
2532	#############################################################################	2998	#############################################################################
2533		2999
2534	package CFClient::UI::TextScroller;	3000	package CFPlus::UI::TextScroller;
2535		3001
2536	our @ISA = CFClient::UI::HBox::;	3002	our @ISA = CFPlus::UI::HBox::;
2537		3003
2538	use CFClient::OpenGL;	3004	use CFPlus::OpenGL;
2539		3005
2540	sub new {	3006	sub new {
2541	my $class = shift;	3007	my $class = shift;
2542		3008
2543	my $self = $class->SUPER::new (	3009	my $self = $class->SUPER::new (
2544	fontsize => 1,	3010	fontsize => 1,
2545	can_events => 0,	3011	can_events => 1,
2546	indent => 0,	3012	indent => 0,
2547	#font => default_font	3013	#font => default_font
2548	@_,	3014	@_,
2549		3015
2550	layout => (new CFClient::Layout 1),	3016	layout => (new CFPlus::Layout),
2551	par => [],	3017	par => [],
		3018	max_par => 0,
2552	height => 0,	3019	height => 0,
2553	children => [	3020	children => [
2554	(new CFClient::UI::Empty expand => 1),	3021	(new CFPlus::UI::Empty expand => 1),
2555	(new CFClient::UI::Slider vertical => 1),	3022	(new CFPlus::UI::Slider vertical => 1),
2556	],	3023	],
2557	);	3024	);
2558		3025
2559	$self->{children}[1]->connect (changed => sub { $self->update });	3026	$self->{children}[1]->connect (changed => sub { $self->update });
2560		3027
…		…
2566		3033
2567	$self->{fontsize} = $fontsize;	3034	$self->{fontsize} = $fontsize;
2568	$self->reflow;	3035	$self->reflow;
2569	}	3036	}
2570		3037
		3038	sub size_request {
		3039	my ($self) = @_;
		3040
		3041	my ($empty, $slider) = @{ $self->{children} };
		3042
		3043	local $self->{children} = [$empty, $slider];
		3044	$self->SUPER::size_request
		3045	}
		3046
2571	sub invoke_size_allocate {	3047	sub invoke_size_allocate {
2572	my ($self, $w, $h) = @_;	3048	my ($self, $w, $h) = @_;
2573		3049
		3050	my ($empty, $slider, @other) = @{ $self->{children} };
		3051	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3052
2574	$self->{layout}->set_font ($self->{font}) if $self->{font};	3053	$self->{layout}->set_font ($self->{font}) if $self->{font};
2575	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3054	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576	$self->{layout}->set_width ($self->{children}[0]{w});	3055	$self->{layout}->set_width ($empty->{w});
2577	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3056	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578		3057
2579	$self->reflow;	3058	$self->reflow;
2580		3059
		3060	local $self->{children} = [$empty, $slider];
2581	$self->SUPER::invoke_size_allocate ($w, $h)	3061	$self->SUPER::invoke_size_allocate ($w, $h)
2582	}	3062	}
2583		3063
2584	sub text_size {	3064	sub invoke_mouse_wheel {
2585	my ($self, $text, $indent) = @_;	3065	my ($self, $ev) = @_;
		3066
		3067	return 0 unless $ev->{dy}; # only vertical movements
		3068
		3069	$self->{children}[1]->emit (mouse_wheel => $ev);
		3070
		3071	1
		3072	}
		3073
		3074	sub get_layout {
		3075	my ($self, $para) = @_;
2586		3076
2587	my $layout = $self->{layout};	3077	my $layout = $self->{layout};
2588		3078
		3079	$layout->set_font ($self->{font}) if $self->{font};
		3080	$layout->set_foreground (@{$para->{fg}});
2589	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3081	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590	$layout->set_width ($self->{children}[0]{w} - $indent);	3082	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3083	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592	$layout->set_markup ($text);	3084	$layout->set_markup ($para->{markup});
		3085
		3086	$layout->set_shapes (
		3087	map
		3088	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3089	@{$para->{widget}}
2593		3090	);
		3091
2594	$layout->size	3092	$layout
2595	}	3093	}
2596		3094
2597	sub reflow {	3095	sub reflow {
2598	my ($self) = @_;	3096	my ($self) = @_;
2599		3097
…		…
2606		3104
2607	# todo: base offset on lines or so, not on pixels	3105	# todo: base offset on lines or so, not on pixels
2608	$self->{children}[1]->set_value ($offset);	3106	$self->{children}[1]->set_value ($offset);
2609	}	3107	}
2610		3108
		3109	sub current_paragraph {
		3110	my ($self) = @_;
		3111
		3112	$self->{top_paragraph} - 1
		3113	}
		3114
		3115	sub scroll_to {
		3116	my ($self, $para) = @_;
		3117
		3118	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3119
		3120	$self->{scroll_to} = $para;
		3121	$self->update;
		3122	}
		3123
2611	sub clear {	3124	sub clear {
2612	my ($self) = @_;	3125	my ($self) = @_;
		3126
		3127	my (undef, undef, @other) = @{ $self->{children} };
		3128	$self->remove ($_) for @other;
2613		3129
2614	$self->{par} = [];	3130	$self->{par} = [];
2615	$self->{height} = 0;	3131	$self->{height} = 0;
2616	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3132	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617	}	3133	}
2618		3134
2619	sub add_paragraph {	3135	sub add_paragraph {
2620	my ($self, $color, $text, $indent) = @_;	3136	my $self = shift;
2621		3137
2622	for my $line (split /\n/, $text) {	3138	for my $para (@_) {
2623	my ($w, $h) = $self->text_size ($line);	3139	$para = {
		3140	fg => [1, 1, 1, 1],
		3141	indent => 0,
		3142	markup => "",
		3143	widget => [],
		3144	ref $para ? %$para : (markup => $para),
		3145	w => 1e10,
		3146	wrapped => 1,
		3147	};
		3148
		3149	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3150	push @{$self->{par}}, $para;
		3151	}
		3152
		3153	if (my $max = $self->{max_par}) {
		3154	shift @{$self->{par}} while @{$self->{par}} > $max;
		3155	}
		3156
		3157	$self->{need_reflow}++;
		3158	$self->update;
		3159	}
		3160
		3161	sub scroll_to_bottom {
		3162	my ($self) = @_;
		3163
		3164	$self->{scroll_to} = $#{$self->{par}};
		3165	$self->update;
		3166	}
		3167
		3168	sub force_uptodate {
		3169	my ($self) = @_;
		3170
		3171	if (delete $self->{need_reflow}) {
		3172	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3173
		3174	my $height = 0;
		3175
		3176	for my $para (@{$self->{par}}) {
		3177	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3178	my $layout = $self->get_layout ($para);
		3179	my ($w, $h) = $layout->size;
		3180
		3181	$para->{w} = $w + $para->{indent};
		3182	$para->{h} = $h;
		3183	$para->{wrapped} = $layout->has_wrapped;
		3184	}
		3185
		3186	$para->{y} = $height;
		3187	$height += $para->{h};
		3188	}
		3189
2624	$self->{height} += $h;	3190	$self->{height} = $height;
2625	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3191	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2626	}
2627		3192
2628	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3193	delete $self->{texture};
		3194	}
		3195
		3196	if (my $paridx = delete $self->{scroll_to}) {
		3197	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3198	}
2629	}	3199	}
2630		3200
2631	sub update {	3201	sub update {
2632	my ($self) = @_;	3202	my ($self) = @_;
2633		3203
…		…
2636	return unless $self->{h} > 0;	3206	return unless $self->{h} > 0;
2637		3207
2638	delete $self->{texture};	3208	delete $self->{texture};
2639		3209
2640	$ROOT->on_post_alloc ($self => sub {	3210	$ROOT->on_post_alloc ($self => sub {
		3211	$self->force_uptodate;
		3212
2641	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3213	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642		3214
2643	if (delete $self->{need_reflow}) {
2644	my $height = 0;
2645
2646	my $layout = $self->{layout};
2647
2648	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650	for (@{$self->{par}}) {
2651	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2652	$layout->set_width ($W - $_->[3]);
2653	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654	$layout->set_markup ($_->[4]);
2655	my ($w, $h) = $layout->size;
2656	$_->[0] = $w + $_->[3];
2657	$_->[1] = $h;
2658	}
2659
2660	$height += $_->[1];
2661	}
2662
2663	$self->{height} = $height;
2664
2665	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2666
2667	delete $self->{texture};
2668	}
2669
2670	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3215	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671	glClearColor 0, 0, 0, 0;	3216	glClearColor 0, 0, 0, 0;
2672	glClear GL_COLOR_BUFFER_BIT;	3217	glClear GL_COLOR_BUFFER_BIT;
2673		3218
		3219	package CFPlus::UI::Base;
		3220	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3221	(0, 0, $self->{w}, $self->{h});
		3222
		3223	my $top = int $self->{children}[1]{range}[0];
		3224
		3225	my $paridx = 0;
		3226	my $top_paragraph;
2674	my $top = int $self->{children}[1]{range}[0];	3227	my $top = int $self->{children}[1]{range}[0];
2675		3228
2676	my $y0 = $top;	3229	my $y0 = $top;
2677	my $y1 = $top + $H;	3230	my $y1 = $top + $H;
2678		3231
2679	my $y = 0;
2680
2681	my $layout = $self->{layout};
2682
2683	$layout->set_font ($self->{font}) if $self->{font};
2684
2685	glEnable GL_BLEND;
2686	#TODO# not correct in windows where rgba is forced off
2687	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689	for my $par (@{$self->{par}}) {	3232	for my $para (@{$self->{par}}) {
2690	my $h = $par->[1];	3233	my $h = $para->{h};
		3234	my $y = $para->{y};
2691		3235
2692	if ($y0 < $y + $h && $y < $y1) {	3236	if ($y0 < $y + $h && $y < $y1) {
2693	$layout->set_foreground (@{ $par->[2] });	3237	my $layout = $self->get_layout ($para);
2694	$layout->set_width ($W - $par->[3]);
2695	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696	$layout->set_markup ($par->[4]);
2697		3238
2698	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3239	$layout->render ($para->{indent}, $y - $y0);
2699		3240
2700	glRasterPos $par->[3], $y - $y0;	3241	if (my @w = @{ $para->{widget} }) {
2701	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3242	my @s = $layout->get_shapes;
		3243
		3244	for (@w) {
		3245	my ($dx, $dy) = splice @s, 0, 2, ();
		3246
		3247	$_->{x} = $dx + $para->{indent};
		3248	$_->{y} = $dy + $y - $y0;
		3249
		3250	$_->draw;
		3251	}
		3252	}
2702	}	3253	}
2703		3254
2704	$y += $h;	3255	$paridx++;
		3256	$top_paragraph ||= $paridx if $y >= $top;
2705	}	3257	}
2706		3258
2707	glDisable GL_BLEND;	3259	$self->{top_paragraph} = $top_paragraph;
2708	};	3260	};
2709	});	3261	});
		3262	}
		3263
		3264	sub reconfigure {
		3265	my ($self) = @_;
		3266
		3267	$self->SUPER::reconfigure;
		3268
		3269	$_->{w} = 1e10 for @{ $self->{par} };
		3270	$self->reflow;
2710	}	3271	}
2711		3272
2712	sub _draw {	3273	sub _draw {
2713	my ($self) = @_;	3274	my ($self) = @_;
2714		3275
…		…
2717	glColor 0, 0, 0, 1;	3278	glColor 0, 0, 0, 1;
2718	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3279	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719	glDisable GL_TEXTURE_2D;	3280	glDisable GL_TEXTURE_2D;
2720		3281
2721	$self->{children}[1]->draw;	3282	$self->{children}[1]->draw;
2722
2723	}	3283	}
2724		3284
2725	#############################################################################	3285	#############################################################################
2726		3286
2727	package CFClient::UI::Animator;	3287	package CFPlus::UI::Animator;
2728		3288
2729	use CFClient::OpenGL;	3289	use CFPlus::OpenGL;
2730		3290
2731	our @ISA = CFClient::UI::Bin::;	3291	our @ISA = CFPlus::UI::Bin::;
2732		3292
2733	sub moveto {	3293	sub moveto {
2734	my ($self, $x, $y) = @_;	3294	my ($self, $x, $y) = @_;
2735		3295
2736	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3296	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2764	glPopMatrix;	3324	glPopMatrix;
2765	}	3325	}
2766		3326
2767	#############################################################################	3327	#############################################################################
2768		3328
2769	package CFClient::UI::Flopper;	3329	package CFPlus::UI::Flopper;
2770		3330
2771	our @ISA = CFClient::UI::Button::;	3331	our @ISA = CFPlus::UI::Button::;
2772		3332
2773	sub new {	3333	sub new {
2774	my $class = shift;	3334	my $class = shift;
2775		3335
2776	my $self = $class->SUPER::new (	3336	my $self = $class->SUPER::new (
…		…
2788	$self->{other}->toggle_visibility;	3348	$self->{other}->toggle_visibility;
2789	}	3349	}
2790		3350
2791	#############################################################################	3351	#############################################################################
2792		3352
2793	package CFClient::UI::Tooltip;	3353	package CFPlus::UI::Tooltip;
2794		3354
2795	our @ISA = CFClient::UI::Bin::;	3355	our @ISA = CFPlus::UI::Bin::;
2796		3356
2797	use CFClient::OpenGL;	3357	use CFPlus::OpenGL;
2798		3358
2799	sub new {	3359	sub new {
2800	my $class = shift;	3360	my $class = shift;
2801		3361
2802	$class->SUPER::new (	3362	$class->SUPER::new (
…		…
2805	)	3365	)
2806	}	3366	}
2807		3367
2808	sub set_tooltip_from {	3368	sub set_tooltip_from {
2809	my ($self, $widget) = @_;	3369	my ($self, $widget) = @_;
		3370
		3371	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3372	if $widget->{tooltip} =~ /^#(.*)$/;
2810		3373
2811	my $tooltip = $widget->{tooltip};	3374	my $tooltip = $widget->{tooltip};
2812		3375
2813	if ($ENV{CFPLUS_DEBUG} & 2) {	3376	if ($ENV{CFPLUS_DEBUG} & 2) {
2814	$tooltip .= "\n\n" . (ref $widget) . "\n"	3377	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2818	}	3381	}
2819		3382
2820	$tooltip =~ s/^\n+//;	3383	$tooltip =~ s/^\n+//;
2821	$tooltip =~ s/\n+$//;	3384	$tooltip =~ s/\n+$//;
2822		3385
2823	$self->add (new CFClient::UI::Label	3386	$self->add (new CFPlus::UI::Label
2824	markup => $tooltip,	3387	markup => $tooltip,
2825	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3388	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826	fontsize => 0.8,	3389	fontsize => 0.8,
2827	fg => [0, 0, 0, 1],	3390	style => 1, # FLAG_INVERSE
2828	ellipsise => 0,	3391	ellipsise => 0,
2829	font => ($widget->{tooltip_font} || $::FONT_PROP),	3392	font => ($widget->{tooltip_font} || $::FONT_PROP),
2830	);	3393	);
2831	}	3394	}
2832		3395
…		…
2851		3414
2852	$self->{root}->on_post_alloc ("move_$self" => sub {	3415	$self->{root}->on_post_alloc ("move_$self" => sub {
2853	my $widget = $self->{owner}	3416	my $widget = $self->{owner}
2854	or return;	3417	or return;
2855		3418
		3419	if ($widget->{visible}) {
2856	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3420	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857		3421
2858	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3422	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859	if $x + $self->{w} > $self->{root}{w};	3423	if $x + $self->{w} > $self->{root}{w};
2860		3424
2861	$self->move_abs ($x, $y);	3425	$self->move_abs ($x, $y);
		3426	} else {
		3427	$self->hide;
		3428	}
2862	});	3429	});
2863	}	3430	}
2864		3431
2865	sub _draw {	3432	sub _draw {
2866	my ($self) = @_;	3433	my ($self) = @_;
…		…
2890	$self->SUPER::_draw;	3457	$self->SUPER::_draw;
2891	}	3458	}
2892		3459
2893	#############################################################################	3460	#############################################################################
2894		3461
2895	package CFClient::UI::Face;	3462	package CFPlus::UI::Face;
2896		3463
2897	our @ISA = CFClient::UI::Base::;	3464	our @ISA = CFPlus::UI::DrawBG::;
2898		3465
2899	use CFClient::OpenGL;	3466	use CFPlus::OpenGL;
2900		3467
2901	sub new {	3468	sub new {
2902	my $class = shift;	3469	my $class = shift;
2903		3470
2904	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
		3472	size_w => 32,
		3473	size_h => 8,
2905	aspect => 1,	3474	aspect => 1,
2906	can_events => 0,	3475	can_events => 0,
2907	@_,	3476	@_,
2908	);	3477	);
2909		3478
2910	if ($self->{anim} && $self->{animspeed}) {	3479	if ($self->{anim} && $self->{animspeed}) {
2911	Scalar::Util::weaken (my $widget = $self);	3480	CFPlus::weaken (my $widget = $self);
2912		3481
		3482	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3483	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2913	$self->{timer} = Event->timer (	3484	$self->{timer} = Event->timer (
2914	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2915	hard => 1,	3485	parked => 1,
2916	interval => $self->{animspeed},
2917	cb => sub {	3486	cb => sub {
		3487	return unless $::CONN && $widget;
		3488
2918	++$widget->{frame};	3489	++$widget->{frame};
		3490	$widget->update_face;
2919	$widget->update;	3491	$widget->update;
		3492
		3493	$widget->update_timer;
2920	},	3494	},
2921	);	3495	);
		3496
		3497	$self->update_face;
		3498	$self->update_timer;
2922	}	3499	}
2923		3500
2924	$self	3501	$self
2925	}	3502	}
2926		3503
		3504	sub update_timer {
		3505	my ($self) = @_;
		3506
		3507	return unless $self->{timer};
		3508
		3509	if ($self->{visible}) {
		3510	$self->{timer}->at (
		3511	$self->{anim_start}
		3512	+ $self->{animspeed}
		3513	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3514	);
		3515	$self->{timer}->start;
		3516	} else {
		3517	$self->{timer}->stop;
		3518	}
		3519	}
		3520
		3521	sub update_face {
		3522	my ($self) = @_;
		3523
		3524	return unless $::CONN;
		3525
		3526	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3527	if ($anim && @$anim) {
		3528	delete $self->{wait_face};
		3529	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3530	}
		3531	}
		3532	}
		3533
2927	sub size_request {	3534	sub size_request {
2928	(32, 8)	3535	my ($self) = @_;
		3536
		3537	if ($::CONN) {
		3538	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3539	if (my $tex = $::CONN->{texture}[$faceid]) {
		3540	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3541	} else {
		3542	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3543	$self->realloc;
		3544	});
		3545	}
		3546	}
		3547	}
		3548
		3549	($self->{size_w} || 8, $self->{size_h} || 8)
2929	}	3550	}
2930		3551
2931	sub update {	3552	sub update {
2932	my ($self) = @_;	3553	my ($self) = @_;
2933		3554
2934	return unless $self->{visible};	3555	return unless $self->{visible};
2935		3556
2936	$self->SUPER::update;	3557	$self->SUPER::update;
2937	}	3558	}
2938		3559
		3560	sub invoke_visibility_change {
		3561	my ($self) = @_;
		3562
		3563	$self->update_timer;
		3564
		3565	0
		3566	}
		3567
2939	sub _draw {	3568	sub _draw {
2940	my ($self) = @_;	3569	my ($self) = @_;
2941		3570
2942	return unless $::CONN;	3571	return unless $::CONN;
2943		3572
2944	my $face;	3573	$self->SUPER::_draw;
2945		3574
2946	if ($self->{frame}) {
2947	my $anim = $::CONN->{anim}[$self->{anim}];	3575	my $faceid = $::CONN->{faceid}[$self->{face}]
2948		3576	or return;
2949	$face = $anim->[ $self->{frame} % @$anim ]
2950	if $anim && @$anim;
2951	}
2952		3577
2953	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3578	my $tex = $::CONN->{texture}[$faceid];
2954		3579
2955	if ($tex) {	3580	if ($tex) {
2956	glEnable GL_TEXTURE_2D;	3581	glEnable GL_TEXTURE_2D;
2957	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3582	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2958	glColor 0, 0, 0, 1;	3583	glColor 0, 0, 0, 1;
…		…
2962	}	3587	}
2963		3588
2964	sub destroy {	3589	sub destroy {
2965	my ($self) = @_;	3590	my ($self) = @_;
2966		3591
2967	$self->{timer}->cancel	3592	(delete $self->{timer})->cancel
2968	if $self->{timer};	3593	if $self->{timer};
2969		3594
2970	$self->SUPER::destroy;	3595	$self->SUPER::destroy;
2971	}	3596	}
2972		3597
2973	#############################################################################	3598	#############################################################################
2974		3599
2975	package CFClient::UI::Buttonbar;	3600	package CFPlus::UI::Buttonbar;
2976		3601
2977	our @ISA = CFClient::UI::HBox::;	3602	our @ISA = CFPlus::UI::HBox::;
2978		3603
2979	# TODO: should actualyl wrap buttons and other goodies.	3604	# TODO: should actually wrap buttons and other goodies.
2980		3605
2981	#############################################################################	3606	#############################################################################
2982		3607
2983	package CFClient::UI::Menu;	3608	package CFPlus::UI::Menu;
2984		3609
2985	our @ISA = CFClient::UI::FancyFrame::;	3610	our @ISA = CFPlus::UI::Toplevel::;
2986		3611
2987	use CFClient::OpenGL;	3612	use CFPlus::OpenGL;
2988		3613
2989	sub new {	3614	sub new {
2990	my $class = shift;	3615	my $class = shift;
2991		3616
2992	my $self = $class->SUPER::new (	3617	my $self = $class->SUPER::new (
2993	items => [],	3618	items => [],
2994	z => 100,	3619	z => 100,
2995	@_,	3620	@_,
2996	);	3621	);
2997		3622
2998	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3623	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999		3624
3000	for my $item (@{ $self->{items} }) {	3625	for my $item (@{ $self->{items} }) {
3001	my ($widget, $cb, $tooltip) = @$item;	3626	my ($widget, $cb, $tooltip) = @$item;
3002		3627
3003	# handle various types of items, only text for now	3628	# handle various types of items, only text for now
3004	if (!ref $widget) {	3629	if (!ref $widget) {
		3630	if ($widget =~ /\t/) {
		3631	my ($left, $right) = split /\t/, $widget, 2;
		3632
3005	$widget = new CFClient::UI::Label	3633	$widget = new CFPlus::UI::HBox
3006	can_hover => 1,	3634	can_hover => 1,
3007	can_events => 1,	3635	can_events => 1,
		3636	tooltip => $tooltip,
		3637	children => [
		3638	(new CFPlus::UI::Label markup => $left, expand => 1),
		3639	(new CFPlus::UI::Label markup => $right, align => +1),
		3640	],
		3641	;
		3642
		3643	} else {
		3644	$widget = new CFPlus::UI::Label
		3645	can_hover => 1,
		3646	can_events => 1,
3008	markup => $widget,	3647	markup => $widget,
3009	tooltip => $tooltip	3648	tooltip => $tooltip;
		3649	}
3010	}	3650	}
3011		3651
3012	$self->{item}{$widget} = $item;	3652	$self->{item}{$widget} = $item;
3013		3653
3014	$self->{vbox}->add ($widget);	3654	$self->{vbox}->add ($widget);
…		…
3057	1	3697	1
3058	}	3698	}
3059		3699
3060	#############################################################################	3700	#############################################################################
3061		3701
3062	package CFClient::UI::Multiplexer;	3702	package CFPlus::UI::Multiplexer;
3063		3703
3064	our @ISA = CFClient::UI::Container::;	3704	our @ISA = CFPlus::UI::Container::;
3065		3705
3066	sub new {	3706	sub new {
3067	my $class = shift;	3707	my $class = shift;
3068		3708
3069	my $self = $class->SUPER::new (	3709	my $self = $class->SUPER::new (
…		…
3083		3723
3084	$self->{current} = $self->{children}[0]	3724	$self->{current} = $self->{children}[0]
3085	if @{ $self->{children} };	3725	if @{ $self->{children} };
3086	}	3726	}
3087		3727
		3728	sub get_current_page {
		3729	my ($self) = @_;
		3730
		3731	$self->{current}
		3732	}
		3733
3088	sub set_current_page {	3734	sub set_current_page {
3089	my ($self, $page_or_widget) = @_;	3735	my ($self, $page_or_widget) = @_;
3090		3736
3091	my $widget = ref $page_or_widget	3737	my $widget = ref $page_or_widget
3092	? $page_or_widget	3738	? $page_or_widget
…		…
3124	$self->{current}->draw;	3770	$self->{current}->draw;
3125	}	3771	}
3126		3772
3127	#############################################################################	3773	#############################################################################
3128		3774
3129	package CFClient::UI::Notebook;	3775	package CFPlus::UI::Notebook;
3130		3776
3131	our @ISA = CFClient::UI::VBox::;	3777	our @ISA = CFPlus::UI::VBox::;
3132		3778
3133	sub new {	3779	sub new {
3134	my $class = shift;	3780	my $class = shift;
3135		3781
3136	my $self = $class->SUPER::new (	3782	my $self = $class->SUPER::new (
3137	buttonbar => (new CFClient::UI::Buttonbar),	3783	buttonbar => (new CFPlus::UI::Buttonbar),
3138	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3784	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139	# filter => # will be put between multiplexer and $self	3785	# filter => # will be put between multiplexer and $self
3140	@_,	3786	@_,
3141	);	3787	);
3142		3788
3143	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3789	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3147	}	3793	}
3148		3794
3149	sub add {	3795	sub add {
3150	my ($self, $title, $widget, $tooltip) = @_;	3796	my ($self, $title, $widget, $tooltip) = @_;
3151		3797
3152	Scalar::Util::weaken $self;	3798	CFPlus::weaken $self;
3153		3799
3154	$self->{buttonbar}->add (new CFClient::UI::Button	3800	$self->{buttonbar}->add (new CFPlus::UI::Button
3155	markup => $title,	3801	markup => $title,
3156	tooltip => $tooltip,	3802	tooltip => $tooltip,
3157	on_activate => sub { $self->set_current_page ($widget) },	3803	on_activate => sub { $self->set_current_page ($widget) },
3158	);	3804	);
3159		3805
3160	$self->{multiplexer}->add ($widget);	3806	$self->{multiplexer}->add ($widget);
3161	}	3807	}
3162		3808
		3809	sub get_current_page {
		3810	my ($self) = @_;
		3811
		3812	$self->{multiplexer}->get_current_page
		3813	}
		3814
3163	sub set_current_page {	3815	sub set_current_page {
3164	my ($self, $page) = @_;	3816	my ($self, $page) = @_;
3165		3817
3166	$self->{multiplexer}->set_current_page ($page);	3818	$self->{multiplexer}->set_current_page ($page);
3167	$self->emit (page_changed => $self->{multiplexer}{current});	3819	$self->emit (page_changed => $self->{multiplexer}{current});
3168	}	3820	}
3169		3821
3170	#############################################################################	3822	#############################################################################
3171		3823
3172	package CFClient::UI::Combobox;	3824	package CFPlus::UI::Selector;
3173		3825
3174	use utf8;	3826	use utf8;
3175		3827
3176	our @ISA = CFClient::UI::Button::;	3828	our @ISA = CFPlus::UI::Button::;
3177		3829
3178	sub new {	3830	sub new {
3179	my $class = shift;	3831	my $class = shift;
3180		3832
3181	my $self = $class->SUPER::new (	3833	my $self = $class->SUPER::new (
…		…
3198	my ($value, $title, $tooltip) = @$_;	3850	my ($value, $title, $tooltip) = @$_;
3199		3851
3200	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3852	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201	}	3853	}
3202		3854
3203	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3855	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204	}	3856	}
3205		3857
3206	sub _set_value {	3858	sub _set_value {
3207	my ($self, $value) = @_;	3859	my ($self, $value) = @_;
3208		3860
…		…
3223	$self->emit (changed => $value);	3875	$self->emit (changed => $value);
3224	}	3876	}
3225		3877
3226	#############################################################################	3878	#############################################################################
3227		3879
3228	package CFClient::UI::Statusbox;	3880	package CFPlus::UI::Statusbox;
3229		3881
3230	our @ISA = CFClient::UI::VBox::;	3882	our @ISA = CFPlus::UI::VBox::;
3231		3883
3232	sub new {	3884	sub new {
3233	my $class = shift;	3885	my $class = shift;
3234		3886
3235	my $self = $class->SUPER::new (	3887	my $self = $class->SUPER::new (
3236	fontsize => 0.8,	3888	fontsize => 0.8,
3237	@_,	3889	@_,
3238	);	3890	);
3239		3891
3240	Scalar::Util::weaken (my $this = $self);	3892	CFPlus::weaken (my $this = $self);
3241		3893
3242	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3894	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243		3895
3244	$self	3896	$self
3245	}	3897	}
…		…
3247	sub reorder {	3899	sub reorder {
3248	my ($self) = @_;	3900	my ($self) = @_;
3249	my $NOW = Time::HiRes::time;	3901	my $NOW = Time::HiRes::time;
3250		3902
3251	# freeze display when hovering over any label	3903	# freeze display when hovering over any label
3252	return if $CFClient::UI::TOOLTIP->{owner}	3904	return if $CFPlus::UI::TOOLTIP->{owner}
3253	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3905	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254	values %{ $self->{item} };	3906	values %{ $self->{item} };
3255		3907
3256	while (my ($k, $v) = each %{ $self->{item} }) {	3908	while (my ($k, $v) = each %{ $self->{item} }) {
3257	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3909	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258	}	3910	}
…		…
3279	for ($short) {	3931	for ($short) {
3280	s/^\s+//;	3932	s/^\s+//;
3281	s/\s+/ /g;	3933	s/\s+/ /g;
3282	}	3934	}
3283		3935
3284	new CFClient::UI::Label	3936	new CFPlus::UI::Label
3285	markup => $short,	3937	markup => $short,
3286	tooltip => $item->{tooltip},	3938	tooltip => $item->{tooltip},
3287	tooltip_font => $::FONT_PROP,	3939	tooltip_font => $::FONT_PROP,
3288	tooltip_width => 0.67,	3940	tooltip_width => 0.67,
3289	fontsize => $item->{fontsize} || $self->{fontsize},	3941	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3343	count => 1,	3995	count => 1,
3344	%arg,	3996	%arg,
3345	};	3997	};
3346	}	3998	}
3347		3999
		4000	$ROOT->on_refresh (reorder => sub {
3348	$self->reorder;	4001	$self->reorder;
		4002	});
3349	}	4003	}
3350		4004
3351	sub reconfigure {	4005	sub reconfigure {
3352	my ($self) = @_;	4006	my ($self) = @_;
3353		4007
…		…
3366	$self->SUPER::destroy;	4020	$self->SUPER::destroy;
3367	}	4021	}
3368		4022
3369	#############################################################################	4023	#############################################################################
3370		4024
3371	package CFClient::UI::Inventory;
3372
3373	our @ISA = CFClient::UI::ScrolledWindow::;
3374
3375	sub new {
3376	my $class = shift;
3377
3378	my $self = $class->SUPER::new (
3379	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380	@_,
3381	);
3382
3383	$self
3384	}
3385
3386	sub set_items {
3387	my ($self, $items) = @_;
3388
3389	$self->{child}->clear;
3390	return unless $items;
3391
3392	my @items = sort {
3393	($a->{type} <=> $b->{type})
3394	or ($a->{name} cmp $b->{name})
3395	} @$items;
3396
3397	$self->{real_items} = \@items;
3398
3399	my $row = 0;
3400	for my $item (@items) {
3401	CFClient::Item::update_widgets $item;
3402
3403	$self->{child}->add (0, $row, $item->{face_widget});
3404	$self->{child}->add (1, $row, $item->{desc_widget});
3405	$self->{child}->add (2, $row, $item->{weight_widget});
3406
3407	$row++;
3408	}
3409	}
3410
3411	#############################################################################
3412
3413	package CFClient::UI::BindEditor;
3414
3415	our @ISA = CFClient::UI::FancyFrame::;
3416
3417	sub new {
3418	my $class = shift;
3419
3420	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422	$self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426	text => "start recording",
3427	tooltip => "Start/Stops recording of actions."
3428	."All subsequent actions after the recording started will be captured."
3429	."The actions are displayed after the record was stopped."
3430	."To bind the action you have to click on the 'Bind' button",
3431	on_activate => sub {
3432	unless ($self->{recording}) {
3433	$self->start;
3434	} else {
3435	$self->stop;
3436	}
3437	});
3438
3439	$vb->add (new CFClient::UI::Label text => "Actions:");
3440	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3443	$vb->add (my $hb = new CFClient::UI::HBox);
3444	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445	$hb->add (new CFClient::UI::Button
3446	text => "bind",
3447	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448	on_activate => sub {
3449	$self->ask_for_bind;
3450	});
3451
3452	$vb->add (my $hb = new CFClient::UI::HBox);
3453	$hb->add (new CFClient::UI::Button
3454	text => "ok",
3455	expand => 1,
3456	tooltip => "This closes the binding editor and saves the binding",
3457	on_activate => sub {
3458	$self->hide;
3459	$self->commit;
3460	});
3461
3462	$hb->add (new CFClient::UI::Button
3463	text => "cancel",
3464	expand => 1,
3465	tooltip => "This closes the binding editor without saving",
3466	on_activate => sub {
3467	$self->hide;
3468	$self->{binding_cancel}->()
3469	if $self->{binding_cancel};
3470	});
3471
3472	$self->update_binding_widgets;
3473
3474	$self
3475	}
3476
3477	sub commit {
3478	my ($self) = @_;
3479	my ($mod, $sym, $cmds) = $self->get_binding;
3480	if ($sym != 0 && @$cmds > 0) {
3481	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482	."'. Don't forget 'Save Config'!");
3483	$self->{binding_change}->($mod, $sym, $cmds)
3484	if $self->{binding_change};
3485	} else {
3486	$::STATUSBOX->add ("No action bound, no key or action specified!");
3487	$self->{binding_cancel}->()
3488	if $self->{binding_cancel};
3489	}
3490	}
3491
3492	sub start {
3493	my ($self) = @_;
3494
3495	$self->{rec_btn}->set_text ("stop recording");
3496	$self->{recording} = 1;
3497	$self->clear_command_list;
3498	$::CONN->start_record if $::CONN;
3499	}
3500
3501	sub stop {
3502	my ($self) = @_;
3503
3504	$self->{rec_btn}->set_text ("start recording");
3505	$self->{recording} = 0;
3506
3507	my $rec;
3508	$rec = $::CONN->stop_record if $::CONN;
3509	return unless ref $rec eq 'ARRAY';
3510	$self->set_command_list ($rec);
3511	}
3512
3513
3514	sub ask_for_bind_and_commit {
3515	my ($self) = @_;
3516	$self->ask_for_bind (1);
3517	}
3518
3519	sub ask_for_bind {
3520	my ($self, $commit, $end_cb) = @_;
3521
3522	CFClient::Binder::open_binding_dialog (sub {
3523	my ($mod, $sym) = @_;
3524	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525	$self->update_binding_widgets;
3526	$self->commit if $commit;
3527	$end_cb->() if $end_cb;
3528	});
3529	}
3530
3531	# $mod and $sym are the modifiers and key symbol
3532	# $cmds is a array ref of strings (the commands)
3533	# $cb is the callback that is executed on OK
3534	# $ccb is the callback that is executed on CANCEL and
3535	# when the binding was unsuccessful on OK
3536	sub set_binding {
3537	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539	$self->clear_command_list;
3540	$self->{recording} = 0;
3541	$self->{rec_btn}->set_text ("start recording");
3542
3543	$self->{binding} = [$mod, $sym];
3544	$self->{commands} = $cmds;
3545
3546	$self->{binding_change} = $cb;
3547	$self->{binding_cancel} = $ccb;
3548
3549	$self->update_binding_widgets;
3550	}
3551
3552	# this is a shortcut method that asks for a binding
3553	# and then just binds it.
3554	sub do_quick_binding {
3555	my ($self, $cmds, $end_cb) = @_;
3556	$self->set_binding (undef, undef, $cmds, sub {
3557	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558	});
3559	$self->ask_for_bind (1, $end_cb);
3560	}
3561
3562	sub update_binding_widgets {
3563	my ($self) = @_;
3564	my ($mod, $sym, $cmds) = $self->get_binding;
3565	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566	$self->set_command_list ($cmds);
3567	}
3568
3569	sub get_binding {
3570	my ($self) = @_;
3571	return (
3572	$self->{binding}->[0],
3573	$self->{binding}->[1],
3574	[ grep { defined $_ } @{$self->{commands}} ]
3575	);
3576	}
3577
3578	sub clear_command_list {
3579	my ($self) = @_;
3580	$self->{cmdbox}->clear ();
3581	}
3582
3583	sub set_command_list {
3584	my ($self, $cmds) = @_;
3585
3586	$self->{cmdbox}->clear ();
3587	$self->{commands} = $cmds;
3588
3589	my $idx = 0;
3590
3591	for (@$cmds) {
3592	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594	my $i = $idx;
3595	$hb->add (new CFClient::UI::Label text => $_);
3596	$hb->add (new CFClient::UI::Button
3597	text => "delete",
3598	tooltip => "Deletes the action from the record",
3599	on_activate => sub {
3600	$self->{cmdbox}->remove ($hb);
3601	$cmds->[$i] = undef;
3602	});
3603
3604
3605	$idx++
3606	}
3607	}
3608
3609	#############################################################################
3610
3611	package CFClient::UI::SpellList;
3612
3613	our @ISA = CFClient::UI::Table::;
3614
3615	sub new {
3616	my $class = shift;
3617
3618	my $self = $class->SUPER::new (
3619	binding => [],
3620	commands => [],
3621	@_,
3622	)
3623	}
3624
3625	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638	sub rebuild_spell_list {
3639	my ($self) = @_;
3640
3641	$CFClient::UI::ROOT->on_refresh ($self => sub {
3642	$self->clear;
3643
3644	return unless $::CONN;
3645
3646	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652	my $row = 0;
3653
3654	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655	my $spell = $self->{spell}{$_};
3656
3657	$row++;
3658
3659	my $spell_cb = sub {
3660	my ($widget, $ev) = @_;
3661
3662	if ($ev->{button} == 1) {
3663	$::CONN->user_send ("cast $spell->{name}");
3664	} elsif ($ev->{button} == 2) {
3665	$::CONN->user_send ("invoke $spell->{name}");
3666	} elsif ($ev->{button} == 3) {
3667	(new CFClient::UI::Menu
3668	items => [
3669	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671	],
3672	)->popup ($ev);
3673	} else {
3674	return 0;
3675	}
3676
3677	1
3678	};
3679
3680	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682	#TODO: add path info to tooltip
3683	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685	$self->add (0, $row, new CFClient::UI::Face
3686	face => $spell->{face},
3687	can_hover => 1,
3688	can_events => 1,
3689	tooltip => $tooltip,
3690	on_button_down => $spell_cb,
3691	);
3692
3693	$self->add (1, $row, new CFClient::UI::Label
3694	expand => 1,
3695	text => $spell->{name},
3696	can_hover => 1,
3697	can_events => 1,
3698	tooltip => $tooltip,
3699	on_button_down => $spell_cb,
3700	);
3701
3702	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706	}
3707	});
3708	}
3709
3710	sub add_spell {
3711	my ($self, $spell) = @_;
3712
3713	$self->{spell}->{$spell->{name}} = $spell;
3714	$self->rebuild_spell_list;
3715	}
3716
3717	sub remove_spell {
3718	my ($self, $spell) = @_;
3719
3720	delete $self->{spell}->{$spell->{name}};
3721	$self->rebuild_spell_list;
3722	}
3723
3724	sub clear_spells {
3725	my ($self) = @_;
3726
3727	$self->{spell} = {};
3728	$self->rebuild_spell_list;
3729	}
3730
3731	#############################################################################
3732
3733	package CFClient::UI::Root;	4025	package CFPlus::UI::Root;
3734		4026
3735	our @ISA = CFClient::UI::Container::;	4027	our @ISA = CFPlus::UI::Container::;
3736		4028
3737	use List::Util qw(min max);	4029	use List::Util qw(min max);
3738		4030
3739	use CFClient::OpenGL;	4031	use CFPlus::OpenGL;
3740		4032
3741	sub new {	4033	sub new {
3742	my $class = shift;	4034	my $class = shift;
3743		4035
3744	my $self = $class->SUPER::new (	4036	my $self = $class->SUPER::new (
3745	visible => 1,	4037	visible => 1,
3746	@_,	4038	@_,
3747	);	4039	);
3748		4040
3749	Scalar::Util::weaken ($self->{root} = $self);	4041	CFPlus::weaken ($self->{root} = $self);
3750		4042
3751	$self	4043	$self
3752	}	4044	}
3753		4045
3754	sub size_request {	4046	sub size_request {
…		…
3920	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4212	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921		4213
3922	$w = 0 if $w < 0;	4214	$w = 0 if $w < 0;
3923	$h = 0 if $h < 0;	4215	$h = 0 if $h < 0;
3924		4216
		4217	$w = max $widget->{min_w}, $w;
		4218	$h = max $widget->{min_h}, $h;
		4219
		4220	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4221	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4222
		4223	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4224	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4225
3925	$w = int $w + 0.5;	4226	$w = int $w + 0.5;
3926	$h = int $h + 0.5;	4227	$h = int $h + 0.5;
3927		4228
3928	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4229	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929	$widget->{old_w} = $widget->{w};	4230	$widget->{old_w} = $widget->{w};
…		…
3939		4240
3940	while ($self->{post_alloc_hook}) {	4241	while ($self->{post_alloc_hook}) {
3941	$_->()	4242	$_->()
3942	for values %{delete $self->{post_alloc_hook}};	4243	for values %{delete $self->{post_alloc_hook}};
3943	}	4244	}
3944
3945		4245
3946	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4246	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3947	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4247	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3948	glClear GL_COLOR_BUFFER_BIT;	4248	glClear GL_COLOR_BUFFER_BIT;
3949		4249
…		…
3952	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4252	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953	glMatrixMode GL_MODELVIEW;	4253	glMatrixMode GL_MODELVIEW;
3954	glLoadIdentity;	4254	glLoadIdentity;
3955		4255
3956	{	4256	{
3957	package CFClient::UI::Base;	4257	package CFPlus::UI::Base;
3958		4258
3959	($draw_x, $draw_y, $draw_w, $draw_h) =	4259	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960	(0, 0, $self->{w}, $self->{h});	4260	(0, 0, $self->{w}, $self->{h});
3961	}
3962		4261
3963	$self->_draw;	4262	$self->_draw;
		4263	}
3964	}	4264	}
3965		4265
3966	#############################################################################	4266	#############################################################################
3967		4267
3968	package CFClient::UI;	4268	package CFPlus::UI;
3969		4269
3970	$ROOT = new CFClient::UI::Root;	4270	$ROOT = new CFPlus::UI::Root;
3971	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4271	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972		4272
3973	1	4273	1
3974		4274

Diff Legend

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