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

Diff Legend

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