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

Diff Legend

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