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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.417 by root, Tue Jul 24 18:24:04 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	{ __w_ => $_[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
…		…
345	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
346		380
347	if ($self->{aspect}) {	381	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
349		383
350	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		386
353	# use alignment to adjust x, y	387	# use alignment to adjust x, y
354		388
355	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
397		431
398	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
399		433
400	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
401		435
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	439	}
406	}	440	}
407		441
408	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
409	sub coord2local {	443	sub coord2local {
410	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
411		445
		446	Carp::confess unless $self->{parent};#d#
		447
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	449	}
414		450
415	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
416	sub coord2global {	452	sub coord2global {
417	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
418		454
		455	Carp::confess unless $self->{parent};#d#
		456
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	458	}
421		459
422	sub invoke_focus_in {	460	sub invoke_focus_in {
423	my ($self) = @_;	461	my ($self) = @_;
424		462
425	return if $FOCUS == $self;	463	return if $FOCUS == $self;
426	return unless $self->{can_focus};	464	return unless $self->{can_focus};
427		465
428	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
429		467
430	$focus->update if $focus;	468	$self->update;
431	$FOCUS->update;
432		469
433	0	470	0
434	}	471	}
435		472
436	sub invoke_focus_out {	473	sub invoke_focus_out {
437	my ($self) = @_;	474	my ($self) = @_;
438		475
439	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
440		477
441	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
442		479
443	$focus->update if $focus; #?	480	$self->update;
444		481
445	$::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
446	unless $FOCUS;	483	unless $FOCUS;
447		484
448	0	485	0
449	}	486	}
450		487
451	sub grab_focus {	488	sub grab_focus {
452	my ($self) = @_;	489	my ($self) = @_;
453		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	492	$self->emit ("focus_in");
455	}	493	}
456		494
457	sub invoke_mouse_motion { 1 }	495	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	496	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	497	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
461		500
462	sub invoke_button_down {	501	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
464		503
465	$self->grab_focus;	504	$self->grab_focus;
466		505
467	1	506	0
468	}	507	}
469		508
470	sub connect {	509	sub connect {
471	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
472		511
473	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	}
474	}	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	);
475		532
476	sub emit {	533	sub emit {
477	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
478		535
479	#d##TODO# stop propagating at first true, do not use sum	536	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($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
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	554	}
484		555
485	sub find_widget {	556	#sub find_widget {
486	my ($self, $x, $y) = @_;	557	# in .xs
487
488	return () unless $self->{can_events};
489
490	return $self
491	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494	()
495	}
496		558
497	sub set_parent {	559	sub set_parent {
498	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
499		561
500	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
502	}	564	}
503		565
504	sub realloc {	566	sub realloc {
505	my ($self) = @_;	567	my ($self) = @_;
…		…
531		593
532	# using global variables seems a bit hacky, but passing through all drawing	594	# using global variables seems a bit hacky, but passing through all drawing
533	# functions seems pointless.	595	# functions seems pointless.
534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535		597
536	sub draw {	598	#sub draw {
537	my ($self) = @_;	599	#CFPlus.xs
538
539	return unless $self->{h} && $self->{w};
540
541	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};
544
545	# skip widgets that are entirely outside the drawing area
546	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549	glPushMatrix;
550	glTranslate $self->{x}, $self->{y}, 0;
551
552	if ($self == $HOVER && $self->{can_hover}) {
553	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554	glEnable GL_BLEND;
555	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556	glBegin GL_QUADS;
557	glVertex 0 , 0;
558	glVertex $self->{w}, 0;
559	glVertex $self->{w}, $self->{h};
560	glVertex 0 , $self->{h};
561	glEnd;
562	glDisable GL_BLEND;
563	}
564
565	if ($ENV{CFPLUS_DEBUG} & 1) {
566	glPushMatrix;
567	glColor 1, 1, 0, 1;
568	glTranslate 0.375, 0.375;
569	glBegin GL_LINE_LOOP;
570	glVertex 0 , 0;
571	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;
574	glEnd;
575	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}
578
579	$self->_draw;
580	glPopMatrix;
581	}
582		600
583	sub _draw {	601	sub _draw {
584	my ($self) = @_;	602	my ($self) = @_;
585		603
586	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
587	}	605	}
588		606
589	sub DESTROY {	607	sub DESTROY {
590	my ($self) = @_;	608	my ($self) = @_;
591		609
592	delete $WIDGET{$self+0};	610	return if CFPlus::in_destruct;
593		611
594	eval { $self->destroy };	612	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		614
		615	delete $WIDGET{$self+0};
596	}	616	}
597		617
598	#############################################################################	618	#############################################################################
599		619
600	package CFClient::UI::DrawBG;	620	package CFPlus::UI::DrawBG;
601		621
602	our @ISA = CFClient::UI::Base::;	622	our @ISA = CFPlus::UI::Base::;
603		623
604	use strict;	624	use strict;
605	use CFClient::OpenGL;	625	use CFPlus::OpenGL;
606		626
607	sub new {	627	sub new {
608	my $class = shift;	628	my $class = shift;
609		629
610	# range [value, low, high, page]	630	# range [value, low, high, page]
…		…
641	}	661	}
642	}	662	}
643		663
644	#############################################################################	664	#############################################################################
645		665
646	package CFClient::UI::Empty;	666	package CFPlus::UI::Empty;
647		667
648	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
649		669
650	sub new {	670	sub new {
651	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	672	$class->SUPER::new (can_events => 0, %arg);
653	}	673	}
…		…
660		680
661	sub draw { }	681	sub draw { }
662		682
663	#############################################################################	683	#############################################################################
664		684
665	package CFClient::UI::Container;	685	package CFPlus::UI::Container;
666		686
667	our @ISA = CFClient::UI::Base::;	687	our @ISA = CFPlus::UI::Base::;
668		688
669	sub new {	689	sub new {
670	my ($class, %arg) = @_;	690	my ($class, %arg) = @_;
671		691
672	my $children = delete $arg{children};	692	my $children = delete $arg{children};
…		…
676	can_events => 0,	696	can_events => 0,
677	%arg,	697	%arg,
678	);	698	);
679		699
680	$self->add (@$children)	700	$self->add (@$children)
681	if $children;	701	if $children && @$children;
682		702
683	$self	703	$self
		704	}
		705
		706	sub realloc {
		707	my ($self) = @_;
		708
		709	$self->{force_realloc} = 1;
		710	$self->{force_size_alloc} = 1;
		711	$self->SUPER::realloc;
684	}	712	}
685		713
686	sub add {	714	sub add {
687	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
688		716
689	$_->set_parent ($self)	717	$_->set_parent ($self)
690	for @widgets;	718	for @widgets;
691		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
692	use sort 'stable';	721	use sort 'stable';
693		722
694	$self->{children} = [	723	$self->{children} = [
695	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
696	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
697	];	726	];
698		727
699	$self->realloc;	728	$self->realloc;
		729
		730	$self->emit (c_add => \@widgets);
		731
		732	map $_+0, @widgets
700	}	733	}
701		734
702	sub children {	735	sub children {
703	@{ $_[0]{children} }	736	@{ $_[0]{children} }
704	}	737	}
705		738
706	sub remove {	739	sub remove {
707	my ($self, $child) = @_;	740	my ($self, @widgets) = @_;
708		741
		742	$self->emit (c_remove => \@widgets);
		743
		744	for my $child (@widgets) {
709	delete $child->{parent};	745	delete $child->{parent};
710	$child->hide;	746	$child->hide;
711
712	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	747	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		748	}
713		749
714	$self->realloc;	750	$self->realloc;
715	}	751	}
716		752
717	sub clear {	753	sub clear {
718	my ($self) = @_;	754	my ($self) = @_;
719		755
720	my $children = delete $self->{children};	756	my $children = $self->{children};
721	$self->{children} = [];	757	$self->{children} = [];
722		758
723	for (@$children) {	759	for (@$children) {
724	delete $_->{parent};	760	delete $_->{parent};
725	$_->hide;	761	$_->hide;
…		…
745	}	781	}
746		782
747	sub _draw {	783	sub _draw {
748	my ($self) = @_;	784	my ($self) = @_;
749		785
750	$_->draw for @{$self->{children}};	786	$_->draw for $self->visible_children;
751	}	787	}
752		788
753	#############################################################################	789	#############################################################################
754		790
755	package CFClient::UI::Bin;	791	package CFPlus::UI::Bin;
756		792
757	our @ISA = CFClient::UI::Container::;	793	our @ISA = CFPlus::UI::Container::;
758		794
759	sub new {	795	sub new {
760	my ($class, %arg) = @_;	796	my ($class, %arg) = @_;
761		797
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	798	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		799
764	$class->SUPER::new (children => [$child], %arg)	800	$class->SUPER::new (children => [$child], %arg)
765	}	801	}
766		802
767	sub add {	803	sub add {
768	my ($self, $child) = @_;	804	my ($self, $child) = @_;
769		805
770	$self->SUPER::remove ($_) for @{ $self->{children} };	806	$self->clear;
771	$self->SUPER::add ($child);	807	$self->SUPER::add ($child);
772	}	808	}
773		809
774	sub remove {	810	sub remove {
775	my ($self, $widget) = @_;	811	my ($self, $widget) = @_;
776		812
777	$self->SUPER::remove ($widget);	813	$self->SUPER::remove ($widget);
778		814
779	$self->{children} = [new CFClient::UI::Empty]	815	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	816	unless @{$self->{children}};
781	}	817	}
782		818
783	sub child { $_[0]->{children}[0] }	819	sub child { $_[0]->{children}[0] }
784		820
…		…
796		832
797	#############################################################################	833	#############################################################################
798		834
799	# back-buffered drawing area	835	# back-buffered drawing area
800		836
801	package CFClient::UI::Window;	837	package CFPlus::UI::Window;
802		838
803	our @ISA = CFClient::UI::Bin::;	839	our @ISA = CFPlus::UI::Bin::;
804		840
805	use CFClient::OpenGL;	841	use CFPlus::OpenGL;
806		842
807	sub new {	843	sub new {
808	my ($class, %arg) = @_;	844	my ($class, %arg) = @_;
809		845
810	my $self = $class->SUPER::new (%arg);	846	my $self = $class->SUPER::new (%arg);
…		…
832	}	868	}
833		869
834	sub render_child {	870	sub render_child {
835	my ($self) = @_;	871	my ($self) = @_;
836		872
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	873	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	874	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	875	glClear GL_COLOR_BUFFER_BIT;
840		876
841	{	877	{
842	package CFClient::UI::Base;	878	package CFPlus::UI::Base;
843		879
844	($draw_x, $draw_y, $draw_w, $draw_h) =	880	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	881	(0, 0, $self->{w}, $self->{h});
		882
		883	$self->_render;
846	}	884	}
847
848	$self->_render;
849	};	885	};
850	}	886	}
851		887
852	sub _draw {	888	sub _draw {
853	my ($self) = @_;	889	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		890
857	my $tex = $self->{texture}	891	my $tex = $self->{texture}
858	or return;	892	or return;
859		893
860	glEnable GL_TEXTURE_2D;	894	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	895	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	896	glColor 0, 0, 0, 1;
863		897
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	898	$tex->draw_quad_alpha_premultiplied (0, 0);
865		899
866	glDisable GL_TEXTURE_2D;	900	glDisable GL_TEXTURE_2D;
867	}	901	}
868		902
869	#############################################################################	903	#############################################################################
870		904
871	package CFClient::UI::ViewPort;	905	package CFPlus::UI::ViewPort;
872		906
		907	use List::Util qw(min max);
		908
