ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.398 by root, Sat Jul 21 14:32:10 2007 UTC

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

Diff Legend

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