873	our @ISA = CFClient::UI::Window::;	909	our @ISA = CFPlus::UI::Window::;
874		910
875	sub new {	911	sub new {
876	my $class = shift;	912	my $class = shift;
877		913
878	$class->SUPER::new (	914	$class->SUPER::new (
…		…
885	sub size_request {	921	sub size_request {
886	my ($self) = @_;	922	my ($self) = @_;
887		923
888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	924	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889		925
890	$w = 10 if $self->{scroll_x};	926	$w = 1 if $self->{scroll_x};
891	$h = 10 if $self->{scroll_y};	927	$h = 1 if $self->{scroll_y};
892		928
893	($w, $h)	929	($w, $h)
894	}	930	}
895		931
896	sub invoke_size_allocate {	932	sub invoke_size_allocate {
…		…
908	}	944	}
909		945
910	sub set_offset {	946	sub set_offset {
911	my ($self, $x, $y) = @_;	947	my ($self, $x, $y) = @_;
912		948
		949	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		950	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		951
		952	if ($x != $self->{view_x} or $y != $self->{view_y}) {
913	$self->{view_x} = int $x;	953	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	954	$self->{view_y} = $y;
915		955
		956	$self->emit (changed => $x, $y);
916	$self->update;	957	$self->update;
		958	}
		959	}
		960
		961	sub set_center {
		962	my ($self, $x, $y) = @_;
		963
		964	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		965	}
		966
		967	sub make_visible {
		968	my ($self, $x, $y, $border) = @_;
		969
		970	if ( $x < $self->{view_x} + $self->{w} * $border
		971	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		972	|| $y < $self->{view_y} + $self->{h} * $border
		973	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		974	) {
		975	$self->set_center ($x, $y);
		976	}
917	}	977	}
918		978
919	# hmm, this does not work for topleft of $self... but we should not ask for that	979	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	980	sub coord2local {
921	my ($self, $x, $y) = @_;	981	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
937		997
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	998	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	999	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1000	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1001	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1002	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1003	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1004	}
945	}	1005	}
946		1006
947	sub _render {	1007	sub _render {
948	my ($self) = @_;	1008	my ($self) = @_;
949		1009
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1010	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1011	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1012
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1013	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1014
955	$self->SUPER::_render;	1015	$self->SUPER::_render;
956	}	1016	}
957		1017
958	#############################################################################	1018	#############################################################################
959		1019
960	package CFClient::UI::ScrolledWindow;	1020	package CFPlus::UI::ScrolledWindow;
961		1021
962	our @ISA = CFClient::UI::HBox::;	1022	our @ISA = CFPlus::UI::Table::;
963		1023
964	sub new {	1024	sub new {
965	my ($class, %arg) = @_;	1025	my ($class, %arg) = @_;
966		1026
967	my $child = delete $arg{child};	1027	my $child = delete $arg{child};
968		1028
969	my $self;	1029	my $self;
970		1030
971	my $slider = new CFClient::UI::Slider	1031	my $hslider = new CFPlus::UI::Slider
		1032	col => 0,
		1033	row => 1,
		1034	vertical => 0,
		1035	range => [0, 0, 1, 0.01], # HACK fix
		1036	on_changed => sub {
		1037	$self->{hpos} = $_[1];
		1038	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1039	},
		1040	;
		1041
		1042	my $vslider = new CFPlus::UI::Slider
		1043	col => 1,
		1044	row => 0,
972	vertical => 1,	1045	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1046	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1047	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1048	$self->{vpos} = $_[1];
		1049	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1050	},
977	;	1051	;
978		1052
979	$self = $class->SUPER::new (	1053	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1054	scroll_x => 0,
		1055	scroll_y => 1,
		1056	can_events => 1,
981	slider => $slider,	1057	hslider => $hslider,
		1058	vslider => $vslider,
		1059	col_expand => [1, 0],
		1060	row_expand => [1, 0],
982	%arg,	1061	%arg,
983	);	1062	);
984		1063
		1064	$self->{vp} = new CFPlus::UI::ViewPort
		1065	col => 0,
		1066	row => 0,
		1067	expand => 1,
		1068	scroll_x => $self->{scroll_x},
		1069	scroll_y => $self->{scroll_y},
		1070	on_changed => sub {
		1071	my ($vp, $x, $y) = @_;
		1072
		1073	$vp->{parent}{hslider}->set_value ($x);
		1074	$vp->{parent}{vslider}->set_value ($y);
		1075
		1076	0
		1077	},
		1078	on_size_allocate => sub {
		1079	my ($vp, $w, $h) = @_;
		1080	$vp->{parent}->update_slider;
		1081	0
		1082	},
		1083	;
		1084
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1085	$self->SUPER::add ($self->{vp});
		1086
986	$self->add ($child) if $child;	1087	$self->add ($child) if $child;
987		1088
988	$self	1089	$self
989	}	1090	}
990
991	#TODO# update range on size_allocate depending on child
992		1091
993	sub add {	1092	sub add {
994	my ($self, $widget) = @_;	1093	my ($self, $widget) = @_;
995		1094
996	$self->{vp}->add ($self->{child} = $widget);	1095	$self->{vp}->add ($self->{child} = $widget);
997	}	1096	}
998		1097
		1098	sub set_offset { shift->{vp}->set_offset (@_) }
		1099	sub set_center { shift->{vp}->set_center (@_) }
		1100	sub make_visible { shift->{vp}->make_visible (@_) }
		1101
999	sub update_slider {	1102	sub update_slider {
1000	my ($self) = @_;	1103	my ($self) = @_;
1001		1104
		1105	my $child = ($self->{vp} or return)->child;
		1106
		1107	if ($self->{scroll_x}) {
		1108	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1109	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003	}
1004		1110
1005	sub update {	1111	my $visible = $w1 > $w2;
		1112	if ($visible != $self->{hslider_visible}) {
		1113	$self->{hslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{hslider})
		1115	: $self->SUPER::remove ($self->{hslider});
		1116	}
		1117	}
		1118
		1119	if ($self->{scroll_y}) {
		1120	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1121	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1122
		1123	my $visible = $h1 > $h2;
		1124	if ($visible != $self->{vslider_visible}) {
		1125	$self->{vslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{vslider})
		1127	: $self->SUPER::remove ($self->{vslider});
		1128	}
		1129	}
		1130	}
		1131
		1132	sub start_dragging {
1006	my ($self) = @_;	1133	my ($self, $ev) = @_;
1007		1134
1008	$self->SUPER::update;	1135	$self->grab_focus;
1009		1136
1010	$self->update_slider;	1137	my $ox = $self->{vp}{view_x};
		1138	my $oy = $self->{vp}{view_y};
		1139
		1140	$self->{motion} = sub {
		1141	my ($ev, $x, $y) = @_;
		1142
		1143	$ox -= $ev->{xrel};
		1144	$oy -= $ev->{yrel};
		1145
		1146	$self->{vp}->set_offset ($ox, $oy);
		1147	};
		1148	}
		1149
		1150	sub invoke_mouse_wheel {
		1151	my ($self, $ev) = @_;
		1152
		1153	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1154	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1155
		1156	1
		1157	}
		1158
		1159	sub invoke_button_down {
		1160	my ($self, $ev, $x, $y) = @_;
		1161
		1162	if ($ev->{button} == 2) {
		1163	$self->start_dragging ($ev);
		1164	return 1;
		1165	}
		1166
		1167	0
		1168	}
		1169
		1170	sub invoke_button_up {
		1171	my ($self, $ev, $x, $y) = @_;
		1172
		1173	if (delete $self->{motion}) {
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_mouse_motion {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if ($self->{motion}) {
		1184	$self->{motion}->($ev, $x, $y);
		1185	return 1;
		1186	}
		1187
		1188	0
1011	}	1189	}
1012		1190
1013	sub invoke_size_allocate {	1191	sub invoke_size_allocate {
1014	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1015		1193
1016	$self->update_slider;	1194	$self->update_slider;
1017
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1195	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1196	}
1020		1197
1021	#############################################################################	1198	#############################################################################
1022		1199
1023	package CFClient::UI::Frame;	1200	package CFPlus::UI::Frame;
1024		1201
1025	our @ISA = CFClient::UI::Bin::;	1202	our @ISA = CFPlus::UI::Bin::;
1026		1203
1027	use CFClient::OpenGL;	1204	use CFPlus::OpenGL;
1028		1205
1029	sub new {	1206	sub new {
1030	my $class = shift;	1207	my $class = shift;
1031		1208
1032	$class->SUPER::new (	1209	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1235	$self->SUPER::_draw;
1059	}	1236	}
1060		1237
1061	#############################################################################	1238	#############################################################################
1062		1239
1063	package CFClient::UI::FancyFrame;	1240	package CFPlus::UI::FancyFrame;
1064		1241
1065	our @ISA = CFClient::UI::Bin::;	1242	our @ISA = CFPlus::UI::Bin::;
1066		1243
1067	use CFClient::OpenGL;	1244	use CFPlus::OpenGL;
		1245
		1246	sub new {
		1247	my ($class, %arg) = @_;
		1248
		1249	if ((exists $arg{label}) && !ref $arg{label}) {
		1250	$arg{label} = new CFPlus::UI::Label
		1251	align => 1,
		1252	valign => 0,
		1253	text => $arg{label},
		1254	fontsize => ($arg{border} || 0.8) * 0.75;
		1255	}
		1256
		1257	my $self = $class->SUPER::new (
		1258	# label => "",
		1259	fg => [0.6, 0.3, 0.1],
		1260	border => 0.8,
		1261	style => 'single',
		1262	%arg,
		1263	);
		1264
		1265	$self
		1266	}
		1267
		1268	sub add {
		1269	my ($self, @widgets) = @_;
		1270
		1271	$self->SUPER::add (@widgets);
		1272	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1273	}
		1274
		1275	sub border {
		1276	int $_[0]{border} * $::FONTSIZE
		1277	}
		1278
		1279	sub size_request {
		1280	my ($self) = @_;
		1281
		1282	($self->{label_w}, undef) = $self->{label}->size_request
		1283	if $self->{label};
		1284
		1285	my ($w, $h) = $self->SUPER::size_request;
		1286
		1287	(
		1288	$w + $self->border * 2,
		1289	$h + $self->border * 2,
		1290	)
		1291	}
		1292
		1293	sub invoke_size_allocate {
		1294	my ($self, $w, $h) = @_;
		1295
		1296	my $border = $self->border;
		1297
		1298	$w -= List::Util::max 0, $border * 2;
		1299	$h -= List::Util::max 0, $border * 2;
		1300
		1301	if (my $label = $self->{label}) {
		1302	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1303	$label->{h} = List::Util::min $h, $border;
		1304	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1305	}
		1306
		1307	$self->child->configure ($border, $border, $w, $h);
		1308
		1309	1
		1310	}
		1311
		1312	sub _draw {
		1313	my ($self) = @_;
		1314
		1315	my $child = $self->{children}[0];
		1316
		1317	my $border = $self->border;
		1318	my ($w, $h) = ($self->{w}, $self->{h});
		1319
		1320	$child->draw;
		1321
		1322	glColor @{$self->{fg}};
		1323	glBegin GL_LINE_STRIP;
		1324	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1325	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1326	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1327	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1328	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1330	glEnd;
		1331
		1332	if ($self->{label}) {
		1333	glTranslate $border * 2, 0;
		1334	$self->{label}->_draw;
		1335	}
		1336	}
		1337
		1338	#############################################################################
		1339
		1340	package CFPlus::UI::Toplevel;
		1341
		1342	our @ISA = CFPlus::UI::Bin::;
		1343
		1344	use CFPlus::OpenGL;
1068		1345
1069	my $bg =	1346	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1347	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1348	mipmap => 1, wrap => 1;
1072		1349
1073	my @border =	1350	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1351	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1352	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1353
		1354	my @icon =
		1355	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1356	qw(x1_move.png x1_resize.png);
1076		1357
1077	sub new {	1358	sub new {
1078	my ($class, %arg) = @_;	1359	my ($class, %arg) = @_;
1079		1360
1080	my $self = $class->SUPER::new (	1361	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1362	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1363	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1364	border => 0.6,
1084	can_events => 1,	1365	can_events => 1,
1085	min_w => 16,	1366	min_w => 64,
1086	min_h => 16,	1367	min_h => 32,
1087	%arg,	1368	%arg,
1088	);	1369	);
1089		1370
1090	$self->{title_widget} = new CFClient::UI::Label	1371	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1372	align => 0,
1092	valign => 1,	1373	valign => 1,
1093	text => $self->{title},	1374	text => $self->{title},
1094	fontsize => $self->{border},	1375	fontsize => $self->{border},
1095	if exists $self->{title};	1376	if exists $self->{title};
1096		1377
1097	if ($self->{has_close_button}) {	1378	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1379	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1380	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1381	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1382	on_activate => sub { $self->emit ("delete") };
1102		1383
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1384	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1385	}
1105		1386
1106	$self	1387	$self
1107	}	1388	}
1108		1389
1109	sub add {	1390	sub add {
1110	my ($self, @widgets) = @_;	1391	my ($self, @widgets) = @_;
1111		1392
1112	$self->SUPER::add (@widgets);	1393	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1394	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1395	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1396	}
1116		1397
1117	sub border {	1398	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1399	int $_[0]{border} * $::FONTSIZE
1119	}	1400	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1433	$self->child->configure ($border, $border, $w, $h);
1153		1434
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1435	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1436	if $self->{close_button};
1156		1437
		1438	1
		1439	}
		1440
		1441	sub invoke_delete {
		1442	my ($self) = @_;
		1443
		1444	$self->hide;
		1445
1157	1	1446	1
1158	}	1447	}
1159		1448
1160	sub invoke_button_down {	1449	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1450	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1508	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1509
1221	! ! $self->{motion}	1510	! ! $self->{motion}
1222	}	1511	}
1223		1512
		1513	sub invoke_visibility_change {
		1514	my ($self, $visible) = @_;
		1515
		1516	delete $self->{motion} unless $visible;
		1517
		1518	0
		1519	}
		1520
1224	sub _draw {	1521	sub _draw {
1225	my ($self) = @_;	1522	my ($self) = @_;
1226		1523
1227	my $child = $self->{children}[0];	1524	my $child = $self->{children}[0];
1228		1525
…		…
1233	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234		1531
1235	my $border = $self->border;	1532	my $border = $self->border;
1236		1533
1237	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1238	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1538	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1539
		1540	# move
		1541	my $w2 = ($w - $border) * .5;
		1542	my $h2 = ($h - $border) * .5;
		1543	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1545	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1546
		1547	# resize
		1548	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1550	unless $self->{has_close_button};
		1551	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242		1553
1243	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1245		1556
1246	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1265	if $self->{close_button};	1576	if $self->{close_button};
1266	}	1577	}
1267		1578
1268	#############################################################################	1579	#############################################################################
1269		1580
1270	package CFClient::UI::Table;	1581	package CFPlus::UI::Table;
1271		1582
1272	our @ISA = CFClient::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1273		1584
1274	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1275		1586
1276	use CFClient::OpenGL;	1587	use CFPlus::OpenGL;
1277		1588
1278	sub new {	1589	sub new {
1279	my $class = shift;	1590	my $class = shift;
1280		1591
1281	$class->SUPER::new (	1592	$class->SUPER::new (
1282	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1283	@_,	1595	@_,
1284	)	1596	)
1285	}	1597	}
1286		1598
1287	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}
1290
1291	sub add {	1599	sub add {
1292	my ($self, $x, $y, $child) = @_;	1600	my ($self, @widgets) = @_;
1293		1601
1294	$child->set_parent ($self);	1602	for my $child (@widgets) {
1295	$self->{children}[$y][$x] = $child;	1603	$child->{rowspan} ||= 1;
		1604	$child->{colspan} ||= 1;
		1605	}
1296		1606
1297	$self->realloc;	1607	$self->SUPER::add (@widgets);
1298	}	1608	}
1299		1609
1300	sub remove {	1610	sub add_at {
		1611	my $self = shift;
		1612
		1613	my @widgets;
		1614
		1615	while (@_) {
		1616	my ($col, $row, $child) = splice @_, 0, 3, ();
		1617
		1618	$child->{row} = $row;
		1619	$child->{col} = $col;
		1620
		1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1301	my ($self, $child) = @_;	1628	my ($self) = @_;
1302		1629
1303	# TODO: not yet implemented	1630	my (@w, @h);
1304	}
1305
1306	# TODO: move to container class maybe? send children a signal on removal?
1307	sub clear {
1308	my ($self) = @_;
1309		1631
1310	my @children = $self->children;	1632	my @children = $self->children;
1311	delete $self->{children};	1633
		1634	# first pass, columns
		1635	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1637
		1638	my $sw = sum @w[$c .. $c + $cs - 1];
		1639
		1640	if ($w > $sw) {
		1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1642	}
1312		1643	}
1313	for (@children) {
1314	delete $_->{parent};
1315	$_->hide;
1316	}
1317		1644
1318	$self->realloc;	1645	# second pass, rows
1319	}	1646	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1320
1321	sub get_wh {
1322	my ($self) = @_;
1323
1324	my (@w, @h);
1325
1326	for my $y (0 .. $#{$self->{children}}) {
1327	my $row = $self->{children}[$y]
1328	or next;
1329
1330	for my $x (0 .. $#$row) {
1331	my $widget = $row->[$x]
1332	or next;
1333	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334		1648
1335	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1336	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337	}	1653	}
1338	}	1654	}
1339		1655
1340	(\@w, \@h)	1656	(\@w, \@h)
1341	}	1657	}
…		…
1357	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1358		1674
1359	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1360	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1361		1677
1362	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1363	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1364	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1365	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1366		1682
1367	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1684
1371	CFClient::UI::harmonize $ws;	1685	CFPlus::UI::harmonize $ws;
		1686
		1687	my @row_expand = @{$self->{row_expand}};
		1688	@row_expand = (1) x @$ws unless @row_expand;
		1689	my $row_expand = (sum @row_expand) || 1;
		1690
		1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1692
1372	CFClient::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1373		1694
1374	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375		1697
1376	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1377	my $row = $self->{children}[$r]	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378	or next;
1379		1700
1380	my $x = 0;	1701	$widget->configure (
1381	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382		1704	);
1383	for my $c (0 .. $#$row) {	1705	}
1384	my $col_w = $ws->[$c];
1385		1706
1386	if (my $widget = $row->[$c]) {	1707	1
1387	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1388	}
1389		1709
1390	$x += $col_w;	1710	#############################################################################
		1711
		1712	package CFPlus::UI::Fixed;
		1713
		1714	use List::Util qw(min max);
		1715
		1716	our @ISA = CFPlus::UI::Container::;
		1717
		1718	sub _scale($$$) {
		1719	my ($rel, $val, $max) = @_;
		1720
		1721	$rel ? $val * $max : $val
		1722	}
		1723
		1724	sub size_request {
		1725	my ($self) = @_;
		1726
		1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1728
		1729	# determine overall size by querying abs widgets
		1730	for my $child ($self->visible_children) {
		1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
		1734
		1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1391	}	1737	}
		1738	}
1392		1739
1393	$y += $row_h;	1740	my $W = $x2 - $x1;
		1741	my $H = $y2 - $y1;
		1742
		1743	# now layout remaining widgets
		1744	for my $child ($self->visible_children) {
		1745	if ($child->{c_rel}) {
		1746	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1747	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1751	}
		1752	}
		1753
		1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	($W, $H)
		1758	}
		1759
		1760	sub invoke_size_allocate {
		1761	my ($self, $W, $H) = @_;
		1762
		1763	for my $child ($self->visible_children) {
		1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1766
		1767	$x += $child->{c_halign} * $child->{req_w};
		1768	$y += $child->{c_valign} * $child->{req_h};
		1769
		1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1394	}	1771	}
1395		1772
1396	1	1773	1
1397	}	1774	}
1398		1775
1399	sub find_widget {
1400	my ($self, $x, $y) = @_;
1401
1402	$x -= $self->{x};
1403	$y -= $self->{y};
1404
1405	my $res;
1406
1407	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1408	$res = $_->find_widget ($x, $y)
1409	and return $res;
1410	}
1411
1412	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1413	}
1414
1415	sub _draw {
1416	my ($self) = @_;
1417
1418	for (grep $_, @{$self->{children}}) {
1419	$_->draw for grep $_, @$_;
1420	}
1421	}
1422
1423	#############################################################################	1776	#############################################################################
1424		1777
1425	package CFClient::UI::Box;	1778	package CFPlus::UI::Box;
1426		1779
1427	our @ISA = CFClient::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1428		1781
1429	sub size_request {	1782	sub size_request {
1430	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1431		1786
1432	$self->{vertical}	1787	$self->{vertical}
1433	? (	1788	? (
1434	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1435	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1436	)	1791	)
1437	: (	1792	: (
1438	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1439	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1440	)	1795	)
1441	}	1796	}
1442		1797
1443	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1444	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1820	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1821	for 0 .. $#children;
1467	}	1822	}
1468	}	1823	}
1469		1824
1470	CFClient::UI::harmonize \@req;	1825	CFPlus::UI::harmonize \@req;
1471		1826
1472	my $pos = 0;	1827	my $pos = 0;
1473	for (0 .. $#children) {	1828	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1829	my $alloc = $req[$_];
1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1830	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1480	1	1835	1
1481	}	1836	}
1482		1837
1483	#############################################################################	1838	#############################################################################
1484		1839
1485	package CFClient::UI::HBox;	1840	package CFPlus::UI::HBox;
1486		1841
1487	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1488		1843
1489	sub new {	1844	sub new {
1490	my $class = shift;	1845	my $class = shift;
1491		1846
1492	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1495	)	1850	)
1496	}	1851	}
1497		1852
1498	#############################################################################	1853	#############################################################################
1499		1854
1500	package CFClient::UI::VBox;	1855	package CFPlus::UI::VBox;
1501		1856
1502	our @ISA = CFClient::UI::Box::;	1857	our @ISA = CFPlus::UI::Box::;
1503		1858
1504	sub new {	1859	sub new {
1505	my $class = shift;	1860	my $class = shift;
1506		1861
1507	$class->SUPER::new (	1862	$class->SUPER::new (
…		…
1510	)	1865	)
1511	}	1866	}
1512		1867
1513	#############################################################################	1868	#############################################################################
1514		1869
1515	package CFClient::UI::Label;	1870	package CFPlus::UI::Label;
1516		1871
1517	our @ISA = CFClient::UI::DrawBG::;	1872	our @ISA = CFPlus::UI::DrawBG::;
1518		1873
1519	use CFClient::OpenGL;	1874	use CFPlus::OpenGL;
1520		1875
1521	sub new {	1876	sub new {
1522	my ($class, %arg) = @_;	1877	my ($class, %arg) = @_;
1523		1878
1524	my $self = $class->SUPER::new (	1879	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1882	#active_bg => none
1528	#font => default_font	1883	#font => default_font
1529	#text => initial text	1884	#text => initial text
1530	#markup => initial narkup	1885	#markup => initial narkup
1531	#max_w => maximum pixel width	1886	#max_w => maximum pixel width
		1887	#style => 0, # render flags
1532	ellipsise => 3, # end	1888	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1889	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1890	fontsize => 1,
1535	align => -1,	1891	align => -1,
1536	valign => -1,	1892	valign => -1,
1537	padding_x => 2,	1893	padding_x => 2,
1538	padding_y => 2,	1894	padding_y => 2,
1539	can_events => 0,	1895	can_events => 0,
1540	%arg	1896	%arg
1541	);	1897	);
1542		1898
1543	if (exists $self->{template}) {	1899	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1900	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1901	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1902	$self->{template} = $layout;
1547	}	1903	}
1548		1904
1549	if (exists $self->{markup}) {	1905	if (exists $self->{markup}) {
…		…
1553	}	1909	}
1554		1910
1555	$self	1911	$self
1556	}	1912	}
1557		1913
1558	sub escape($) {
1559	local $_ = $_[0];
1560
1561	s/&/&amp;/g;
1562	s/>/&gt;/g;
1563	s/</&lt;/g;
1564
1565	$_
1566	}
1567
1568	sub update {	1914	sub update {
1569	my ($self) = @_;	1915	my ($self) = @_;
1570		1916
1571	delete $self->{texture};	1917	delete $self->{texture};
1572	$self->SUPER::update;	1918	$self->SUPER::update;
…		…
1583	my ($self, $text) = @_;	1929	my ($self, $text) = @_;
1584		1930
1585	return if $self->{text} eq "T$text";	1931	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1932	$self->{text} = "T$text";
1587		1933
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1934	$self->{layout}->set_text ($text);
1590		1935
1591	delete $self->{size_req};	1936	delete $self->{size_req};
1592	$self->realloc;	1937	$self->realloc;
1593	$self->update;	1938	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1944	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1945	$self->{text} = "M$markup";
1601		1946
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1947	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1948
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1949	$self->{layout}->set_markup ($markup);
1606		1950
1607	delete $self->{size_req};	1951	delete $self->{size_req};
1608	$self->realloc;	1952	$self->realloc;
1609	$self->update;	1953	$self->update;
…		…
1621		1965
1622	my ($w, $h) = $self->{layout}->size;	1966	my ($w, $h) = $self->{layout}->size;
1623		1967
1624	if (exists $self->{template}) {	1968	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1969	$self->{template}->set_font ($self->{font}) if $self->{font};
		1970	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1971	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1972
1628	my ($w2, $h2) = $self->{template}->size;	1973	my ($w2, $h2) = $self->{template}->size;
1629		1974
1630	$w = List::Util::max $w, $w2;	1975	$w = List::Util::max $w, $w2;
…		…
1664		2009
1665	sub reconfigure {	2010	sub reconfigure {
1666	my ($self) = @_;	2011	my ($self) = @_;
1667		2012
1668	delete $self->{size_req};	2013	delete $self->{size_req};
		2014	delete $self->{texture};
1669		2015
1670	$self->SUPER::reconfigure;	2016	$self->SUPER::reconfigure;
1671	}	2017	}
1672		2018
1673	sub _draw {	2019	sub _draw {
1674	my ($self) = @_;	2020	my ($self) = @_;
1675		2021
1676	$self->SUPER::_draw; # draw background, if applicable	2022	$self->SUPER::_draw; # draw background, if applicable
1677		2023
1678	my $tex = $self->{texture} ||= do {	2024	my $size = $self->{texture} ||= do {
1679	$self->{layout}->set_foreground (@{$self->{fg}});	2025	$self->{layout}->set_foreground (@{$self->{fg}});
1680	$self->{layout}->set_font ($self->{font}) if $self->{font};	2026	$self->{layout}->set_font ($self->{font}) if $self->{font};
1681	$self->{layout}->set_width ($self->{w});	2027	$self->{layout}->set_width ($self->{w});
1682	$self->{layout}->set_ellipsise ($self->{ellipsise});	2028	$self->{layout}->set_ellipsise ($self->{ellipsise});
1683	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2029	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2030	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685		2031
1686	new_from_layout CFClient::Texture $self->{layout}	2032	[$self->{layout}->size]
1687	};	2033	};
1688		2034
1689	unless (exists $self->{ox}) {	2035	unless (exists $self->{ox}) {
1690	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2036	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2037	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692	: ($self->{w} - $tex->{w}) * 0.5);	2038	: ($self->{w} - $size->[0]) * 0.5);
1693		2039
1694	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2040	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2041	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696	: ($self->{h} - $tex->{h}) * 0.5);	2042	: ($self->{h} - $size->[1]) * 0.5);
1697	};	2043	};
1698		2044
1699	glEnable GL_TEXTURE_2D;	2045	# unless ($self->{list}) {
1700		2046	# $self->{list} = CFPlus::OpenGL::glGenList;
1701	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2047	# CFPlus::OpenGL::glNewList $self->{list};
1702	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2048	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1703		2049	# CFPlus::OpenGL::glEndList;
1704	if ($tex->{format} == GL_ALPHA) {
1705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706	glColor @{$self->{fg}};
1707	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708	} else {
1709	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711	}	2050	# }
		2051	#
		2052	# CFPlus::OpenGL::glCallList $self->{list};
1712		2053
1713	glDisable GL_TEXTURE_2D;	2054	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1714	}	2055	}
		2056
		2057	#sub destroy {
		2058	# my ($self) = @_;
		2059	#
		2060	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2061	#
		2062	# $self->SUPER::destroy;
		2063	#}
1715		2064
1716	#############################################################################	2065	#############################################################################
1717		2066
1718	package CFClient::UI::EntryBase;	2067	package CFPlus::UI::EntryBase;
1719		2068
1720	our @ISA = CFClient::UI::Label::;	2069	our @ISA = CFPlus::UI::Label::;
1721		2070
1722	use CFClient::OpenGL;	2071	use CFPlus::OpenGL;
1723		2072
1724	sub new {	2073	sub new {
1725	my $class = shift;	2074	my $class = shift;
1726		2075
1727	$class->SUPER::new (	2076	$class->SUPER::new (
1728	fg => [1, 1, 1],	2077	fg => [1, 1, 1],
1729	bg => [0, 0, 0, 0.2],	2078	bg => [0, 0, 0, 0.2],
1730	active_bg => [1, 1, 1, 0.5],	2079	active_bg => [0, 0, 1, .2],
1731	active_fg => [0, 0, 0],	2080	active_fg => [1, 1, 1],
		2081	active_outline => [1, 1, 0],
1732	can_hover => 1,	2082	can_hover => 1,
1733	can_focus => 1,	2083	can_focus => 1,
1734	valign => 0,	2084	valign => 0,
1735	can_events => 1,	2085	can_events => 1,
		2086	ellipsise => 0,
1736	#text => ...	2087	#text => ...
1737	#hidden => "*",	2088	#hidden => "*",
1738	@_	2089	@_
1739	)	2090	)
1740	}	2091	}
…		…
1785	my $sym = $ev->{sym};	2136	my $sym = $ev->{sym};
1786	my $uni = $ev->{unicode};	2137	my $uni = $ev->{unicode};
1787		2138
1788	my $text = $self->get_text;	2139	my $text = $self->get_text;
1789		2140
		2141	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2142
1790	if ($uni == 8) {	2143	if ($uni == 8) {
1791	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2144	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792	} elsif ($uni == 127) {	2145	} elsif ($uni == 127) {
1793	substr $text, $self->{cursor}, 1, "";	2146	substr $text, $self->{cursor}, 1, "";
1794	} elsif ($sym == CFClient::SDLK_LEFT) {	2147	} elsif ($sym == CFPlus::SDLK_LEFT) {
1795	--$self->{cursor} if $self->{cursor};	2148	--$self->{cursor} if $self->{cursor};
1796	} elsif ($sym == CFClient::SDLK_RIGHT) {	2149	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1797	++$self->{cursor} if $self->{cursor} < length $self->{text};	2150	++$self->{cursor} if $self->{cursor} < length $self->{text};
1798	} elsif ($sym == CFClient::SDLK_HOME) {	2151	} elsif ($sym == CFPlus::SDLK_HOME) {
		2152	# what a hack
		2153	$self->{cursor} =
		2154	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2155	? length $1
		2156	: 0;
		2157	} elsif ($sym == CFPlus::SDLK_END) {
		2158	# uh, again
		2159	$self->{cursor} =
		2160	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2161	? $self->{cursor} + length $1
		2162	: length $self->{text};
		2163	} elsif ($uni == 21) { # ctrl-u
		2164	$text = "";
1799	$self->{cursor} = 0;	2165	$self->{cursor} = 0;
1800	} elsif ($sym == CFClient::SDLK_END) {
1801	$self->{cursor} = length $text;
1802	} elsif ($uni == 27) {	2166	} elsif ($uni == 27) {
1803	$self->emit ('escape');	2167	$self->emit ('escape');
1804	} elsif ($uni) {	2168	} elsif ($uni == 0x0d) {
		2169	substr $text, $self->{cursor}++, 0, "\012";
		2170	} elsif ($uni >= 0x20) {
1805	substr $text, $self->{cursor}++, 0, chr $uni;	2171	substr $text, $self->{cursor}++, 0, chr $uni;
1806	} else {	2172	} else {
1807	return 0;	2173	return 0;
1808	}	2174	}
1809		2175
1810	$self->_set_text ($text);	2176	$self->_set_text ($text);
1811		2177
1812	$self->realloc;	2178	$self->realloc;
		2179	$self->update;
1813		2180
1814	1	2181	1
1815	}	2182	}
1816		2183
1817	sub invoke_focus_in {	2184	sub invoke_focus_in {
…		…
1829		2196
1830	my $idx = $self->{layout}->xy_to_index ($x, $y);	2197	my $idx = $self->{layout}->xy_to_index ($x, $y);
1831		2198
1832	# byte-index to char-index	2199	# byte-index to char-index
1833	my $text = $self->{text};	2200	my $text = $self->{text};
1834	utf8::encode $text;	2201	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835	$self->{cursor} = length substr $text, 0, $idx;	2202	$self->{cursor} = length $text;
1836		2203
1837	$self->_set_text ($self->{text});	2204	$self->_set_text ($self->{text});
1838	$self->update;	2205	$self->update;
1839		2206
1840	1	2207	1
…		…
1876		2243
1877	unless (exists $self->{cur_h}) {	2244	unless (exists $self->{cur_h}) {
1878	my $text = substr $self->{text}, 0, $self->{cursor};	2245	my $text = substr $self->{text}, 0, $self->{cursor};
1879	utf8::encode $text;	2246	utf8::encode $text;
1880		2247
1881	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2248	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1882	}	2249	}
1883		2250
1884	glColor @{$self->{fg}};	2251	glColor_premultiply @{$self->{active_fg}};
1885	glBegin GL_LINES;	2252	glBegin GL_LINES;
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2253	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1887	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2254	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1888	glEnd;	2255	glEnd;
1889	}
1890	}
1891		2256
		2257	glLineWidth 3;
		2258	glColor @{$self->{active_outline}};
		2259	glTranslate -.375, -.375;
		2260	glBegin GL_LINE_LOOP;
		2261	glVertex 0, 0;
		2262	glVertex $self->{w}, 0;
		2263	glVertex $self->{w}, $self->{h};
		2264	glVertex 0, $self->{h};
		2265	glEnd;
		2266	glLineWidth 1;
		2267	}
		2268	}
		2269
		2270	#############################################################################
		2271
1892	package CFClient::UI::Entry;	2272	package CFPlus::UI::Entry;
1893		2273
1894	our @ISA = CFClient::UI::EntryBase::;	2274	our @ISA = CFPlus::UI::EntryBase::;
1895		2275
1896	use CFClient::OpenGL;	2276	use CFPlus::OpenGL;
1897		2277
1898	sub invoke_key_down {	2278	sub invoke_key_down {
1899	my ($self, $ev) = @_;	2279	my ($self, $ev) = @_;
1900		2280
1901	my $sym = $ev->{sym};	2281	my $sym = $ev->{sym};
1902		2282
1903	if ($sym == 13) {	2283	if ($ev->{uni} == 0x0d || $sym == 13) {
1904	unshift @{$self->{history}},	2284	unshift @{$self->{history}},
1905	my $txt = $self->get_text;	2285	my $txt = $self->get_text;
1906		2286
1907	$self->{history_pointer} = -1;	2287	$self->{history_pointer} = -1;
1908	$self->{history_saveback} = '';	2288	$self->{history_saveback} = '';
1909	$self->emit (activate => $txt);	2289	$self->emit (activate => $txt);
1910	$self->update;	2290	$self->update;
1911		2291
1912	} elsif ($sym == CFClient::SDLK_UP) {	2292	} elsif ($sym == CFPlus::SDLK_UP) {
1913	if ($self->{history_pointer} < 0) {	2293	if ($self->{history_pointer} < 0) {
1914	$self->{history_saveback} = $self->get_text;	2294	$self->{history_saveback} = $self->get_text;
1915	}	2295	}
1916	if (@{$self->{history} || []} > 0) {	2296	if (@{$self->{history} || []} > 0) {
1917	$self->{history_pointer}++;	2297	$self->{history_pointer}++;
…		…
1919	$self->{history_pointer} = @{$self->{history} || []} - 1;	2299	$self->{history_pointer} = @{$self->{history} || []} - 1;
1920	}	2300	}
1921	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2301	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1922	}	2302	}
1923		2303
1924	} elsif ($sym == CFClient::SDLK_DOWN) {	2304	} elsif ($sym == CFPlus::SDLK_DOWN) {
1925	$self->{history_pointer}--;	2305	$self->{history_pointer}--;
1926	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2306	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927		2307
1928	if ($self->{history_pointer} >= 0) {	2308	if ($self->{history_pointer} >= 0) {
1929	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2309	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1938	1	2318	1
1939	}	2319	}
1940		2320
1941	#############################################################################	2321	#############################################################################
1942		2322
		2323	package CFPlus::UI::TextEdit;
		2324
		2325	our @ISA = CFPlus::UI::EntryBase::;
		2326
		2327	use CFPlus::OpenGL;
		2328
		2329	sub move_cursor_ver {
		2330	my ($self, $dy) = @_;
		2331
		2332	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2333
		2334	$y += $dy;
		2335
		2336	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2337	$self->{cursor} = $index;
		2338	delete $self->{cur_h};
		2339	$self->update;
		2340	return;
		2341	}
		2342	}
		2343
		2344	sub invoke_key_down {
		2345	my ($self, $ev) = @_;
		2346
		2347	my $sym = $ev->{sym};
		2348
		2349	if ($sym == CFPlus::SDLK_UP) {
		2350	$self->move_cursor_ver (-1);
		2351	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2352	$self->move_cursor_ver (+1);
		2353	} else {
		2354	return $self->SUPER::invoke_key_down ($ev)
		2355	}
		2356
		2357	1
		2358	}
		2359
		2360	#############################################################################
		2361
1943	package CFClient::UI::Button;	2362	package CFPlus::UI::Button;
1944		2363
1945	our @ISA = CFClient::UI::Label::;	2364	our @ISA = CFPlus::UI::Label::;
1946		2365
1947	use CFClient::OpenGL;	2366	use CFPlus::OpenGL;
1948		2367
1949	my @tex =	2368	my @tex =
1950	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2369	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951	qw(b1_button_active.png);	2370	qw(b1_button_inactive.png b1_button_active.png);
1952		2371
1953	sub new {	2372	sub new {
1954	my $class = shift;	2373	my $class = shift;
1955		2374
1956	$class->SUPER::new (	2375	$class->SUPER::new (
1957	padding_x => 4,	2376	padding_x => 4,
1958	padding_y => 4,	2377	padding_y => 4,
1959	fg => [1, 1, 1],	2378	fg => [1.0, 1.0, 1.0],
1960	active_fg => [0, 0, 1],	2379	active_fg => [0.8, 0.8, 0.8],
1961	can_hover => 1,	2380	can_hover => 1,
1962	align => 0,	2381	align => 0,
1963	valign => 0,	2382	valign => 0,
1964	can_events => 1,	2383	can_events => 1,
1965	@_	2384	@_
…		…
1983		2402
1984	glEnable GL_TEXTURE_2D;	2403	glEnable GL_TEXTURE_2D;
1985	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2404	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986	glColor 0, 0, 0, 1;	2405	glColor 0, 0, 0, 1;
1987		2406
		2407	my $tex = $tex[$GRAB == $self];
1988	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2408	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1989		2409
1990	glDisable GL_TEXTURE_2D;	2410	glDisable GL_TEXTURE_2D;
1991		2411
1992	$self->SUPER::_draw;	2412	$self->SUPER::_draw;
1993	}	2413	}
1994		2414
1995	#############################################################################	2415	#############################################################################
1996		2416
		2417	package CFPlus::UI::CheckBox;
		2418
		2419	our @ISA = CFPlus::UI::DrawBG::;
		2420
		2421	my @tex =
		2422	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2423	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2424
		2425	use CFPlus::OpenGL;
		2426
		2427	sub new {
		2428	my $class = shift;
		2429
		2430	$class->SUPER::new (
		2431	padding_x => 2,
		2432	padding_y => 2,
		2433	fg => [1, 1, 1],
		2434	active_fg => [1, 1, 0],
		2435	bg => [0, 0, 0, 0.2],
		2436	active_bg => [1, 1, 1, 0.5],
		2437	state => 0,
		2438	can_hover => 1,
		2439	@_
		2440	)
		2441	}
		2442
		2443	sub size_request {
		2444	my ($self) = @_;
		2445
		2446	(6) x 2
		2447	}
		2448
		2449	sub toggle {
		2450	my ($self) = @_;
		2451
		2452	$self->{state} = !$self->{state};
		2453	$self->emit (changed => $self->{state});
		2454	$self->update;
		2455	}
		2456
		2457	sub invoke_button_down {
		2458	my ($self, $ev, $x, $y) = @_;
		2459
		2460	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2461	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2462	$self->toggle;
		2463	} else {
		2464	return 0
		2465	}
		2466
		2467	1
		2468	}
		2469
		2470	sub _draw {
		2471	my ($self) = @_;
		2472
		2473	$self->SUPER::_draw;
		2474
		2475	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2476
		2477	my ($w, $h) = @$self{qw(w h)};
		2478
		2479	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2480
		2481	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2482
		2483	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2484
		2485	glEnable GL_TEXTURE_2D;
		2486	$tex->draw_quad_alpha (0, 0, $s, $s);
		2487	glDisable GL_TEXTURE_2D;
		2488	}
		2489
		2490	#############################################################################
		2491
		2492	package CFPlus::UI::Image;
		2493
		2494	our @ISA = CFPlus::UI::Base::;
		2495
		2496	use CFPlus::OpenGL;
		2497
		2498	our %texture_cache;
		2499
		2500	sub new {
		2501	my $class = shift;
		2502
		2503	my $self = $class->SUPER::new (
		2504	can_events => 0,
		2505	@_,
		2506	);
		2507
		2508	$self->{path} || $self->{tex}
		2509	or Carp::croak "'path' or 'tex' attributes required";
		2510
		2511	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2512	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2513
		2514	CFPlus::weaken $texture_cache{$self->{path}};
		2515
		2516	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2517
		2518	$self
		2519	}
		2520
		2521	sub STORABLE_freeze {
		2522	my ($self, $cloning) = @_;
		2523
		2524	$self->{path}
		2525	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2526
		2527	$self->{path}
		2528	}
		2529
		2530	sub STORABLE_attach {
		2531	my ($self, $cloning, $path) = @_;
		2532
		2533	$self->new (path => $path)
		2534	}
		2535
		2536	sub size_request {
		2537	my ($self) = @_;
		2538
		2539	($self->{tex}{w}, $self->{tex}{h})
		2540	}
		2541
		2542	sub _draw {
		2543	my ($self) = @_;
		2544
		2545	my $tex = $self->{tex};
		2546
		2547	my ($w, $h) = ($self->{w}, $self->{h});
		2548
		2549	if ($self->{rot90}) {
		2550	glRotate 90, 0, 0, 1;
		2551	glTranslate 0, -$self->{w}, 0;
		2552
		2553	($w, $h) = ($h, $w);
		2554	}
		2555
		2556	glEnable GL_TEXTURE_2D;
		2557	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2558
		2559	$tex->draw_quad (0, 0, $w, $h);
		2560
		2561	glDisable GL_TEXTURE_2D;
		2562	}
		2563
		2564	#############################################################################
		2565
1997	package CFClient::UI::ImageButton;	2566	package CFPlus::UI::ImageButton;
1998		2567
1999	our @ISA = CFClient::UI::Image::;	2568	our @ISA = CFPlus::UI::Image::;
2000		2569
2001	use CFClient::OpenGL;	2570	use CFPlus::OpenGL;
2002		2571
2003	my %textures;	2572	my %textures;
2004		2573
2005	sub new {	2574	sub new {
2006	my $class = shift;	2575	my $class = shift;
…		…
2028	1	2597	1
2029	}	2598	}
2030		2599
2031	#############################################################################	2600	#############################################################################
2032		2601
2033	package CFClient::UI::CheckBox;
2034
2035	our @ISA = CFClient::UI::DrawBG::;
2036
2037	my @tex =
2038	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2039	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040
2041	use CFClient::OpenGL;
2042
2043	sub new {
2044	my $class = shift;
2045
2046	$class->SUPER::new (
2047	padding_x => 2,
2048	padding_y => 2,
2049	fg => [1, 1, 1],
2050	active_fg => [1, 1, 0],
2051	bg => [0, 0, 0, 0.2],
2052	active_bg => [1, 1, 1, 0.5],
2053	state => 0,
2054	can_hover => 1,
2055	@_
2056	)
2057	}
2058
2059	sub size_request {
2060	my ($self) = @_;
2061
2062	(6) x 2
2063	}
2064
2065	sub invoke_button_down {
2066	my ($self, $ev, $x, $y) = @_;
2067
2068	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070	$self->{state} = !$self->{state};
2071	$self->emit (changed => $self->{state});
2072	} else {
2073	return 0
2074	}
2075
2076	1
2077	}
2078
2079	sub _draw {
2080	my ($self) = @_;
2081
2082	$self->SUPER::_draw;
2083
2084	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2085
2086	my ($w, $h) = @$self{qw(w h)};
2087
2088	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2089
2090	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2091
2092	my $tex = $self->{state} ? $tex[1] : $tex[0];
2093
2094	glEnable GL_TEXTURE_2D;
2095	$tex->draw_quad_alpha (0, 0, $s, $s);
2096	glDisable GL_TEXTURE_2D;
2097	}
2098
2099	#############################################################################
2100
2101	package CFClient::UI::Image;	2602	package CFPlus::UI::VGauge;
2102		2603
2103	our @ISA = CFClient::UI::Base::;	2604	our @ISA = CFPlus::UI::Base::;
2104
2105	use CFClient::OpenGL;
2106
2107	our %texture_cache;
2108
2109	sub new {
2110	my $class = shift;
2111
2112	my $self = $class->SUPER::new (
2113	can_events => 0,
2114	@_,
2115	);
2116
2117	$self->{path}
2118	or Carp::croak "required attribute 'path' not set";
2119
2120	$self->{tex} = $texture_cache{$self->{path}} ||=
2121	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122
2123	Scalar::Util::weaken $texture_cache{$self->{path}};
2124
2125	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2126
2127	$self
2128	}
2129
2130	sub size_request {
2131	my ($self) = @_;
2132
2133	($self->{tex}{w}, $self->{tex}{h})
2134	}
2135
2136	sub _draw {
2137	my ($self) = @_;
2138
2139	my $tex = $self->{tex};
2140
2141	my ($w, $h) = ($self->{w}, $self->{h});
2142
2143	if ($self->{rot90}) {
2144	glRotate 90, 0, 0, 1;
2145	glTranslate 0, -$self->{w}, 0;
2146
2147	($w, $h) = ($h, $w);
2148	}
2149
2150	glEnable GL_TEXTURE_2D;
2151	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152
2153	$tex->draw_quad_alpha (0, 0, $w, $h);
2154
2155	glDisable GL_TEXTURE_2D;
2156	}
2157
2158	#############################################################################
2159
2160	package CFClient::UI::VGauge;
2161
2162	our @ISA = CFClient::UI::Base::;
2163		2605
2164	use List::Util qw(min max);	2606	use List::Util qw(min max);
2165		2607
2166	use CFClient::OpenGL;	2608	use CFPlus::OpenGL;
2167		2609
2168	my %tex = (	2610	my %tex = (
2169	food => [	2611	food => [
2170	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2613	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172	],	2614	],
2173	grace => [	2615	grace => [
2174	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2617	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2176	],	2618	],
2177	hp => [	2619	hp => [
2178	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2621	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180	],	2622	],
2181	mana => [	2623	mana => [
2182	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2624	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2625	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2184	],	2626	],
2185	);	2627	);
2186		2628
2187	# eg. VGauge->new (gauge => 'food'), default gauge: food	2629	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2247	my $ycut1 = max 0, min 1, $ycut;	2689	my $ycut1 = max 0, min 1, $ycut;
2248	my $ycut2 = max 0, min 1, $ycut - 1;	2690	my $ycut2 = max 0, min 1, $ycut - 1;
2249		2691
2250	my $h1 = $self->{h} * (1 - $ycut1);	2692	my $h1 = $self->{h} * (1 - $ycut1);
2251	my $h2 = $self->{h} * (1 - $ycut2);	2693	my $h2 = $self->{h} * (1 - $ycut2);
		2694	my $h3 = $self->{h};
		2695
		2696	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2252		2697
2253	glEnable GL_BLEND;	2698	glEnable GL_BLEND;
2254	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2699	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2700	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256	glEnable GL_TEXTURE_2D;	2701	glEnable GL_TEXTURE_2D;
…		…
2275		2720
2276	if ($t3) {	2721	if ($t3) {
2277	glBindTexture GL_TEXTURE_2D, $t3->{name};	2722	glBindTexture GL_TEXTURE_2D, $t3->{name};
2278	glBegin GL_QUADS;	2723	glBegin GL_QUADS;
2279	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2724	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2725	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2726	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2727	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283	glEnd;	2728	glEnd;
2284	}	2729	}
2285		2730
2286	glDisable GL_BLEND;	2731	glDisable GL_BLEND;
2287	glDisable GL_TEXTURE_2D;	2732	glDisable GL_TEXTURE_2D;
2288	}	2733	}
2289		2734
2290	#############################################################################	2735	#############################################################################
2291		2736
2292	package CFClient::UI::Gauge;	2737	package CFPlus::UI::Gauge;
2293		2738
2294	our @ISA = CFClient::UI::VBox::;	2739	our @ISA = CFPlus::UI::VBox::;
2295		2740
2296	sub new {	2741	sub new {
2297	my ($class, %arg) = @_;	2742	my ($class, %arg) = @_;
2298		2743
2299	my $self = $class->SUPER::new (	2744	my $self = $class->SUPER::new (
…		…
2301	can_hover => 1,	2746	can_hover => 1,
2302	can_events => 1,	2747	can_events => 1,
2303	%arg,	2748	%arg,
2304	);	2749	);
2305		2750
2306	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2751	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2307	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2752	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2308	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2753	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2309		2754
2310	$self	2755	$self
2311	}	2756	}
2312		2757
2313	sub set_fontsize {	2758	sub set_fontsize {
…		…
2334	$self->{value}->set_text ($val);	2779	$self->{value}->set_text ($val);
2335	}	2780	}
2336		2781
2337	#############################################################################	2782	#############################################################################
2338		2783
2339	package CFClient::UI::Slider;	2784	package CFPlus::UI::Slider;
2340		2785
2341	use strict;	2786	use strict;
2342		2787
2343	use CFClient::OpenGL;	2788	use CFPlus::OpenGL;
2344		2789
2345	our @ISA = CFClient::UI::DrawBG::;	2790	our @ISA = CFPlus::UI::DrawBG::;
2346		2791
2347	my @tex =	2792	my @tex =
2348	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2793	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2349	qw(s1_slider.png s1_slider_bg.png);	2794	qw(s1_slider.png s1_slider_bg.png);
2350		2795
2351	sub new {	2796	sub new {
2352	my $class = shift;	2797	my $class = shift;
2353		2798
…		…
2421		2866
2422	$self->SUPER::invoke_button_down ($ev, $x, $y);	2867	$self->SUPER::invoke_button_down ($ev, $x, $y);
2423		2868
2424	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2869	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2425		2870
2426	$self->invoke_mouse_motion ($ev, $x, $y)	2871	$self->invoke_mouse_motion ($ev, $x, $y);
		2872
		2873	1
2427	}	2874	}
2428		2875
2429	sub invoke_mouse_motion {	2876	sub invoke_mouse_motion {
2430	my ($self, $ev, $x, $y) = @_;	2877	my ($self, $ev, $x, $y) = @_;
2431		2878
…		…
2438		2885
2439	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2886	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2440	} else {	2887	} else {
2441	return 0;	2888	return 0;
2442	}	2889	}
		2890
		2891	1
		2892	}
		2893
		2894	sub invoke_mouse_wheel {
		2895	my ($self, $ev) = @_;
		2896
		2897	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2898
		2899	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2900
		2901	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2443		2902
2444	1	2903	1
2445	}	2904	}
2446		2905
2447	sub update {	2906	sub update {
…		…
2498	glDisable GL_TEXTURE_2D;	2957	glDisable GL_TEXTURE_2D;
2499	}	2958	}
2500		2959
2501	#############################################################################	2960	#############################################################################
2502		2961
2503	package CFClient::UI::ValSlider;	2962	package CFPlus::UI::ValSlider;
2504		2963
2505	our @ISA = CFClient::UI::HBox::;	2964	our @ISA = CFPlus::UI::HBox::;
2506		2965
2507	sub new {	2966	sub new {
2508	my ($class, %arg) = @_;	2967	my ($class, %arg) = @_;
2509		2968
2510	my $range = delete $arg{range};	2969	my $range = delete $arg{range};
2511		2970
2512	my $self = $class->SUPER::new (	2971	my $self = $class->SUPER::new (
2513	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2972	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2514	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2973	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2515	to_value => sub { shift },	2974	to_value => sub { shift },
2516	from_value => sub { shift },	2975	from_value => sub { shift },
2517	%arg,	2976	%arg,
2518	);	2977	);
2519		2978
…		…
2539	sub set_range { shift->{slider}->set_range (@_) }	2998	sub set_range { shift->{slider}->set_range (@_) }
2540	sub set_value { shift->{slider}->set_value (@_) }	2999	sub set_value { shift->{slider}->set_value (@_) }
2541		3000
2542	#############################################################################	3001	#############################################################################
2543		3002
2544	package CFClient::UI::TextScroller;	3003	package CFPlus::UI::TextScroller;
2545		3004
2546	our @ISA = CFClient::UI::HBox::;	3005	our @ISA = CFPlus::UI::HBox::;
2547		3006
2548	use CFClient::OpenGL;	3007	use CFPlus::OpenGL;
2549		3008
2550	sub new {	3009	sub new {
2551	my $class = shift;	3010	my $class = shift;
2552		3011
2553	my $self = $class->SUPER::new (	3012	my $self = $class->SUPER::new (
2554	fontsize => 1,	3013	fontsize => 1,
2555	can_events => 0,	3014	can_events => 1,
2556	indent => 0,	3015	indent => 0,
2557	#font => default_font	3016	#font => default_font
2558	@_,	3017	@_,
2559		3018
2560	layout => (new CFClient::Layout 1),	3019	layout => (new CFPlus::Layout),
2561	par => [],	3020	par => [],
		3021	max_par => 0,
2562	height => 0,	3022	height => 0,
2563	children => [	3023	children => [
2564	(new CFClient::UI::Empty expand => 1),	3024	(new CFPlus::UI::Empty expand => 1),
2565	(new CFClient::UI::Slider vertical => 1),	3025	(new CFPlus::UI::Slider vertical => 1),
2566	],	3026	],
2567	);	3027	);
2568		3028
2569	$self->{children}[1]->connect (changed => sub { $self->update });	3029	$self->{children}[1]->connect (changed => sub { $self->update });
2570		3030
…		…
2579	}	3039	}
2580		3040
2581	sub size_request {	3041	sub size_request {
2582	my ($self) = @_;	3042	my ($self) = @_;
2583		3043
2584	my ($empty, $slider) = @{ $self->{children} };	3044	my ($empty, $slider) = $self->visible_children;
2585		3045
2586	local $self->{children} = [$empty, $slider];	3046	local $self->{children} = [$empty, $slider];
2587	$self->SUPER::size_request	3047	$self->SUPER::size_request
2588	}	3048	}
2589		3049
…		…
2600		3060
2601	$self->reflow;	3061	$self->reflow;
2602		3062
2603	local $self->{children} = [$empty, $slider];	3063	local $self->{children} = [$empty, $slider];
2604	$self->SUPER::invoke_size_allocate ($w, $h)	3064	$self->SUPER::invoke_size_allocate ($w, $h)
		3065	}
		3066
		3067	sub invoke_mouse_wheel {
		3068	my ($self, $ev) = @_;
		3069
		3070	return 0 unless $ev->{dy}; # only vertical movements
		3071
		3072	$self->{children}[1]->emit (mouse_wheel => $ev);
		3073
		3074	1
2605	}	3075	}
2606		3076
2607	sub get_layout {	3077	sub get_layout {
2608	my ($self, $para) = @_;	3078	my ($self, $para) = @_;
2609		3079
…		…
2637		3107
2638	# todo: base offset on lines or so, not on pixels	3108	# todo: base offset on lines or so, not on pixels
2639	$self->{children}[1]->set_value ($offset);	3109	$self->{children}[1]->set_value ($offset);
2640	}	3110	}
2641		3111
		3112	sub current_paragraph {
		3113	my ($self) = @_;
		3114
		3115	$self->{top_paragraph} - 1
		3116	}
		3117
		3118	sub scroll_to {
		3119	my ($self, $para) = @_;
		3120
		3121	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3122
		3123	$self->{scroll_to} = $para;
		3124	$self->update;
		3125	}
		3126
2642	sub clear {	3127	sub clear {
2643	my ($self) = @_;	3128	my ($self) = @_;
2644		3129
2645	my (undef, undef, @other) = @{ $self->{children} };	3130	my (undef, undef, @other) = @{ $self->{children} };
2646	$self->remove ($_) for @other;	3131	$self->remove ($_) for @other;
…		…
2649	$self->{height} = 0;	3134	$self->{height} = 0;
2650	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3135	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651	}	3136	}
2652		3137
2653	sub add_paragraph {	3138	sub add_paragraph {
2654	my ($self, $color, $para, $indent) = @_;	3139	my $self = shift;
2655		3140
2656	my ($text, @w) = ref $para ? @$para : $para;	3141	for my $para (@_) {
2657
2658	$para = {	3142	$para = {
		3143	fg => [1, 1, 1, 1],
		3144	indent => 0,
		3145	markup => "",
		3146	widget => [],
		3147	ref $para ? %$para : (markup => $para),
2659	w => 1e10,	3148	w => 1e10,
2660	wrapped => 1,	3149	wrapped => 1,
2661	fg => $color,
2662	indent => $indent,
2663	markup => $text,
2664	widget => \@w,
2665	};	3150	};
2666		3151
2667	$self->add (@w) if @w;	3152	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668	push @{$self->{par}}, $para;	3153	push @{$self->{par}}, $para;
		3154	}
		3155
		3156	if (my $max = $self->{max_par}) {
		3157	shift @{$self->{par}} while @{$self->{par}} > $max;
		3158	}
2669		3159
2670	$self->{need_reflow}++;	3160	$self->{need_reflow}++;
2671	$self->update;	3161	$self->update;
2672	}	3162	}
2673		3163
2674	sub scroll_to_bottom {	3164	sub scroll_to_bottom {
2675	my ($self) = @_;	3165	my ($self) = @_;
2676		3166
2677	$self->{scroll_to_bottom} = 1;	3167	$self->{scroll_to} = $#{$self->{par}};
2678	$self->update;	3168	$self->update;
2679	}	3169	}
2680		3170
		3171	sub force_uptodate {
		3172	my ($self) = @_;
		3173
		3174	if (delete $self->{need_reflow}) {
		3175	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3176
		3177	my $height = 0;
		3178
		3179	for my $para (@{$self->{par}}) {
		3180	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3181	my $layout = $self->get_layout ($para);
		3182	my ($w, $h) = $layout->size;
		3183
		3184	$para->{w} = $w + $para->{indent};
		3185	$para->{h} = $h;
		3186	$para->{wrapped} = $layout->has_wrapped;
		3187	}
		3188
		3189	$para->{y} = $height;
		3190	$height += $para->{h};
		3191	}
		3192
		3193	$self->{height} = $height;
		3194	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3195
		3196	delete $self->{texture};
		3197	}
		3198
		3199	if (my $paridx = delete $self->{scroll_to}) {
		3200	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3201	}
		3202	}
		3203
2681	sub update {	3204	sub update {
2682	my ($self) = @_;	3205	my ($self) = @_;
2683		3206
2684	$self->SUPER::update;	3207	$self->SUPER::update;
2685		3208
2686	return unless $self->{h} > 0;	3209	return unless $self->{h} > 0;
2687		3210
2688	delete $self->{texture};	3211	delete $self->{texture};
2689		3212
2690	$ROOT->on_post_alloc ($self => sub {	3213	$ROOT->on_post_alloc ($self => sub {
		3214	$self->force_uptodate;
		3215
2691	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3216	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692		3217
2693	if (delete $self->{need_reflow}) {
2694	my $height = 0;
2695
2696	for my $para (@{$self->{par}}) {
2697	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2698	my $layout = $self->get_layout ($para);
2699	my ($w, $h) = $layout->size;
2700
2701	$para->{w} = $w + $para->{indent};
2702	$para->{h} = $h;
2703	$para->{wrapped} = $layout->has_wrapped;
2704	}
2705
2706	$height += $para->{h};
2707	}
2708
2709	$self->{height} = $height;
2710
2711	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2712
2713	delete $self->{texture};
2714	}
2715
2716	if (delete $self->{scroll_to_bottom}) {
2717	$self->{children}[1]->set_value (1e10);
2718	}
2719
2720	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3218	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2721	glClearColor 0, 0, 0, 0;	3219	glClearColor 0, 0, 0, 0;
2722	glClear GL_COLOR_BUFFER_BIT;	3220	glClear GL_COLOR_BUFFER_BIT;
2723		3221
		3222	package CFPlus::UI::Base;
		3223	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3224	(0, 0, $self->{w}, $self->{h});
		3225
		3226	my $top = int $self->{children}[1]{range}[0];
		3227
		3228	my $paridx = 0;
		3229	my $top_paragraph;
2724	my $top = int $self->{children}[1]{range}[0];	3230	my $top = int $self->{children}[1]{range}[0];
2725		3231
2726	my $y0 = $top;	3232	my $y0 = $top;
2727	my $y1 = $top + $H;	3233	my $y1 = $top + $H;
2728		3234
2729	my $y = 0;
2730
2731	glEnable GL_BLEND;
2732	#TODO# not correct in windows where rgba is forced off
2733	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735	for my $para (@{$self->{par}}) {	3235	for my $para (@{$self->{par}}) {
2736	my $h = $para->{h};	3236	my $h = $para->{h};
		3237	my $y = $para->{y};
2737		3238
2738	if ($y0 < $y + $h && $y < $y1) {	3239	if ($y0 < $y + $h && $y < $y1) {
2739
2740	my $layout = $self->get_layout ($para);	3240	my $layout = $self->get_layout ($para);
2741		3241
2742	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744	glRasterPos $para->{indent}, $y - $y0;	3242	$layout->render ($para->{indent}, $y - $y0);
2745	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746		3243
2747	if (my @w = @{ $para->{widget} }) {	3244	if (my @w = @{ $para->{widget} }) {
2748	my @s = $layout->get_shapes;	3245	my @s = $layout->get_shapes;
2749		3246
2750	glDisable GL_BLEND;
2751	for (@w) {	3247	for (@w) {
2752	my ($dx, $dy) = splice @s, 0, 2, ();	3248	my ($dx, $dy) = splice @s, 0, 2, ();
2753		3249
2754	$_->{x} = $dx + $para->{indent};	3250	$_->{x} = $dx + $para->{indent};
2755	$_->{y} = $dy + $y - $y0;	3251	$_->{y} = $dy + $y - $y0;
2756		3252
2757	$_->draw;	3253	$_->draw;
2758	}	3254	}
2759	glEnable GL_BLEND;
2760	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761	}	3255	}
2762	}	3256	}
2763		3257
2764	$y += $h;	3258	$paridx++;
		3259	$top_paragraph ||= $paridx if $y >= $top;
2765	}	3260	}
2766		3261
2767	glDisable GL_BLEND;	3262	$self->{top_paragraph} = $top_paragraph;
2768	};	3263	};
2769	});	3264	});
2770	}	3265	}
2771		3266
2772	sub reconfigure {	3267	sub reconfigure {
…		…
2790	$self->{children}[1]->draw;	3285	$self->{children}[1]->draw;
2791	}	3286	}
2792		3287
2793	#############################################################################	3288	#############################################################################
2794		3289
2795	package CFClient::UI::Animator;	3290	package CFPlus::UI::Animator;
2796		3291
2797	use CFClient::OpenGL;	3292	use CFPlus::OpenGL;
2798		3293
2799	our @ISA = CFClient::UI::Bin::;	3294	our @ISA = CFPlus::UI::Bin::;
2800		3295
2801	sub moveto {	3296	sub moveto {
2802	my ($self, $x, $y) = @_;	3297	my ($self, $x, $y) = @_;
2803		3298
2804	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3299	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2832	glPopMatrix;	3327	glPopMatrix;
2833	}	3328	}
2834		3329
2835	#############################################################################	3330	#############################################################################
2836		3331
2837	package CFClient::UI::Flopper;	3332	package CFPlus::UI::Flopper;
2838		3333
2839	our @ISA = CFClient::UI::Button::;	3334	our @ISA = CFPlus::UI::Button::;
2840		3335
2841	sub new {	3336	sub new {
2842	my $class = shift;	3337	my $class = shift;
2843		3338
2844	my $self = $class->SUPER::new (	3339	my $self = $class->SUPER::new (
…		…
2856	$self->{other}->toggle_visibility;	3351	$self->{other}->toggle_visibility;
2857	}	3352	}
2858		3353
2859	#############################################################################	3354	#############################################################################
2860		3355
2861	package CFClient::UI::Tooltip;	3356	package CFPlus::UI::Tooltip;
2862		3357
2863	our @ISA = CFClient::UI::Bin::;	3358	our @ISA = CFPlus::UI::Bin::;
2864		3359
2865	use CFClient::OpenGL;	3360	use CFPlus::OpenGL;
2866		3361
2867	sub new {	3362	sub new {
2868	my $class = shift;	3363	my $class = shift;
2869		3364
2870	$class->SUPER::new (	3365	$class->SUPER::new (
…		…
2873	)	3368	)
2874	}	3369	}
2875		3370
2876	sub set_tooltip_from {	3371	sub set_tooltip_from {
2877	my ($self, $widget) = @_;	3372	my ($self, $widget) = @_;
		3373
		3374	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3375	if $widget->{tooltip} =~ /^#(.*)$/;
2878		3376
2879	my $tooltip = $widget->{tooltip};	3377	my $tooltip = $widget->{tooltip};
2880		3378
2881	if ($ENV{CFPLUS_DEBUG} & 2) {	3379	if ($ENV{CFPLUS_DEBUG} & 2) {
2882	$tooltip .= "\n\n" . (ref $widget) . "\n"	3380	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2886	}	3384	}
2887		3385
2888	$tooltip =~ s/^\n+//;	3386	$tooltip =~ s/^\n+//;
2889	$tooltip =~ s/\n+$//;	3387	$tooltip =~ s/\n+$//;
2890		3388
2891	$self->add (new CFClient::UI::Label	3389	$self->add (new CFPlus::UI::Label
2892	markup => $tooltip,	3390	markup => $tooltip,
2893	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2894	fontsize => 0.8,	3392	fontsize => 0.8,
2895	fg => [0, 0, 0, 1],	3393	style => 1, # FLAG_INVERSE
2896	ellipsise => 0,	3394	ellipsise => 0,
2897	font => ($widget->{tooltip_font} || $::FONT_PROP),	3395	font => ($widget->{tooltip_font} || $::FONT_PROP),
2898	);	3396	);
2899	}	3397	}
2900		3398
…		…
2919		3417
2920	$self->{root}->on_post_alloc ("move_$self" => sub {	3418	$self->{root}->on_post_alloc ("move_$self" => sub {
2921	my $widget = $self->{owner}	3419	my $widget = $self->{owner}
2922	or return;	3420	or return;
2923		3421
		3422	if ($widget->{visible}) {
2924	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3423	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925		3424
2926	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3425	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927	if $x + $self->{w} > $self->{root}{w};	3426	if $x + $self->{w} > $self->{root}{w};
2928		3427
2929	$self->move_abs ($x, $y);	3428	$self->move_abs ($x, $y);
		3429	} else {
		3430	$self->hide;
		3431	}
2930	});	3432	});
2931	}	3433	}
2932		3434
2933	sub _draw {	3435	sub _draw {
2934	my ($self) = @_;	3436	my ($self) = @_;
…		…
2958	$self->SUPER::_draw;	3460	$self->SUPER::_draw;
2959	}	3461	}
2960		3462
2961	#############################################################################	3463	#############################################################################
2962		3464
2963	package CFClient::UI::Face;	3465	package CFPlus::UI::Face;
2964		3466
2965	our @ISA = CFClient::UI::Base::;	3467	our @ISA = CFPlus::UI::DrawBG::;
2966		3468
2967	use CFClient::OpenGL;	3469	use CFPlus::OpenGL;
2968		3470
2969	sub new {	3471	sub new {
2970	my $class = shift;	3472	my $class = shift;
2971		3473
2972	my $self = $class->SUPER::new (	3474	my $self = $class->SUPER::new (
		3475	size_w => 32,
		3476	size_h => 8,
2973	aspect => 1,	3477	aspect => 1,
2974	can_events => 0,	3478	can_events => 0,
2975	@_,	3479	@_,
2976	);	3480	);
2977		3481
2978	if ($self->{anim} && $self->{animspeed}) {	3482	if ($self->{anim} && $self->{animspeed}) {
2979	Scalar::Util::weaken (my $widget = $self);	3483	CFPlus::weaken (my $widget = $self);
2980		3484
		3485	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3486	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2981	$self->{timer} = Event->timer (	3487	$self->{timer} = Event->timer (
2982	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2983	hard => 1,	3488	parked => 1,
2984	interval => $self->{animspeed},
2985	cb => sub {	3489	cb => sub {
		3490	return unless $::CONN && $widget;
		3491
2986	++$widget->{frame};	3492	++$widget->{frame};
		3493	$widget->update_face;
2987	$widget->update;	3494	$widget->update;
		3495
		3496	$widget->update_timer;
2988	},	3497	},
2989	);	3498	);
		3499
		3500	$self->update_face;
		3501	$self->update_timer;
2990	}	3502	}
2991		3503
2992	$self	3504	$self
2993	}	3505	}
2994		3506
		3507	sub update_timer {
		3508	my ($self) = @_;
		3509
		3510	return unless $self->{timer};
		3511
		3512	if ($self->{visible}) {
		3513	$self->{timer}->at (
		3514	$self->{anim_start}
		3515	+ $self->{animspeed}
		3516	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3517	);
		3518	$self->{timer}->start;
		3519	} else {
		3520	$self->{timer}->stop;
		3521	}
		3522	}
		3523
		3524	sub update_face {
		3525	my ($self) = @_;
		3526
		3527	return unless $::CONN;
		3528
		3529	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3530	if ($anim && @$anim) {
		3531	delete $self->{wait_face};
		3532	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3533	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3534	}
		3535	}
		3536	}
		3537
2995	sub size_request {	3538	sub size_request {
2996	(32, 8)	3539	my ($self) = @_;
		3540
		3541	if ($::CONN) {
		3542	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3543	if (my $tex = $::CONN->{texture}[$faceid]) {
		3544	$self->{tex} = $tex;
		3545	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3546	} else {
		3547	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3548	$self->realloc;
		3549	});
		3550	}
		3551	}
		3552	}
		3553
		3554	($self->{size_w} || 8, $self->{size_h} || 8)
2997	}	3555	}
2998		3556
2999	sub update {	3557	sub update {
3000	my ($self) = @_;	3558	my ($self) = @_;
3001		3559
3002	return unless $self->{visible};	3560	return unless $self->{visible};
3003		3561
3004	$self->SUPER::update;	3562	$self->SUPER::update;
3005	}	3563	}
3006		3564
		3565	sub invoke_visibility_change {
		3566	my ($self) = @_;
		3567
		3568	$self->update_timer;
		3569
		3570	0
		3571	}
		3572
3007	sub _draw {	3573	sub _draw {
3008	my ($self) = @_;	3574	my ($self) = @_;
3009		3575
3010	return unless $::CONN;	3576	$self->SUPER::_draw;
3011		3577
3012	my $face;	3578	if (my $tex = $self->{tex}) {
3013
3014	if ($self->{frame}) {
3015	my $anim = $::CONN->{anim}[$self->{anim}];
3016
3017	$face = $anim->[ $self->{frame} % @$anim ]
3018	if $anim && @$anim;
3019	}
3020
3021	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3022
3023	if ($tex) {
3024	glEnable GL_TEXTURE_2D;	3579	glEnable GL_TEXTURE_2D;
3025	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3580	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3026	glColor 0, 0, 0, 1;	3581	glColor 0, 0, 0, 1;
3027	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3582	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3028	glDisable GL_TEXTURE_2D;	3583	glDisable GL_TEXTURE_2D;
…		…
3030	}	3585	}
3031		3586
3032	sub destroy {	3587	sub destroy {
3033	my ($self) = @_;	3588	my ($self) = @_;
3034		3589
3035	$self->{timer}->cancel	3590	(delete $self->{timer})->cancel
3036	if $self->{timer};	3591	if $self->{timer};
3037		3592
3038	$self->SUPER::destroy;	3593	$self->SUPER::destroy;
3039	}	3594	}
3040		3595
3041	#############################################################################	3596	#############################################################################
3042		3597
3043	package CFClient::UI::Buttonbar;	3598	package CFPlus::UI::Buttonbar;
3044		3599
3045	our @ISA = CFClient::UI::HBox::;	3600	our @ISA = CFPlus::UI::HBox::;
3046		3601
3047	# TODO: should actualyl wrap buttons and other goodies.	3602	# TODO: should actually wrap buttons and other goodies.
3048		3603
3049	#############################################################################	3604	#############################################################################
3050		3605
3051	package CFClient::UI::Menu;	3606	package CFPlus::UI::Menu;
3052		3607
3053	our @ISA = CFClient::UI::FancyFrame::;	3608	our @ISA = CFPlus::UI::Toplevel::;
3054		3609
3055	use CFClient::OpenGL;	3610	use CFPlus::OpenGL;
3056		3611
3057	sub new {	3612	sub new {
3058	my $class = shift;	3613	my $class = shift;
3059		3614
3060	my $self = $class->SUPER::new (	3615	my $self = $class->SUPER::new (
3061	items => [],	3616	items => [],
3062	z => 100,	3617	z => 100,
3063	@_,	3618	@_,
3064	);	3619	);
3065		3620
3066	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3621	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3067		3622
3068	for my $item (@{ $self->{items} }) {	3623	for my $item (@{ $self->{items} }) {
3069	my ($widget, $cb, $tooltip) = @$item;	3624	my ($widget, $cb, $tooltip) = @$item;
3070		3625
3071	# handle various types of items, only text for now	3626	# handle various types of items, only text for now
3072	if (!ref $widget) {	3627	if (!ref $widget) {
		3628	if ($widget =~ /\t/) {
		3629	my ($left, $right) = split /\t/, $widget, 2;
		3630
3073	$widget = new CFClient::UI::Label	3631	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3632	can_hover => 1,
3075	can_events => 1,	3633	can_events => 1,
		3634	tooltip => $tooltip,
		3635	children => [
		3636	(new CFPlus::UI::Label markup => $left, expand => 1),
		3637	(new CFPlus::UI::Label markup => $right, align => +1),
		3638	],
		3639	;
		3640
		3641	} else {
		3642	$widget = new CFPlus::UI::Label
		3643	can_hover => 1,
		3644	can_events => 1,
3076	markup => $widget,	3645	markup => $widget,
3077	tooltip => $tooltip	3646	tooltip => $tooltip;
		3647	}
3078	}	3648	}
3079		3649
3080	$self->{item}{$widget} = $item;	3650	$self->{item}{$widget} = $item;
3081		3651
3082	$self->{vbox}->add ($widget);	3652	$self->{vbox}->add ($widget);
…		…
3125	1	3695	1
3126	}	3696	}
3127		3697
3128	#############################################################################	3698	#############################################################################
3129		3699
3130	package CFClient::UI::Multiplexer;	3700	package CFPlus::UI::Multiplexer;
3131		3701
3132	our @ISA = CFClient::UI::Container::;	3702	our @ISA = CFPlus::UI::Container::;
3133		3703
3134	sub new {	3704	sub new {
3135	my $class = shift;	3705	my $class = shift;
3136		3706
3137	my $self = $class->SUPER::new (	3707	my $self = $class->SUPER::new (
…		…
3151		3721
3152	$self->{current} = $self->{children}[0]	3722	$self->{current} = $self->{children}[0]
3153	if @{ $self->{children} };	3723	if @{ $self->{children} };
3154	}	3724	}
3155		3725
		3726	sub get_current_page {
		3727	my ($self) = @_;
		3728
		3729	$self->{current}
		3730	}
		3731
3156	sub set_current_page {	3732	sub set_current_page {
3157	my ($self, $page_or_widget) = @_;	3733	my ($self, $page_or_widget) = @_;
3158		3734
3159	my $widget = ref $page_or_widget	3735	my $widget = ref $page_or_widget
3160	? $page_or_widget	3736	? $page_or_widget
…		…
3192	$self->{current}->draw;	3768	$self->{current}->draw;
3193	}	3769	}
3194		3770
3195	#############################################################################	3771	#############################################################################
3196		3772
3197	package CFClient::UI::Notebook;	3773	package CFPlus::UI::Notebook;
3198		3774
3199	our @ISA = CFClient::UI::VBox::;	3775	our @ISA = CFPlus::UI::VBox::;
3200		3776
3201	sub new {	3777	sub new {
3202	my $class = shift;	3778	my $class = shift;
3203		3779
3204	my $self = $class->SUPER::new (	3780	my $self = $class->SUPER::new (
3205	buttonbar => (new CFClient::UI::Buttonbar),	3781	buttonbar => (new CFPlus::UI::Buttonbar),
3206	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3782	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207	# filter => # will be put between multiplexer and $self	3783	# filter => # will be put between multiplexer and $self
3208	@_,	3784	@_,
3209	);	3785	);
3210		3786
3211	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3787	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3212	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3788	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3213		3789
		3790	{
		3791	Scalar::Util::weaken (my $wself = $self);
		3792
		3793	$self->{multiplexer}->connect (c_add => sub {
		3794	my ($mplex, $widgets) = @_;
		3795
		3796	for my $child (@$widgets) {
		3797	Scalar::Util::weaken $child;
		3798	$child->{c_tab_} ||= do {
		3799	my $tab =
		3800	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3801	? $child->{c_tab}
		3802	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3803
		3804	$tab->connect (activate => sub {
		3805	$wself->set_current_page ($child);
		3806	});
		3807
		3808	$tab
		3809	};
		3810
		3811	$self->{buttonbar}->add ($child->{c_tab_});
		3812	}
		3813	});
		3814
		3815	$self->{multiplexer}->connect (c_remove => sub {
		3816	my ($mplex, $widgets) = @_;
		3817
		3818	for my $child (@$widgets) {
		3819	$wself->{buttonbar}->remove ($child->{c_tab_});
		3820	}
		3821	});
		3822	}
		3823
3214	$self	3824	$self
3215	}	3825	}
3216		3826
3217	sub add {	3827	sub add {
		3828	my ($self, @widgets) = @_;
		3829
		3830	$self->{multiplexer}->add (@widgets)
		3831	}
		3832
		3833	sub remove {
		3834	my ($self, @widgets) = @_;
		3835
		3836	$self->{multiplexer}->remove (@widgets)
		3837	}
		3838
		3839	sub pages {
		3840	my ($self) = @_;
		3841	$self->{multiplexer}->children
		3842	}
		3843
		3844	sub add_tab {
3218	my ($self, $title, $widget, $tooltip) = @_;	3845	my ($self, $title, $widget, $tooltip) = @_;
3219		3846
3220	Scalar::Util::weaken $self;	3847	$title = [$title, $tooltip] unless ref $title;
		3848	$widget->{c_tab} = $title;
3221		3849
3222	$self->{buttonbar}->add (new CFClient::UI::Button
3223	markup => $title,
3224	tooltip => $tooltip,
3225	on_activate => sub { $self->set_current_page ($widget) },
3226	);
3227
3228	$self->{multiplexer}->add ($widget);	3850	$self->add ($widget);
		3851	}
		3852
		3853	sub get_current_page {
		3854	my ($self) = @_;
		3855
		3856	$self->{multiplexer}->get_current_page
3229	}	3857	}
3230		3858
3231	sub set_current_page {	3859	sub set_current_page {
3232	my ($self, $page) = @_;	3860	my ($self, $page) = @_;
3233		3861
…		…
3235	$self->emit (page_changed => $self->{multiplexer}{current});	3863	$self->emit (page_changed => $self->{multiplexer}{current});
3236	}	3864	}
3237		3865
3238	#############################################################################	3866	#############################################################################
3239		3867
3240	package CFClient::UI::Combobox;	3868	package CFPlus::UI::Selector;
3241		3869
3242	use utf8;	3870	use utf8;
3243		3871
3244	our @ISA = CFClient::UI::Button::;	3872	our @ISA = CFPlus::UI::Button::;
3245		3873
3246	sub new {	3874	sub new {
3247	my $class = shift;	3875	my $class = shift;
3248		3876
3249	my $self = $class->SUPER::new (	3877	my $self = $class->SUPER::new (
…		…
3266	my ($value, $title, $tooltip) = @$_;	3894	my ($value, $title, $tooltip) = @$_;
3267		3895
3268	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3896	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269	}	3897	}
3270		3898
3271	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3899	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272	}	3900	}
3273		3901
3274	sub _set_value {	3902	sub _set_value {
3275	my ($self, $value) = @_;	3903	my ($self, $value) = @_;
3276		3904
…		…
3291	$self->emit (changed => $value);	3919	$self->emit (changed => $value);
3292	}	3920	}
3293		3921
3294	#############################################################################	3922	#############################################################################
3295		3923
3296	package CFClient::UI::Statusbox;	3924	package CFPlus::UI::Statusbox;
3297		3925
3298	our @ISA = CFClient::UI::VBox::;	3926	our @ISA = CFPlus::UI::VBox::;
3299		3927
3300	sub new {	3928	sub new {
3301	my $class = shift;	3929	my $class = shift;
3302		3930
3303	my $self = $class->SUPER::new (	3931	my $self = $class->SUPER::new (
3304	fontsize => 0.8,	3932	fontsize => 0.8,
3305	@_,	3933	@_,
3306	);	3934	);
3307		3935
3308	Scalar::Util::weaken (my $this = $self);	3936	CFPlus::weaken (my $this = $self);
3309		3937
3310	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3938	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311		3939
3312	$self	3940	$self
3313	}	3941	}
…		…
3315	sub reorder {	3943	sub reorder {
3316	my ($self) = @_;	3944	my ($self) = @_;
3317	my $NOW = Time::HiRes::time;	3945	my $NOW = Time::HiRes::time;
3318		3946
3319	# freeze display when hovering over any label	3947	# freeze display when hovering over any label
3320	return if $CFClient::UI::TOOLTIP->{owner}	3948	return if $CFPlus::UI::TOOLTIP->{owner}
3321	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3949	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3322	values %{ $self->{item} };	3950	values %{ $self->{item} };
3323		3951
3324	while (my ($k, $v) = each %{ $self->{item} }) {	3952	while (my ($k, $v) = each %{ $self->{item} }) {
3325	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3953	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326	}	3954	}
…		…
3347	for ($short) {	3975	for ($short) {
3348	s/^\s+//;	3976	s/^\s+//;
3349	s/\s+/ /g;	3977	s/\s+/ /g;
3350	}	3978	}
3351		3979
3352	new CFClient::UI::Label	3980	new CFPlus::UI::Label
3353	markup => $short,	3981	markup => $short,
3354	tooltip => $item->{tooltip},	3982	tooltip => $item->{tooltip},
3355	tooltip_font => $::FONT_PROP,	3983	tooltip_font => $::FONT_PROP,
3356	tooltip_width => 0.67,	3984	tooltip_width => 0.67,
3357	fontsize => $item->{fontsize} || $self->{fontsize},	3985	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3436	$self->SUPER::destroy;	4064	$self->SUPER::destroy;
3437	}	4065	}
3438		4066
3439	#############################################################################	4067	#############################################################################
3440		4068
3441	package CFClient::UI::Inventory;
3442
3443	our @ISA = CFClient::UI::ScrolledWindow::;
3444
3445	sub new {
3446	my $class = shift;
3447
3448	my $self = $class->SUPER::new (
3449	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450	@_,
3451	);
3452
3453	$self
3454	}
3455
3456	sub set_items {
3457	my ($self, $items) = @_;
3458
3459	$self->{child}->clear;
3460	return unless $items;
3461
3462	my @items = sort {
3463	($a->{type} <=> $b->{type})
3464	or ($a->{name} cmp $b->{name})
3465	} values %$items;
3466
3467	$self->{real_items} = \@items;
3468
3469	my $row = 0;
3470	for my $item (@items) {
3471	CFClient::Item::update_widgets $item;
3472
3473	$self->{child}->add (0, $row, $item->{face_widget});
3474	$self->{child}->add (1, $row, $item->{desc_widget});
3475	$self->{child}->add (2, $row, $item->{weight_widget});
3476
3477	$row++;
3478	}
3479	}
3480
3481	#############################################################################
3482
3483	package CFClient::UI::SpellList;
3484
3485	our @ISA = CFClient::UI::Table::;
3486
3487	sub new {
3488	my $class = shift;
3489
3490	my $self = $class->SUPER::new (
3491	binding => [],
3492	commands => [],
3493	@_,
3494	)
3495	}
3496
3497	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510	sub rebuild_spell_list {
3511	my ($self) = @_;
3512
3513	$CFClient::UI::ROOT->on_refresh ($self => sub {
3514	$self->clear;
3515
3516	return unless $::CONN;
3517
3518	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524	my $row = 0;
3525
3526	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527	my $spell = $self->{spell}{$_};
3528
3529	$row++;
3530
3531	my $spell_cb = sub {
3532	my ($widget, $ev) = @_;
3533
3534	if ($ev->{button} == 1) {
3535	$::CONN->user_send ("cast $spell->{name}");
3536	} elsif ($ev->{button} == 2) {
3537	$::CONN->user_send ("invoke $spell->{name}");
3538	} elsif ($ev->{button} == 3) {
3539	(new CFClient::UI::Menu
3540	items => [
3541	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543	],
3544	)->popup ($ev);
3545	} else {
3546	return 0;
3547	}
3548
3549	1
3550	};
3551
3552	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554	#TODO: add path info to tooltip
3555	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557	$self->add (0, $row, new CFClient::UI::Face
3558	face => $spell->{face},
3559	can_hover => 1,
3560	can_events => 1,
3561	tooltip => $tooltip,
3562	on_button_down => $spell_cb,
3563	);
3564
3565	$self->add (1, $row, new CFClient::UI::Label
3566	expand => 1,
3567	text => $spell->{name},
3568	can_hover => 1,
3569	can_events => 1,
3570	tooltip => $tooltip,
3571	on_button_down => $spell_cb,
3572	);
3573
3574	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578	}
3579	});
3580	}
3581
3582	sub add_spell {
3583	my ($self, $spell) = @_;
3584
3585	$self->{spell}->{$spell->{name}} = $spell;
3586	$self->rebuild_spell_list;
3587	}
3588
3589	sub remove_spell {
3590	my ($self, $spell) = @_;
3591
3592	delete $self->{spell}->{$spell->{name}};
3593	$self->rebuild_spell_list;
3594	}
3595
3596	sub clear_spells {
3597	my ($self) = @_;
3598
3599	$self->{spell} = {};
3600	$self->rebuild_spell_list;
3601	}
3602
3603	#############################################################################
3604
3605	package CFClient::UI::Root;	4069	package CFPlus::UI::Root;
3606		4070
3607	our @ISA = CFClient::UI::Container::;	4071	our @ISA = CFPlus::UI::Container::;
3608		4072
3609	use List::Util qw(min max);	4073	use List::Util qw(min max);
3610		4074
3611	use CFClient::OpenGL;	4075	use CFPlus::OpenGL;
3612		4076
3613	sub new {	4077	sub new {
3614	my $class = shift;	4078	my $class = shift;
3615		4079
3616	my $self = $class->SUPER::new (	4080	my $self = $class->SUPER::new (
3617	visible => 1,	4081	visible => 1,
3618	@_,	4082	@_,
3619	);	4083	);
3620		4084
3621	Scalar::Util::weaken ($self->{root} = $self);	4085	CFPlus::weaken ($self->{root} = $self);
3622		4086
3623	$self	4087	$self
3624	}	4088	}
3625		4089
3626	sub size_request {	4090	sub size_request {
…		…
3721	while ($self->{refresh_hook}) {	4185	while ($self->{refresh_hook}) {
3722	$_->()	4186	$_->()
3723	for values %{delete $self->{refresh_hook}};	4187	for values %{delete $self->{refresh_hook}};
3724	}	4188	}
3725		4189
3726	if ($self->{realloc}) {	4190	while ($self->{realloc}) {
3727	my %queue;	4191	my %queue;
3728	my @queue;	4192	my @queue;
3729	my $widget;	4193	my $widget;
3730		4194
3731	outer:	4195	outer:
…		…
3778	}	4242	}
3779	}	4243	}
3780		4244
3781	delete $self->{realloc}{$widget+0};	4245	delete $self->{realloc}{$widget+0};
3782	}	4246	}
3783	}
3784		4247
3785	while (my $size_alloc = delete $self->{size_alloc}) {	4248	while (my $size_alloc = delete $self->{size_alloc}) {
3786	my @queue = sort { $b->{visible} <=> $a->{visible} }	4249	my @queue = sort { $a->{visible} <=> $b->{visible} }
3787	values %$size_alloc;	4250	values %$size_alloc;
3788		4251
3789	while () {	4252	while () {
3790	my $widget = pop @queue || last;	4253	my $widget = pop @queue || last;
3791		4254
3792	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4255	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793		4256
3794	$w = 0 if $w < 0;	4257	$w = max $widget->{min_w}, $w;
3795	$h = 0 if $h < 0;	4258	$h = max $widget->{min_h}, $h;
3796		4259
		4260	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4261	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4262
		4263	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4264	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4265
3797	$w = int $w + 0.5;	4266	$w = int $w + 0.5;
3798	$h = int $h + 0.5;	4267	$h = int $h + 0.5;
3799		4268
3800	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4269	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801	$widget->{old_w} = $widget->{w};	4270	$widget->{old_w} = $widget->{w};
3802	$widget->{old_h} = $widget->{h};	4271	$widget->{old_h} = $widget->{h};
3803		4272
3804	$widget->{w} = $w;	4273	$widget->{w} = $w;
3805	$widget->{h} = $h;	4274	$widget->{h} = $h;
3806		4275
3807	$widget->emit (size_allocate => $w, $h);	4276	$widget->emit (size_allocate => $w, $h);
		4277	}
3808	}	4278	}
3809	}	4279	}
3810	}	4280	}
3811		4281
3812	while ($self->{post_alloc_hook}) {	4282	while ($self->{post_alloc_hook}) {
3813	$_->()	4283	$_->()
3814	for values %{delete $self->{post_alloc_hook}};	4284	for values %{delete $self->{post_alloc_hook}};
3815	}	4285	}
3816
3817		4286
3818	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4287	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3819	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4288	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3820	glClear GL_COLOR_BUFFER_BIT;	4289	glClear GL_COLOR_BUFFER_BIT;
3821		4290
…		…
3824	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4293	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825	glMatrixMode GL_MODELVIEW;	4294	glMatrixMode GL_MODELVIEW;
3826	glLoadIdentity;	4295	glLoadIdentity;
3827		4296
3828	{	4297	{
3829	package CFClient::UI::Base;	4298	package CFPlus::UI::Base;
3830		4299
3831	($draw_x, $draw_y, $draw_w, $draw_h) =	4300	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3832	(0, 0, $self->{w}, $self->{h});	4301	(0, 0, $self->{w}, $self->{h});
3833	}
3834		4302
3835	$self->_draw;	4303	$self->_draw;
		4304	}
3836	}	4305	}
3837		4306
3838	#############################################################################	4307	#############################################################################
3839		4308
3840	package CFClient::UI;	4309	package CFPlus::UI;
3841		4310
3842	$ROOT = new CFClient::UI::Root;	4311	$ROOT = new CFPlus::UI::Root;
3843	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4312	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3844		4313
3845	1	4314	1
3846		4315

Diff Legend

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