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.314 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.425 by root, Fri Aug 10 04:02:13 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	c_col => 0,
		1033	c_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	c_col => 1,
		1044	c_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	c_col => 0,
		1066	c_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->{c_rowspan} ||= 1;
		1604	$child->{c_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->{c_row} = $row;
		1619	$child->{c_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->{c_colspan} <=> $b->{c_colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_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->{c_rowspan} <=> $b->{c_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(c_row req_h c_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(c_row c_col req_w req_h c_rowspan c_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;
…		…
1577		1923
1578	delete $self->{ox};	1924	delete $self->{ox};
1579	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
1580	}	1926	}
1581		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
		1932	}
		1933
1582	sub set_text {	1934	sub set_text {
1583	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1584		1936
1585	return if $self->{text} eq "T$text";	1937	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1938	$self->{text} = "T$text";
1587		1939
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1940	$self->{layout}->set_text ($text);
1590		1941
1591	delete $self->{size_req};	1942	delete $self->{size_req};
1592	$self->realloc;	1943	$self->realloc;
1593	$self->update;	1944	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1950	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1951	$self->{text} = "M$markup";
1601		1952
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1953	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1954
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1955	$self->{layout}->set_markup ($markup);
1606		1956
1607	delete $self->{size_req};	1957	delete $self->{size_req};
1608	$self->realloc;	1958	$self->realloc;
1609	$self->update;	1959	$self->update;
…		…
1621		1971
1622	my ($w, $h) = $self->{layout}->size;	1972	my ($w, $h) = $self->{layout}->size;
1623		1973
1624	if (exists $self->{template}) {	1974	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1975	$self->{template}->set_font ($self->{font}) if $self->{font};
		1976	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1977	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1978
1628	my ($w2, $h2) = $self->{template}->size;	1979	my ($w2, $h2) = $self->{template}->size;
1629		1980
1630	$w = List::Util::max $w, $w2;	1981	$w = List::Util::max $w, $w2;
…		…
1654		2005
1655	sub set_fontsize {	2006	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	2007	my ($self, $fontsize) = @_;
1657		2008
1658	$self->{fontsize} = $fontsize;	2009	$self->{fontsize} = $fontsize;
		2010	delete $self->{size_req};
1659	delete $self->{texture};	2011	delete $self->{texture};
1660		2012
1661	$self->realloc;	2013	$self->realloc;
1662	}	2014	}
1663		2015
1664	sub reconfigure {	2016	sub reconfigure {
1665	my ($self) = @_;	2017	my ($self) = @_;
1666		2018
1667	delete $self->{size_req};	2019	delete $self->{size_req};
		2020	delete $self->{texture};
1668		2021
1669	$self->SUPER::reconfigure;	2022	$self->SUPER::reconfigure;
1670	}	2023	}
1671		2024
1672	sub _draw {	2025	sub _draw {
1673	my ($self) = @_;	2026	my ($self) = @_;
1674		2027
1675	$self->SUPER::_draw; # draw background, if applicable	2028	$self->SUPER::_draw; # draw background, if applicable
1676		2029
1677	my $tex = $self->{texture} ||= do {	2030	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	2031	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	2032	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	2033	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	2034	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2035	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2036	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		2037
1685	new_from_layout CFClient::Texture $self->{layout}	2038	[$self->{layout}->size]
1686	};	2039	};
1687		2040
1688	unless (exists $self->{ox}) {	2041	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2042	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2043	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	2044	: ($self->{w} - $size->[0]) * 0.5);
1692		2045
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2046	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2047	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	2048	: ($self->{h} - $size->[1]) * 0.5);
1696	};	2049	};
1697		2050
1698	glEnable GL_TEXTURE_2D;	2051	# unless ($self->{list}) {
1699		2052	# $self->{list} = CFPlus::OpenGL::glGenList;
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2053	# CFPlus::OpenGL::glNewList $self->{list};
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2054	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702		2055	# CFPlus::OpenGL::glEndList;
1703	if ($tex->{format} == GL_ALPHA) {
1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705	glColor @{$self->{fg}};
1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707	} else {
1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710	}	2056	# }
		2057	#
		2058	# CFPlus::OpenGL::glCallList $self->{list};
1711		2059
1712	glDisable GL_TEXTURE_2D;	2060	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713	}	2061	}
		2062
		2063	#sub destroy {
		2064	# my ($self) = @_;
		2065	#
		2066	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2067	#
		2068	# $self->SUPER::destroy;
		2069	#}
1714		2070
1715	#############################################################################	2071	#############################################################################
1716		2072
1717	package CFClient::UI::EntryBase;	2073	package CFPlus::UI::EntryBase;
1718		2074
1719	our @ISA = CFClient::UI::Label::;	2075	our @ISA = CFPlus::UI::Label::;
1720		2076
1721	use CFClient::OpenGL;	2077	use CFPlus::OpenGL;
1722		2078
1723	sub new {	2079	sub new {
1724	my $class = shift;	2080	my $class = shift;
1725		2081
1726	$class->SUPER::new (	2082	$class->SUPER::new (
1727	fg => [1, 1, 1],	2083	fg => [1, 1, 1],
1728	bg => [0, 0, 0, 0.2],	2084	bg => [0, 0, 0, 0.2],
		2085	outline => [0.6, 0.3, 0.1],
1729	active_bg => [1, 1, 1, 0.5],	2086	active_bg => [0, 0, 1, .2],
1730	active_fg => [0, 0, 0],	2087	active_fg => [1, 1, 1],
		2088	active_outline => [1, 1, 0],
1731	can_hover => 1,	2089	can_hover => 1,
1732	can_focus => 1,	2090	can_focus => 1,
1733	valign => 0,	2091	valign => 0,
1734	can_events => 1,	2092	can_events => 1,
		2093	ellipsise => 0,
1735	#text => ...	2094	#text => ...
1736	#hidden => "*",	2095	#hidden => "*",
1737	@_	2096	@_
1738	)	2097	)
1739	}	2098	}
…		…
1784	my $sym = $ev->{sym};	2143	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	2144	my $uni = $ev->{unicode};
1786		2145
1787	my $text = $self->get_text;	2146	my $text = $self->get_text;
1788		2147
		2148	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2149
1789	if ($uni == 8) {	2150	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2151	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	2152	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	2153	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	2154	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	2155	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	2156	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	2157	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} elsif ($sym == CFClient::SDLK_HOME) {	2158	} elsif ($sym == CFPlus::SDLK_HOME) {
		2159	# what a hack
		2160	$self->{cursor} =
		2161	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2162	? length $1
		2163	: 0;
		2164	} elsif ($sym == CFPlus::SDLK_END) {
		2165	# uh, again
		2166	$self->{cursor} =
		2167	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2168	? $self->{cursor} + length $1
		2169	: length $self->{text};
		2170	} elsif ($uni == 21) { # ctrl-u
		2171	$text = "";
1798	$self->{cursor} = 0;	2172	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2173	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2174	$self->emit ('escape');
1803	} elsif ($uni) {	2175	} elsif ($uni == 0x0d) {
		2176	substr $text, $self->{cursor}++, 0, "\012";
		2177	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2178	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2179	} else {
1806	return 0;	2180	return 0;
1807	}	2181	}
1808		2182
1809	$self->_set_text ($text);	2183	$self->_set_text ($text);
1810		2184
1811	$self->realloc;	2185	$self->realloc;
		2186	$self->update;
1812		2187
1813	1	2188	1
1814	}	2189	}
1815		2190
1816	sub invoke_focus_in {	2191	sub invoke_focus_in {
…		…
1828		2203
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2204	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2205
1831	# byte-index to char-index	2206	# byte-index to char-index
1832	my $text = $self->{text};	2207	my $text = $self->{text};
1833	utf8::encode $text;	2208	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2209	$self->{cursor} = length $text;
1835		2210
1836	$self->_set_text ($self->{text});	2211	$self->_set_text ($self->{text});
1837	$self->update;	2212	$self->update;
1838		2213
1839	1	2214	1
…		…
1875		2250
1876	unless (exists $self->{cur_h}) {	2251	unless (exists $self->{cur_h}) {
1877	my $text = substr $self->{text}, 0, $self->{cursor};	2252	my $text = substr $self->{text}, 0, $self->{cursor};
1878	utf8::encode $text;	2253	utf8::encode $text;
1879		2254
1880	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2255	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1881	}	2256	}
1882		2257
1883	glColor @{$self->{fg}};	2258	glColor_premultiply @{$self->{active_fg}};
1884	glBegin GL_LINES;	2259	glBegin GL_LINES;
1885	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2260	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2261	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887	glEnd;	2262	glEnd;
1888	}
1889	}
1890		2263
		2264	glLineWidth 3;
		2265	glColor @{$self->{active_outline}};
		2266	glBegin GL_LINE_LOOP;
		2267	glVertex 0, 0;
		2268	glVertex $self->{w} - 1, 0;
		2269	glVertex $self->{w} - 1, $self->{h} - 1;
		2270	glVertex 0, $self->{h} - 1;
		2271	glEnd;
		2272	glLineWidth 1;
		2273
		2274	} else {
		2275	glColor @{$self->{outline}};
		2276	glTranslate .375, .375;
		2277	glBegin GL_LINE_STRIP;
		2278	glVertex 0, $self->{h} * .5;
		2279	glVertex 0, $self->{h} - 3;
		2280	glVertex $self->{w} - 1, $self->{h} - 3;
		2281	glVertex $self->{w} - 1, $self->{h} * .5;
		2282	glEnd;
		2283	}
		2284	}
		2285
		2286	#############################################################################
		2287
1891	package CFClient::UI::Entry;	2288	package CFPlus::UI::Entry;
1892		2289
1893	our @ISA = CFClient::UI::EntryBase::;	2290	our @ISA = CFPlus::UI::EntryBase::;
1894		2291
1895	use CFClient::OpenGL;	2292	use CFPlus::OpenGL;
1896		2293
1897	sub invoke_key_down {	2294	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2295	my ($self, $ev) = @_;
1899		2296
1900	my $sym = $ev->{sym};	2297	my $sym = $ev->{sym};
1901		2298
1902	if ($sym == 13) {	2299	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2300	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2301	my $txt = $self->get_text;
1905		2302
1906	$self->{history_pointer} = -1;	2303	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2304	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2305	$self->emit (activate => $txt);
1909	$self->update;	2306	$self->update;
1910		2307
1911	} elsif ($sym == CFClient::SDLK_UP) {	2308	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2309	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2310	$self->{history_saveback} = $self->get_text;
1914	}	2311	}
1915	if (@{$self->{history} || []} > 0) {	2312	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2313	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2315	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2316	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2317	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2318	}
1922		2319
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2320	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2321	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2322	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2323
1927	if ($self->{history_pointer} >= 0) {	2324	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2325	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2334	1
1938	}	2335	}
1939		2336
1940	#############################################################################	2337	#############################################################################
1941		2338
		2339	package CFPlus::UI::TextEdit;
		2340
		2341	our @ISA = CFPlus::UI::EntryBase::;
		2342
		2343	use CFPlus::OpenGL;
		2344
		2345	sub move_cursor_ver {
		2346	my ($self, $dy) = @_;
		2347
		2348	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2349
		2350	$y += $dy;
		2351
		2352	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2353	$self->{cursor} = $index;
		2354	delete $self->{cur_h};
		2355	$self->update;
		2356	return;
		2357	}
		2358	}
		2359
		2360	sub invoke_key_down {
		2361	my ($self, $ev) = @_;
		2362
		2363	my $sym = $ev->{sym};
		2364
		2365	if ($sym == CFPlus::SDLK_UP) {
		2366	$self->move_cursor_ver (-1);
		2367	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2368	$self->move_cursor_ver (+1);
		2369	} else {
		2370	return $self->SUPER::invoke_key_down ($ev)
		2371	}
		2372
		2373	1
		2374	}
		2375
		2376	#############################################################################
		2377
1942	package CFClient::UI::Button;	2378	package CFPlus::UI::ButtonBin;
1943		2379
1944	our @ISA = CFClient::UI::Label::;	2380	our @ISA = CFPlus::UI::Bin::;
1945		2381
1946	use CFClient::OpenGL;	2382	use CFPlus::OpenGL;
1947		2383
1948	my @tex =	2384	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2385	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2386	qw(b1_button_inactive.png b1_button_active.png);
1951		2387
1952	sub new {	2388	sub new {
1953	my $class = shift;	2389	my $class = shift;
1954		2390
1955	$class->SUPER::new (	2391	$class->SUPER::new (
1956	padding_x => 4,
1957	padding_y => 4,
1958	fg => [1, 1, 1],
1959	active_fg => [0, 0, 1],
1960	can_hover => 1,	2392	can_hover => 1,
1961	align => 0,	2393	align => 0,
1962	valign => 0,	2394	valign => 0,
1963	can_events => 1,	2395	can_events => 1,
1964	@_	2396	@_
…		…
1976	}	2408	}
1977		2409
1978	sub _draw {	2410	sub _draw {
1979	my ($self) = @_;	2411	my ($self) = @_;
1980		2412
1981	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1982
1983	glEnable GL_TEXTURE_2D;	2413	glEnable GL_TEXTURE_2D;
1984	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2414	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985	glColor 0, 0, 0, 1;	2415	glColor 0, 0, 0, 1;
1986		2416
		2417	my $tex = $tex[$GRAB == $self];
1987	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2418	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988		2419
1989	glDisable GL_TEXTURE_2D;	2420	glDisable GL_TEXTURE_2D;
1990		2421
1991	$self->SUPER::_draw;	2422	$self->SUPER::_draw;
1992	}	2423	}
1993		2424
1994	#############################################################################	2425	#############################################################################
1995		2426
		2427	package CFPlus::UI::Button;
		2428
		2429	our @ISA = CFPlus::UI::Label::;
		2430
		2431	use CFPlus::OpenGL;
		2432
		2433	my @tex =
		2434	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2435	qw(b1_button_inactive.png b1_button_active.png);
		2436
		2437	sub new {
		2438	my $class = shift;
		2439
		2440	$class->SUPER::new (
		2441	padding_x => 4,
		2442	padding_y => 4,
		2443	fg => [1.0, 1.0, 1.0],
		2444	active_fg => [0.8, 0.8, 0.8],
		2445	can_hover => 1,
		2446	align => 0,
		2447	valign => 0,
		2448	can_events => 1,
		2449	@_
		2450	)
		2451	}
		2452
		2453	sub invoke_button_up {
		2454	my ($self, $ev, $x, $y) = @_;
		2455
		2456	$self->emit ("activate")
		2457	if $x >= 0 && $x < $self->{w}
		2458	&& $y >= 0 && $y < $self->{h};
		2459
		2460	1
		2461	}
		2462
		2463	sub _draw {
		2464	my ($self) = @_;
		2465
		2466	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2467
		2468	glEnable GL_TEXTURE_2D;
		2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2470	glColor 0, 0, 0, 1;
		2471
		2472	my $tex = $tex[$GRAB == $self];
		2473	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2474
		2475	glDisable GL_TEXTURE_2D;
		2476
		2477	$self->SUPER::_draw;
		2478	}
		2479
		2480	#############################################################################
		2481
		2482	package CFPlus::UI::CheckBox;
		2483
		2484	our @ISA = CFPlus::UI::DrawBG::;
		2485
		2486	my @tex =
		2487	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2488	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2489
		2490	use CFPlus::OpenGL;
		2491
		2492	sub new {
		2493	my $class = shift;
		2494
		2495	$class->SUPER::new (
		2496	padding_x => 2,
		2497	padding_y => 2,
		2498	fg => [1, 1, 1],
		2499	active_fg => [1, 1, 0],
		2500	bg => [0, 0, 0, 0.2],
		2501	active_bg => [1, 1, 1, 0.5],
		2502	state => 0,
		2503	can_hover => 1,
		2504	@_
		2505	)
		2506	}
		2507
		2508	sub size_request {
		2509	my ($self) = @_;
		2510
		2511	(6) x 2
		2512	}
		2513
		2514	sub toggle {
		2515	my ($self) = @_;
		2516
		2517	$self->{state} = !$self->{state};
		2518	$self->emit (changed => $self->{state});
		2519	$self->update;
		2520	}
		2521
		2522	sub invoke_button_down {
		2523	my ($self, $ev, $x, $y) = @_;
		2524
		2525	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2526	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2527	$self->toggle;
		2528	} else {
		2529	return 0
		2530	}
		2531
		2532	1
		2533	}
		2534
		2535	sub _draw {
		2536	my ($self) = @_;
		2537
		2538	$self->SUPER::_draw;
		2539
		2540	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2541
		2542	my ($w, $h) = @$self{qw(w h)};
		2543
		2544	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2545
		2546	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2547
		2548	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2549
		2550	glEnable GL_TEXTURE_2D;
		2551	$tex->draw_quad_alpha (0, 0, $s, $s);
		2552	glDisable GL_TEXTURE_2D;
		2553	}
		2554
		2555	#############################################################################
		2556
		2557	package CFPlus::UI::Image;
		2558
		2559	our @ISA = CFPlus::UI::Base::;
		2560
		2561	use CFPlus::OpenGL;
		2562
		2563	our %texture_cache;
		2564
		2565	sub new {
		2566	my $class = shift;
		2567
		2568	my $self = $class->SUPER::new (
		2569	can_events => 0,
		2570	scale => 1,
		2571	@_,
		2572	);
		2573
		2574	$self->{path} || $self->{tex}
		2575	or Carp::croak "'path' or 'tex' attributes required";
		2576
		2577	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2578	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2579
		2580	CFPlus::weaken $texture_cache{$self->{path}};
		2581
		2582	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2583
		2584	$self
		2585	}
		2586
		2587	sub STORABLE_freeze {
		2588	my ($self, $cloning) = @_;
		2589
		2590	$self->{path}
		2591	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2592
		2593	$self->{path}
		2594	}
		2595
		2596	sub STORABLE_attach {
		2597	my ($self, $cloning, $path) = @_;
		2598
		2599	$self->new (path => $path)
		2600	}
		2601
		2602	sub size_request {
		2603	my ($self) = @_;
		2604
		2605	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2606	}
		2607
		2608	sub _draw {
		2609	my ($self) = @_;
		2610
		2611	my $tex = $self->{tex};
		2612
		2613	my ($w, $h) = ($self->{w}, $self->{h});
		2614
		2615	if ($self->{rot90}) {
		2616	glRotate 90, 0, 0, 1;
		2617	glTranslate 0, -$self->{w}, 0;
		2618
		2619	($w, $h) = ($h, $w);
		2620	}
		2621
		2622	glEnable GL_TEXTURE_2D;
		2623	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2624
		2625	$tex->draw_quad_alpha (0, 0, $w, $h);
		2626
		2627	glDisable GL_TEXTURE_2D;
		2628	}
		2629
		2630	#############################################################################
		2631
1996	package CFClient::UI::ImageButton;	2632	package CFPlus::UI::ImageButton;
1997		2633
1998	our @ISA = CFClient::UI::Image::;	2634	our @ISA = CFPlus::UI::Image::;
1999		2635
2000	use CFClient::OpenGL;	2636	use CFPlus::OpenGL;
2001		2637
2002	my %textures;	2638	my %textures;
2003		2639
2004	sub new {	2640	sub new {
2005	my $class = shift;	2641	my $class = shift;
…		…
2027	1	2663	1
2028	}	2664	}
2029		2665
2030	#############################################################################	2666	#############################################################################
2031		2667
2032	package CFClient::UI::CheckBox;
2033
2034	our @ISA = CFClient::UI::DrawBG::;
2035
2036	my @tex =
2037	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040	use CFClient::OpenGL;
2041
2042	sub new {
2043	my $class = shift;
2044
2045	$class->SUPER::new (
2046	padding_x => 2,
2047	padding_y => 2,
2048	fg => [1, 1, 1],
2049	active_fg => [1, 1, 0],
2050	bg => [0, 0, 0, 0.2],
2051	active_bg => [1, 1, 1, 0.5],
2052	state => 0,
2053	can_hover => 1,
2054	@_
2055	)
2056	}
2057
2058	sub size_request {
2059	my ($self) = @_;
2060
2061	(6) x 2
2062	}
2063
2064	sub invoke_button_down {
2065	my ($self, $ev, $x, $y) = @_;
2066
2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069	$self->{state} = !$self->{state};
2070	$self->emit (changed => $self->{state});
2071	} else {
2072	return 0
2073	}
2074
2075	1
2076	}
2077
2078	sub _draw {
2079	my ($self) = @_;
2080
2081	$self->SUPER::_draw;
2082
2083	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085	my ($w, $h) = @$self{qw(w h)};
2086
2087	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091	my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093	glEnable GL_TEXTURE_2D;
2094	$tex->draw_quad_alpha (0, 0, $s, $s);
2095	glDisable GL_TEXTURE_2D;
2096	}
2097
2098	#############################################################################
2099
2100	package CFClient::UI::Image;	2668	package CFPlus::UI::VGauge;
2101		2669
2102	our @ISA = CFClient::UI::Base::;	2670	our @ISA = CFPlus::UI::Base::;
2103
2104	use CFClient::OpenGL;
2105
2106	our %texture_cache;
2107
2108	sub new {
2109	my $class = shift;
2110
2111	my $self = $class->SUPER::new (
2112	can_events => 0,
2113	@_,
2114	);
2115
2116	$self->{path}
2117	or Carp::croak "required attribute 'path' not set";
2118
2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2120	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126	$self
2127	}
2128
2129	sub size_request {
2130	my ($self) = @_;
2131
2132	($self->{tex}{w}, $self->{tex}{h})
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	my $tex = $self->{tex};
2139
2140	my ($w, $h) = ($self->{w}, $self->{h});
2141
2142	if ($self->{rot90}) {
2143	glRotate 90, 0, 0, 1;
2144	glTranslate 0, -$self->{w}, 0;
2145
2146	($w, $h) = ($h, $w);
2147	}
2148
2149	glEnable GL_TEXTURE_2D;
2150	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152	$tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154	glDisable GL_TEXTURE_2D;
2155	}
2156
2157	#############################################################################
2158
2159	package CFClient::UI::VGauge;
2160
2161	our @ISA = CFClient::UI::Base::;
2162		2671
2163	use List::Util qw(min max);	2672	use List::Util qw(min max);
2164		2673
2165	use CFClient::OpenGL;	2674	use CFPlus::OpenGL;
2166		2675
2167	my %tex = (	2676	my %tex = (
2168	food => [	2677	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2678	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2679	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2680	],
2172	grace => [	2681	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2682	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2683	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175	],	2684	],
2176	hp => [	2685	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2686	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2687	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2688	],
2180	mana => [	2689	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2690	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2691	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183	],	2692	],
2184	);	2693	);
2185		2694
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2695	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2755	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2756	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2757
2249	my $h1 = $self->{h} * (1 - $ycut1);	2758	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2759	my $h2 = $self->{h} * (1 - $ycut2);
		2760	my $h3 = $self->{h};
		2761
		2762	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2763
2252	glEnable GL_BLEND;	2764	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2765	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2766	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2767	glEnable GL_TEXTURE_2D;
…		…
2274		2786
2275	if ($t3) {	2787	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2788	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2789	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2790	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2791	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2792	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2793	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2794	glEnd;
2283	}	2795	}
2284		2796
2285	glDisable GL_BLEND;	2797	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2798	glDisable GL_TEXTURE_2D;
2287	}	2799	}
2288		2800
2289	#############################################################################	2801	#############################################################################
2290		2802
2291	package CFClient::UI::Gauge;	2803	package CFPlus::UI::Gauge;
2292		2804
2293	our @ISA = CFClient::UI::VBox::;	2805	our @ISA = CFPlus::UI::VBox::;
2294		2806
2295	sub new {	2807	sub new {
2296	my ($class, %arg) = @_;	2808	my ($class, %arg) = @_;
2297		2809
2298	my $self = $class->SUPER::new (	2810	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2812	can_hover => 1,
2301	can_events => 1,	2813	can_events => 1,
2302	%arg,	2814	%arg,
2303	);	2815	);
2304		2816
2305	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2817	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2818	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2819	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308		2820
2309	$self	2821	$self
2310	}	2822	}
2311		2823
2312	sub set_fontsize {	2824	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2845	$self->{value}->set_text ($val);
2334	}	2846	}
2335		2847
2336	#############################################################################	2848	#############################################################################
2337		2849
2338	package CFClient::UI::Slider;	2850	package CFPlus::UI::Slider;
2339		2851
2340	use strict;	2852	use strict;
2341		2853
2342	use CFClient::OpenGL;	2854	use CFPlus::OpenGL;
2343		2855
2344	our @ISA = CFClient::UI::DrawBG::;	2856	our @ISA = CFPlus::UI::DrawBG::;
2345		2857
2346	my @tex =	2858	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2859	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2860	qw(s1_slider.png s1_slider_bg.png);
2349		2861
2350	sub new {	2862	sub new {
2351	my $class = shift;	2863	my $class = shift;
2352		2864
…		…
2420		2932
2421	$self->SUPER::invoke_button_down ($ev, $x, $y);	2933	$self->SUPER::invoke_button_down ($ev, $x, $y);
2422		2934
2423	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2935	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2424		2936
2425	$self->invoke_mouse_motion ($ev, $x, $y)	2937	$self->invoke_mouse_motion ($ev, $x, $y);
		2938
		2939	1
2426	}	2940	}
2427		2941
2428	sub invoke_mouse_motion {	2942	sub invoke_mouse_motion {
2429	my ($self, $ev, $x, $y) = @_;	2943	my ($self, $ev, $x, $y) = @_;
2430		2944
…		…
2437		2951
2438	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2952	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439	} else {	2953	} else {
2440	return 0;	2954	return 0;
2441	}	2955	}
		2956
		2957	1
		2958	}
		2959
		2960	sub invoke_mouse_wheel {
		2961	my ($self, $ev) = @_;
		2962
		2963	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2964
		2965	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2966
		2967	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2442		2968
2443	1	2969	1
2444	}	2970	}
2445		2971
2446	sub update {	2972	sub update {
…		…
2497	glDisable GL_TEXTURE_2D;	3023	glDisable GL_TEXTURE_2D;
2498	}	3024	}
2499		3025
2500	#############################################################################	3026	#############################################################################
2501		3027
2502	package CFClient::UI::ValSlider;	3028	package CFPlus::UI::ValSlider;
2503		3029
2504	our @ISA = CFClient::UI::HBox::;	3030	our @ISA = CFPlus::UI::HBox::;
2505		3031
2506	sub new {	3032	sub new {
2507	my ($class, %arg) = @_;	3033	my ($class, %arg) = @_;
2508		3034
2509	my $range = delete $arg{range};	3035	my $range = delete $arg{range};
2510		3036
2511	my $self = $class->SUPER::new (	3037	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3038	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3039	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	3040	to_value => sub { shift },
2515	from_value => sub { shift },	3041	from_value => sub { shift },
2516	%arg,	3042	%arg,
2517	);	3043	);
2518		3044
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	3064	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	3065	sub set_value { shift->{slider}->set_value (@_) }
2540		3066
2541	#############################################################################	3067	#############################################################################
2542		3068
2543	package CFClient::UI::TextScroller;	3069	package CFPlus::UI::TextScroller;
2544		3070
2545	our @ISA = CFClient::UI::HBox::;	3071	our @ISA = CFPlus::UI::HBox::;
2546		3072
2547	use CFClient::OpenGL;	3073	use CFPlus::OpenGL;
2548		3074
2549	sub new {	3075	sub new {
2550	my $class = shift;	3076	my $class = shift;
2551		3077
2552	my $self = $class->SUPER::new (	3078	my $self = $class->SUPER::new (
2553	fontsize => 1,	3079	fontsize => 1,
2554	can_events => 0,	3080	can_events => 1,
2555	indent => 0,	3081	indent => 0,
2556	#font => default_font	3082	#font => default_font
2557	@_,	3083	@_,
2558		3084
2559	layout => (new CFClient::Layout 1),	3085	layout => (new CFPlus::Layout),
2560	par => [],	3086	par => [],
		3087	max_par => 0,
2561	height => 0,	3088	height => 0,
2562	children => [	3089	children => [
2563	(new CFClient::UI::Empty expand => 1),	3090	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	3091	(new CFPlus::UI::Slider vertical => 1),
2565	],	3092	],
2566	);	3093	);
2567		3094
2568	$self->{children}[1]->connect (changed => sub { $self->update });	3095	$self->{children}[1]->connect (changed => sub { $self->update });
2569		3096
…		…
2578	}	3105	}
2579		3106
2580	sub size_request {	3107	sub size_request {
2581	my ($self) = @_;	3108	my ($self) = @_;
2582		3109
2583	my ($empty, $slider) = @{ $self->{children} };	3110	my ($empty, $slider) = $self->visible_children;
2584		3111
2585	local $self->{children} = [$empty, $slider];	3112	local $self->{children} = [$empty, $slider];
2586	$self->SUPER::size_request	3113	$self->SUPER::size_request
2587	}	3114	}
2588		3115
…		…
2599		3126
2600	$self->reflow;	3127	$self->reflow;
2601		3128
2602	local $self->{children} = [$empty, $slider];	3129	local $self->{children} = [$empty, $slider];
2603	$self->SUPER::invoke_size_allocate ($w, $h)	3130	$self->SUPER::invoke_size_allocate ($w, $h)
		3131	}
		3132
		3133	sub invoke_mouse_wheel {
		3134	my ($self, $ev) = @_;
		3135
		3136	return 0 unless $ev->{dy}; # only vertical movements
		3137
		3138	$self->{children}[1]->emit (mouse_wheel => $ev);
		3139
		3140	1
2604	}	3141	}
2605		3142
2606	sub get_layout {	3143	sub get_layout {
2607	my ($self, $para) = @_;	3144	my ($self, $para) = @_;
2608		3145
…		…
2636		3173
2637	# todo: base offset on lines or so, not on pixels	3174	# todo: base offset on lines or so, not on pixels
2638	$self->{children}[1]->set_value ($offset);	3175	$self->{children}[1]->set_value ($offset);
2639	}	3176	}
2640		3177
		3178	sub current_paragraph {
		3179	my ($self) = @_;
		3180
		3181	$self->{top_paragraph} - 1
		3182	}
		3183
		3184	sub scroll_to {
		3185	my ($self, $para) = @_;
		3186
		3187	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3188
		3189	$self->{scroll_to} = $para;
		3190	$self->update;
		3191	}
		3192
2641	sub clear {	3193	sub clear {
2642	my ($self) = @_;	3194	my ($self) = @_;
2643		3195
2644	my (undef, undef, @other) = @{ $self->{children} };	3196	my (undef, undef, @other) = @{ $self->{children} };
2645	$self->remove ($_) for @other;	3197	$self->remove ($_) for @other;
…		…
2648	$self->{height} = 0;	3200	$self->{height} = 0;
2649	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3201	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650	}	3202	}
2651		3203
2652	sub add_paragraph {	3204	sub add_paragraph {
2653	my ($self, $color, $para, $indent) = @_;	3205	my $self = shift;
2654		3206
2655	my ($text, @w) = ref $para ? @$para : $para;	3207	for my $para (@_) {
2656
2657	$para = {	3208	$para = {
		3209	fg => [1, 1, 1, 1],
		3210	indent => 0,
		3211	markup => "",
		3212	widget => [],
		3213	ref $para ? %$para : (markup => $para),
2658	w => 1e10,	3214	w => 1e10,
2659	wrapped => 1,	3215	wrapped => 1,
2660	fg => $color,
2661	indent => $indent,
2662	markup => $text,
2663	widget => \@w,
2664	};	3216	};
2665		3217
2666	$self->add (@w) if @w;	3218	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667	push @{$self->{par}}, $para;	3219	push @{$self->{par}}, $para;
		3220	}
		3221
		3222	if (my $max = $self->{max_par}) {
		3223	shift @{$self->{par}} while @{$self->{par}} > $max;
		3224	}
2668		3225
2669	$self->{need_reflow}++;	3226	$self->{need_reflow}++;
2670	$self->update;	3227	$self->update;
2671	}	3228	}
2672		3229
2673	sub scroll_to_bottom {	3230	sub scroll_to_bottom {
2674	my ($self) = @_;	3231	my ($self) = @_;
2675		3232
2676	$self->{scroll_to_bottom} = 1;	3233	$self->{scroll_to} = $#{$self->{par}};
2677	$self->update;	3234	$self->update;
2678	}	3235	}
2679		3236
		3237	sub force_uptodate {
		3238	my ($self) = @_;
		3239
		3240	if (delete $self->{need_reflow}) {
		3241	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3242
		3243	my $height = 0;
		3244
		3245	for my $para (@{$self->{par}}) {
		3246	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3247	my $layout = $self->get_layout ($para);
		3248	my ($w, $h) = $layout->size;
		3249
		3250	$para->{w} = $w + $para->{indent};
		3251	$para->{h} = $h;
		3252	$para->{wrapped} = $layout->has_wrapped;
		3253	}
		3254
		3255	$para->{y} = $height;
		3256	$height += $para->{h};
		3257	}
		3258
		3259	$self->{height} = $height;
		3260	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3261
		3262	delete $self->{texture};
		3263	}
		3264
		3265	if (my $paridx = delete $self->{scroll_to}) {
		3266	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3267	}
		3268	}
		3269
2680	sub update {	3270	sub update {
2681	my ($self) = @_;	3271	my ($self) = @_;
2682		3272
2683	$self->SUPER::update;	3273	$self->SUPER::update;
2684		3274
2685	return unless $self->{h} > 0;	3275	return unless $self->{h} > 0;
2686		3276
2687	delete $self->{texture};	3277	delete $self->{texture};
2688		3278
2689	$ROOT->on_post_alloc ($self => sub {	3279	$ROOT->on_post_alloc ($self => sub {
		3280	$self->force_uptodate;
		3281
2690	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3282	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691		3283
2692	if (delete $self->{need_reflow}) {
2693	my $height = 0;
2694
2695	for my $para (@{$self->{par}}) {
2696	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2697	my $layout = $self->get_layout ($para);
2698	my ($w, $h) = $layout->size;
2699
2700	$para->{w} = $w + $para->{indent};
2701	$para->{h} = $h;
2702	$para->{wrapped} = $layout->has_wrapped;
2703	}
2704
2705	$height += $para->{h};
2706	}
2707
2708	$self->{height} = $height;
2709
2710	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2711
2712	delete $self->{texture};
2713	}
2714
2715	if (delete $self->{scroll_to_bottom}) {
2716	$self->{children}[1]->set_value (1e10);
2717	}
2718
2719	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3284	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720	glClearColor 0, 0, 0, 0;	3285	glClearColor 0, 0, 0, 0;
2721	glClear GL_COLOR_BUFFER_BIT;	3286	glClear GL_COLOR_BUFFER_BIT;
2722		3287
		3288	package CFPlus::UI::Base;
		3289	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3290	(0, 0, $self->{w}, $self->{h});
		3291
		3292	my $top = int $self->{children}[1]{range}[0];
		3293
		3294	my $paridx = 0;
		3295	my $top_paragraph;
2723	my $top = int $self->{children}[1]{range}[0];	3296	my $top = int $self->{children}[1]{range}[0];
2724		3297
2725	my $y0 = $top;	3298	my $y0 = $top;
2726	my $y1 = $top + $H;	3299	my $y1 = $top + $H;
2727		3300
2728	my $y = 0;
2729
2730	glEnable GL_BLEND;
2731	#TODO# not correct in windows where rgba is forced off
2732	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734	for my $para (@{$self->{par}}) {	3301	for my $para (@{$self->{par}}) {
2735	my $h = $para->{h};	3302	my $h = $para->{h};
		3303	my $y = $para->{y};
2736		3304
2737	if ($y0 < $y + $h && $y < $y1) {	3305	if ($y0 < $y + $h && $y < $y1) {
2738
2739	my $layout = $self->get_layout ($para);	3306	my $layout = $self->get_layout ($para);
2740		3307
2741	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743	glRasterPos $para->{indent}, $y - $y0;	3308	$layout->render ($para->{indent}, $y - $y0);
2744	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745		3309
2746	if (my @w = @{ $para->{widget} }) {	3310	if (my @w = @{ $para->{widget} }) {
2747	my @s = $layout->get_shapes;	3311	my @s = $layout->get_shapes;
2748		3312
2749	glDisable GL_BLEND;
2750	for (@w) {	3313	for (@w) {
2751	my ($dx, $dy) = splice @s, 0, 2, ();	3314	my ($dx, $dy) = splice @s, 0, 2, ();
2752		3315
2753	$_->{x} = $dx + $para->{indent};	3316	$_->{x} = $dx + $para->{indent};
2754	$_->{y} = $dy + $y - $y0;	3317	$_->{y} = $dy + $y - $y0;
2755		3318
2756	$_->draw;	3319	$_->draw;
2757	}	3320	}
2758	glEnable GL_BLEND;
2759	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760	}	3321	}
2761	}	3322	}
2762		3323
2763	$y += $h;	3324	$paridx++;
		3325	$top_paragraph ||= $paridx if $y >= $top;
2764	}	3326	}
2765		3327
2766	glDisable GL_BLEND;	3328	$self->{top_paragraph} = $top_paragraph;
2767	};	3329	};
2768	});	3330	});
2769	}	3331	}
2770		3332
2771	sub reconfigure {	3333	sub reconfigure {
…		…
2789	$self->{children}[1]->draw;	3351	$self->{children}[1]->draw;
2790	}	3352	}
2791		3353
2792	#############################################################################	3354	#############################################################################
2793		3355
2794	package CFClient::UI::Animator;	3356	package CFPlus::UI::Animator;
2795		3357
2796	use CFClient::OpenGL;	3358	use CFPlus::OpenGL;
2797		3359
2798	our @ISA = CFClient::UI::Bin::;	3360	our @ISA = CFPlus::UI::Bin::;
2799		3361
2800	sub moveto {	3362	sub moveto {
2801	my ($self, $x, $y) = @_;	3363	my ($self, $x, $y) = @_;
2802		3364
2803	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3365	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2831	glPopMatrix;	3393	glPopMatrix;
2832	}	3394	}
2833		3395
2834	#############################################################################	3396	#############################################################################
2835		3397
2836	package CFClient::UI::Flopper;	3398	package CFPlus::UI::Flopper;
2837		3399
2838	our @ISA = CFClient::UI::Button::;	3400	our @ISA = CFPlus::UI::Button::;
2839		3401
2840	sub new {	3402	sub new {
2841	my $class = shift;	3403	my $class = shift;
2842		3404
2843	my $self = $class->SUPER::new (	3405	my $self = $class->SUPER::new (
…		…
2855	$self->{other}->toggle_visibility;	3417	$self->{other}->toggle_visibility;
2856	}	3418	}
2857		3419
2858	#############################################################################	3420	#############################################################################
2859		3421
2860	package CFClient::UI::Tooltip;	3422	package CFPlus::UI::Tooltip;
2861		3423
2862	our @ISA = CFClient::UI::Bin::;	3424	our @ISA = CFPlus::UI::Bin::;
2863		3425
2864	use CFClient::OpenGL;	3426	use CFPlus::OpenGL;
2865		3427
2866	sub new {	3428	sub new {
2867	my $class = shift;	3429	my $class = shift;
2868		3430
2869	$class->SUPER::new (	3431	$class->SUPER::new (
…		…
2872	)	3434	)
2873	}	3435	}
2874		3436
2875	sub set_tooltip_from {	3437	sub set_tooltip_from {
2876	my ($self, $widget) = @_;	3438	my ($self, $widget) = @_;
		3439
		3440	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3441	if $widget->{tooltip} =~ /^#(.*)$/;
2877		3442
2878	my $tooltip = $widget->{tooltip};	3443	my $tooltip = $widget->{tooltip};
2879		3444
2880	if ($ENV{CFPLUS_DEBUG} & 2) {	3445	if ($ENV{CFPLUS_DEBUG} & 2) {
2881	$tooltip .= "\n\n" . (ref $widget) . "\n"	3446	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2885	}	3450	}
2886		3451
2887	$tooltip =~ s/^\n+//;	3452	$tooltip =~ s/^\n+//;
2888	$tooltip =~ s/\n+$//;	3453	$tooltip =~ s/\n+$//;
2889		3454
2890	$self->add (new CFClient::UI::Label	3455	$self->add (new CFPlus::UI::Label
2891	markup => $tooltip,	3456	markup => $tooltip,
2892	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3457	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893	fontsize => 0.8,	3458	fontsize => 0.8,
2894	fg => [0, 0, 0, 1],	3459	style => 1, # FLAG_INVERSE
2895	ellipsise => 0,	3460	ellipsise => 0,
2896	font => ($widget->{tooltip_font} || $::FONT_PROP),	3461	font => ($widget->{tooltip_font} || $::FONT_PROP),
2897	);	3462	);
2898	}	3463	}
2899		3464
…		…
2918		3483
2919	$self->{root}->on_post_alloc ("move_$self" => sub {	3484	$self->{root}->on_post_alloc ("move_$self" => sub {
2920	my $widget = $self->{owner}	3485	my $widget = $self->{owner}
2921	or return;	3486	or return;
2922		3487
		3488	if ($widget->{visible}) {
2923	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3489	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924		3490
2925	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3491	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926	if $x + $self->{w} > $self->{root}{w};	3492	if $x + $self->{w} > $self->{root}{w};
2927		3493
2928	$self->move_abs ($x, $y);	3494	$self->move_abs ($x, $y);
		3495	} else {
		3496	$self->hide;
		3497	}
2929	});	3498	});
2930	}	3499	}
2931		3500
2932	sub _draw {	3501	sub _draw {
2933	my ($self) = @_;	3502	my ($self) = @_;
…		…
2935	glTranslate 0.375, 0.375;	3504	glTranslate 0.375, 0.375;
2936		3505
2937	my ($w, $h) = @$self{qw(w h)};	3506	my ($w, $h) = @$self{qw(w h)};
2938		3507
2939	glColor 1, 0.8, 0.4;	3508	glColor 1, 0.8, 0.4;
2940	glBegin GL_QUADS;	3509	glRect 0, 0, $w, $h;
2941	glVertex 0 , 0;
2942	glVertex 0 , $h;
2943	glVertex $w, $h;
2944	glVertex $w, 0;
2945	glEnd;
2946		3510
2947	glColor 0, 0, 0;	3511	glColor 0, 0, 0;
2948	glBegin GL_LINE_LOOP;	3512	glBegin GL_LINE_LOOP;
2949	glVertex 0 , 0;	3513	glVertex 0 , 0;
2950	glVertex 0 , $h;	3514	glVertex 0 , $h;
…		…
2957	$self->SUPER::_draw;	3521	$self->SUPER::_draw;
2958	}	3522	}
2959		3523
2960	#############################################################################	3524	#############################################################################
2961		3525
2962	package CFClient::UI::Face;	3526	package CFPlus::UI::Face;
2963		3527
2964	our @ISA = CFClient::UI::Base::;	3528	our @ISA = CFPlus::UI::DrawBG::;
2965		3529
2966	use CFClient::OpenGL;	3530	use CFPlus::OpenGL;
2967		3531
2968	sub new {	3532	sub new {
2969	my $class = shift;	3533	my $class = shift;
2970		3534
2971	my $self = $class->SUPER::new (	3535	my $self = $class->SUPER::new (
		3536	size_w => 32,
		3537	size_h => 8,
2972	aspect => 1,	3538	aspect => 1,
2973	can_events => 0,	3539	can_events => 0,
2974	@_,	3540	@_,
2975	);	3541	);
2976		3542
2977	if ($self->{anim} && $self->{animspeed}) {	3543	if ($self->{anim} && $self->{animspeed}) {
2978	Scalar::Util::weaken (my $widget = $self);	3544	CFPlus::weaken (my $widget = $self);
2979		3545
		3546	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3547	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2980	$self->{timer} = Event->timer (	3548	$self->{timer} = Event->timer (
2981	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2982	hard => 1,	3549	parked => 1,
2983	interval => $self->{animspeed},
2984	cb => sub {	3550	cb => sub {
		3551	return unless $::CONN && $widget;
		3552
2985	++$widget->{frame};	3553	++$widget->{frame};
		3554	$widget->update_face;
2986	$widget->update;	3555	$widget->update;
		3556
		3557	$widget->update_timer;
2987	},	3558	},
2988	);	3559	);
		3560
		3561	$self->update_face;
		3562	$self->update_timer;
2989	}	3563	}
2990		3564
2991	$self	3565	$self
2992	}	3566	}
2993		3567
		3568	sub update_timer {
		3569	my ($self) = @_;
		3570
		3571	return unless $self->{timer};
		3572
		3573	if ($self->{visible}) {
		3574	$self->{timer}->at (
		3575	$self->{anim_start}
		3576	+ $self->{animspeed}
		3577	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3578	);
		3579	$self->{timer}->start;
		3580	} else {
		3581	$self->{timer}->stop;
		3582	}
		3583	}
		3584
		3585	sub update_face {
		3586	my ($self) = @_;
		3587
		3588	return unless $::CONN;
		3589
		3590	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3591	if ($anim && @$anim) {
		3592	delete $self->{wait_face};
		3593	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3594	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
		3595	unless ($tex->{name} || $tex->{loading}) {
		3596	$tex->upload (sub { $self->reconfigure });
		3597	}
		3598	}
		3599	}
		3600	}
		3601	}
		3602
2994	sub size_request {	3603	sub size_request {
2995	(32, 8)	3604	my ($self) = @_;
		3605
		3606	if ($::CONN) {
		3607	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3608	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3609	if ($tex->{name}) {
		3610	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3611	} elsif (!$tex->{loading}) {
		3612	$tex->upload (sub { $self->reconfigure });
		3613	}
		3614	} else {
		3615	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3616	$self->reconfigure;
		3617	});
		3618	}
		3619	}
		3620	}
		3621
		3622	($self->{size_w} || 8, $self->{size_h} || 8)
2996	}	3623	}
2997		3624
2998	sub update {	3625	sub update {
2999	my ($self) = @_;	3626	my ($self) = @_;
3000		3627
3001	return unless $self->{visible};	3628	return unless $self->{visible};
3002		3629
3003	$self->SUPER::update;	3630	$self->SUPER::update;
3004	}	3631	}
3005		3632
		3633	sub invoke_visibility_change {
		3634	my ($self) = @_;
		3635
		3636	$self->update_timer;
		3637
		3638	0
		3639	}
		3640
3006	sub _draw {	3641	sub _draw {
3007	my ($self) = @_;	3642	my ($self) = @_;
3008		3643
3009	return unless $::CONN;	3644	$self->SUPER::_draw;
3010		3645
3011	my $face;	3646	if (my $tex = $self->{tex}) {
3012
3013	if ($self->{frame}) {
3014	my $anim = $::CONN->{anim}[$self->{anim}];
3015
3016	$face = $anim->[ $self->{frame} % @$anim ]
3017	if $anim && @$anim;
3018	}
3019
3020	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3021
3022	if ($tex) {
3023	glEnable GL_TEXTURE_2D;	3647	glEnable GL_TEXTURE_2D;
3024	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3648	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3025	glColor 0, 0, 0, 1;	3649	glColor 0, 0, 0, 1;
3026	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3650	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3027	glDisable GL_TEXTURE_2D;	3651	glDisable GL_TEXTURE_2D;
…		…
3029	}	3653	}
3030		3654
3031	sub destroy {	3655	sub destroy {
3032	my ($self) = @_;	3656	my ($self) = @_;
3033		3657
3034	$self->{timer}->cancel	3658	(delete $self->{timer})->cancel
3035	if $self->{timer};	3659	if $self->{timer};
3036		3660
3037	$self->SUPER::destroy;	3661	$self->SUPER::destroy;
3038	}	3662	}
3039		3663
3040	#############################################################################	3664	#############################################################################
3041		3665
3042	package CFClient::UI::Buttonbar;	3666	package CFPlus::UI::Buttonbar;
3043		3667
3044	our @ISA = CFClient::UI::HBox::;	3668	our @ISA = CFPlus::UI::HBox::;
3045		3669
3046	# TODO: should actualyl wrap buttons and other goodies.	3670	# TODO: should actually wrap buttons and other goodies.
3047		3671
3048	#############################################################################	3672	#############################################################################
3049		3673
3050	package CFClient::UI::Menu;	3674	package CFPlus::UI::Menu;
3051		3675
3052	our @ISA = CFClient::UI::FancyFrame::;	3676	our @ISA = CFPlus::UI::Toplevel::;
3053		3677
3054	use CFClient::OpenGL;	3678	use CFPlus::OpenGL;
3055		3679
3056	sub new {	3680	sub new {
3057	my $class = shift;	3681	my $class = shift;
3058		3682
3059	my $self = $class->SUPER::new (	3683	my $self = $class->SUPER::new (
3060	items => [],	3684	items => [],
3061	z => 100,	3685	z => 100,
3062	@_,	3686	@_,
3063	);	3687	);
3064		3688
3065	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3689	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066		3690
3067	for my $item (@{ $self->{items} }) {	3691	for my $item (@{ $self->{items} }) {
3068	my ($widget, $cb, $tooltip) = @$item;	3692	my ($widget, $cb, $tooltip) = @$item;
3069		3693
3070	# handle various types of items, only text for now	3694	# handle various types of items, only text for now
3071	if (!ref $widget) {	3695	if (!ref $widget) {
		3696	if ($widget =~ /\t/) {
		3697	my ($left, $right) = split /\t/, $widget, 2;
		3698
3072	$widget = new CFClient::UI::Label	3699	$widget = new CFPlus::UI::HBox
3073	can_hover => 1,	3700	can_hover => 1,
3074	can_events => 1,	3701	can_events => 1,
		3702	tooltip => $tooltip,
		3703	children => [
		3704	(new CFPlus::UI::Label markup => $left, expand => 1),
		3705	(new CFPlus::UI::Label markup => $right, align => +1),
		3706	],
		3707	;
		3708
		3709	} else {
		3710	$widget = new CFPlus::UI::Label
		3711	can_hover => 1,
		3712	can_events => 1,
3075	markup => $widget,	3713	markup => $widget,
3076	tooltip => $tooltip	3714	tooltip => $tooltip;
		3715	}
3077	}	3716	}
3078		3717
3079	$self->{item}{$widget} = $item;	3718	$self->{item}{$widget} = $item;
3080		3719
3081	$self->{vbox}->add ($widget);	3720	$self->{vbox}->add ($widget);
…		…
3124	1	3763	1
3125	}	3764	}
3126		3765
3127	#############################################################################	3766	#############################################################################
3128		3767
3129	package CFClient::UI::Multiplexer;	3768	package CFPlus::UI::Multiplexer;
3130		3769
3131	our @ISA = CFClient::UI::Container::;	3770	our @ISA = CFPlus::UI::Container::;
3132		3771
3133	sub new {	3772	sub new {
3134	my $class = shift;	3773	my $class = shift;
3135		3774
3136	my $self = $class->SUPER::new (	3775	my $self = $class->SUPER::new (
…		…
3150		3789
3151	$self->{current} = $self->{children}[0]	3790	$self->{current} = $self->{children}[0]
3152	if @{ $self->{children} };	3791	if @{ $self->{children} };
3153	}	3792	}
3154		3793
		3794	sub get_current_page {
		3795	my ($self) = @_;
		3796
		3797	$self->{current}
		3798	}
		3799
3155	sub set_current_page {	3800	sub set_current_page {
3156	my ($self, $page_or_widget) = @_;	3801	my ($self, $page_or_widget) = @_;
3157		3802
3158	my $widget = ref $page_or_widget	3803	my $widget = ref $page_or_widget
3159	? $page_or_widget	3804	? $page_or_widget
…		…
3191	$self->{current}->draw;	3836	$self->{current}->draw;
3192	}	3837	}
3193		3838
3194	#############################################################################	3839	#############################################################################
3195		3840
3196	package CFClient::UI::Notebook;	3841	package CFPlus::UI::Notebook;
3197		3842
3198	our @ISA = CFClient::UI::VBox::;	3843	our @ISA = CFPlus::UI::VBox::;
3199		3844
3200	sub new {	3845	sub new {
3201	my $class = shift;	3846	my $class = shift;
3202		3847
3203	my $self = $class->SUPER::new (	3848	my $self = $class->SUPER::new (
3204	buttonbar => (new CFClient::UI::Buttonbar),	3849	buttonbar => (new CFPlus::UI::Buttonbar),
3205	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3850	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206	# filter => # will be put between multiplexer and $self	3851	# filter => # will be put between multiplexer and $self
3207	@_,	3852	@_,
3208	);	3853	);
3209		3854
3210	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3855	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3211	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3856	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3212		3857
		3858	{
		3859	Scalar::Util::weaken (my $wself = $self);
		3860
		3861	$self->{multiplexer}->connect (c_add => sub {
		3862	my ($mplex, $widgets) = @_;
		3863
		3864	for my $child (@$widgets) {
		3865	Scalar::Util::weaken $child;
		3866	$child->{c_tab_} ||= do {
		3867	my $tab =
		3868	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3869	? $child->{c_tab}
		3870	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3871
		3872	$tab->connect (activate => sub {
		3873	$wself->set_current_page ($child);
		3874	});
		3875
		3876	$tab
		3877	};
		3878
		3879	$self->{buttonbar}->add ($child->{c_tab_});
		3880	}
		3881	});
		3882
		3883	$self->{multiplexer}->connect (c_remove => sub {
		3884	my ($mplex, $widgets) = @_;
		3885
		3886	for my $child (@$widgets) {
		3887	$wself->{buttonbar}->remove ($child->{c_tab_});
		3888	}
		3889	});
		3890	}
		3891
3213	$self	3892	$self
3214	}	3893	}
3215		3894
3216	sub add {	3895	sub add {
		3896	my ($self, @widgets) = @_;
		3897
		3898	$self->{multiplexer}->add (@widgets)
		3899	}
		3900
		3901	sub remove {
		3902	my ($self, @widgets) = @_;
		3903
		3904	$self->{multiplexer}->remove (@widgets)
		3905	}
		3906
		3907	sub pages {
		3908	my ($self) = @_;
		3909	$self->{multiplexer}->children
		3910	}
		3911
		3912	sub add_tab {
3217	my ($self, $title, $widget, $tooltip) = @_;	3913	my ($self, $title, $widget, $tooltip) = @_;
3218		3914
3219	Scalar::Util::weaken $self;	3915	$title = [$title, $tooltip] unless ref $title;
		3916	$widget->{c_tab} = $title;
3220		3917
3221	$self->{buttonbar}->add (new CFClient::UI::Button
3222	markup => $title,
3223	tooltip => $tooltip,
3224	on_activate => sub { $self->set_current_page ($widget) },
3225	);
3226
3227	$self->{multiplexer}->add ($widget);	3918	$self->add ($widget);
		3919	}
		3920
		3921	sub get_current_page {
		3922	my ($self) = @_;
		3923
		3924	$self->{multiplexer}->get_current_page
3228	}	3925	}
3229		3926
3230	sub set_current_page {	3927	sub set_current_page {
3231	my ($self, $page) = @_;	3928	my ($self, $page) = @_;
3232		3929
…		…
3234	$self->emit (page_changed => $self->{multiplexer}{current});	3931	$self->emit (page_changed => $self->{multiplexer}{current});
3235	}	3932	}
3236		3933
3237	#############################################################################	3934	#############################################################################
3238		3935
3239	package CFClient::UI::Combobox;	3936	package CFPlus::UI::Selector;
3240		3937
3241	use utf8;	3938	use utf8;
3242		3939
3243	our @ISA = CFClient::UI::Button::;	3940	our @ISA = CFPlus::UI::Button::;
3244		3941
3245	sub new {	3942	sub new {
3246	my $class = shift;	3943	my $class = shift;
3247		3944
3248	my $self = $class->SUPER::new (	3945	my $self = $class->SUPER::new (
…		…
3265	my ($value, $title, $tooltip) = @$_;	3962	my ($value, $title, $tooltip) = @$_;
3266		3963
3267	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3964	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268	}	3965	}
3269		3966
3270	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3967	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271	}	3968	}
3272		3969
3273	sub _set_value {	3970	sub _set_value {
3274	my ($self, $value) = @_;	3971	my ($self, $value) = @_;
3275		3972
…		…
3290	$self->emit (changed => $value);	3987	$self->emit (changed => $value);
3291	}	3988	}
3292		3989
3293	#############################################################################	3990	#############################################################################
3294		3991
3295	package CFClient::UI::Statusbox;	3992	package CFPlus::UI::Statusbox;
3296		3993
3297	our @ISA = CFClient::UI::VBox::;	3994	our @ISA = CFPlus::UI::VBox::;
3298		3995
3299	sub new {	3996	sub new {
3300	my $class = shift;	3997	my $class = shift;
3301		3998
3302	my $self = $class->SUPER::new (	3999	my $self = $class->SUPER::new (
3303	fontsize => 0.8,	4000	fontsize => 0.8,
3304	@_,	4001	@_,
3305	);	4002	);
3306		4003
3307	Scalar::Util::weaken (my $this = $self);	4004	CFPlus::weaken (my $this = $self);
3308		4005
3309	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4006	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310		4007
3311	$self	4008	$self
3312	}	4009	}
…		…
3314	sub reorder {	4011	sub reorder {
3315	my ($self) = @_;	4012	my ($self) = @_;
3316	my $NOW = Time::HiRes::time;	4013	my $NOW = Time::HiRes::time;
3317		4014
3318	# freeze display when hovering over any label	4015	# freeze display when hovering over any label
3319	return if $CFClient::UI::TOOLTIP->{owner}	4016	return if $CFPlus::UI::TOOLTIP->{owner}
3320	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4017	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321	values %{ $self->{item} };	4018	values %{ $self->{item} };
3322		4019
3323	while (my ($k, $v) = each %{ $self->{item} }) {	4020	while (my ($k, $v) = each %{ $self->{item} }) {
3324	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4021	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325	}	4022	}
…		…
3346	for ($short) {	4043	for ($short) {
3347	s/^\s+//;	4044	s/^\s+//;
3348	s/\s+/ /g;	4045	s/\s+/ /g;
3349	}	4046	}
3350		4047
3351	new CFClient::UI::Label	4048	new CFPlus::UI::Label
3352	markup => $short,	4049	markup => $short,
3353	tooltip => $item->{tooltip},	4050	tooltip => $item->{tooltip},
3354	tooltip_font => $::FONT_PROP,	4051	tooltip_font => $::FONT_PROP,
3355	tooltip_width => 0.67,	4052	tooltip_width => 0.67,
3356	fontsize => $item->{fontsize} || $self->{fontsize},	4053	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3410	count => 1,	4107	count => 1,
3411	%arg,	4108	%arg,
3412	};	4109	};
3413	}	4110	}
3414		4111
		4112	$ROOT->on_refresh (reorder => sub {
3415	$self->reorder;	4113	$self->reorder;
		4114	});
3416	}	4115	}
3417		4116
3418	sub reconfigure {	4117	sub reconfigure {
3419	my ($self) = @_;	4118	my ($self) = @_;
3420		4119
…		…
3433	$self->SUPER::destroy;	4132	$self->SUPER::destroy;
3434	}	4133	}
3435		4134
3436	#############################################################################	4135	#############################################################################
3437		4136
3438	package CFClient::UI::Inventory;
3439
3440	our @ISA = CFClient::UI::ScrolledWindow::;
3441
3442	sub new {
3443	my $class = shift;
3444
3445	my $self = $class->SUPER::new (
3446	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3447	@_,
3448	);
3449
3450	$self
3451	}
3452
3453	sub set_items {
3454	my ($self, $items) = @_;
3455
3456	$self->{child}->clear;
3457	return unless $items;
3458
3459	my @items = sort {
3460	($a->{type} <=> $b->{type})
3461	or ($a->{name} cmp $b->{name})
3462	} @$items;
3463
3464	$self->{real_items} = \@items;
3465
3466	my $row = 0;
3467	for my $item (@items) {
3468	CFClient::Item::update_widgets $item;
3469
3470	$self->{child}->add (0, $row, $item->{face_widget});
3471	$self->{child}->add (1, $row, $item->{desc_widget});
3472	$self->{child}->add (2, $row, $item->{weight_widget});
3473
3474	$row++;
3475	}
3476	}
3477
3478	#############################################################################
3479
3480	package CFClient::UI::SpellList;
3481
3482	our @ISA = CFClient::UI::Table::;
3483
3484	sub new {
3485	my $class = shift;
3486
3487	my $self = $class->SUPER::new (
3488	binding => [],
3489	commands => [],
3490	@_,
3491	)
3492	}
3493
3494	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506
3507	sub rebuild_spell_list {
3508	my ($self) = @_;
3509
3510	$CFClient::UI::ROOT->on_refresh ($self => sub {
3511	$self->clear;
3512
3513	return unless $::CONN;
3514
3515	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521	my $row = 0;
3522
3523	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524	my $spell = $self->{spell}{$_};
3525
3526	$row++;
3527
3528	my $spell_cb = sub {
3529	my ($widget, $ev) = @_;
3530
3531	if ($ev->{button} == 1) {
3532	$::CONN->user_send ("cast $spell->{name}");
3533	} elsif ($ev->{button} == 2) {
3534	$::CONN->user_send ("invoke $spell->{name}");
3535	} elsif ($ev->{button} == 3) {
3536	(new CFClient::UI::Menu
3537	items => [
3538	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540	],
3541	)->popup ($ev);
3542	} else {
3543	return 0;
3544	}
3545
3546	1
3547	};
3548
3549	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551	#TODO: add path info to tooltip
3552	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554	$self->add (0, $row, new CFClient::UI::Face
3555	face => $spell->{face},
3556	can_hover => 1,
3557	can_events => 1,
3558	tooltip => $tooltip,
3559	on_button_down => $spell_cb,
3560	);
3561
3562	$self->add (1, $row, new CFClient::UI::Label
3563	expand => 1,
3564	text => $spell->{name},
3565	can_hover => 1,
3566	can_events => 1,
3567	tooltip => $tooltip,
3568	on_button_down => $spell_cb,
3569	);
3570
3571	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575	}
3576	});
3577	}
3578
3579	sub add_spell {
3580	my ($self, $spell) = @_;
3581
3582	$self->{spell}->{$spell->{name}} = $spell;
3583	$self->rebuild_spell_list;
3584	}
3585
3586	sub remove_spell {
3587	my ($self, $spell) = @_;
3588
3589	delete $self->{spell}->{$spell->{name}};
3590	$self->rebuild_spell_list;
3591	}
3592
3593	sub clear_spells {
3594	my ($self) = @_;
3595
3596	$self->{spell} = {};
3597	$self->rebuild_spell_list;
3598	}
3599
3600	#############################################################################
3601
3602	package CFClient::UI::Root;	4137	package CFPlus::UI::Root;
3603		4138
3604	our @ISA = CFClient::UI::Container::;	4139	our @ISA = CFPlus::UI::Container::;
3605		4140
3606	use List::Util qw(min max);	4141	use List::Util qw(min max);
3607		4142
3608	use CFClient::OpenGL;	4143	use CFPlus::OpenGL;
3609		4144
3610	sub new {	4145	sub new {
3611	my $class = shift;	4146	my $class = shift;
3612		4147
3613	my $self = $class->SUPER::new (	4148	my $self = $class->SUPER::new (
3614	visible => 1,	4149	visible => 1,
3615	@_,	4150	@_,
3616	);	4151	);
3617		4152
3618	Scalar::Util::weaken ($self->{root} = $self);	4153	CFPlus::weaken ($self->{root} = $self);
3619		4154
3620	$self	4155	$self
3621	}	4156	}
3622		4157
3623	sub size_request {	4158	sub size_request {
…		…
3671	}	4206	}
3672		4207
3673	sub update {	4208	sub update {
3674	my ($self) = @_;	4209	my ($self) = @_;
3675		4210
3676	$::WANT_REFRESH++;	4211	$::WANT_REFRESH->start;
3677	}	4212	}
3678		4213
3679	sub add {	4214	sub add {
3680	my ($self, @children) = @_;	4215	my ($self, @children) = @_;
3681		4216
…		…
3718	while ($self->{refresh_hook}) {	4253	while ($self->{refresh_hook}) {
3719	$_->()	4254	$_->()
3720	for values %{delete $self->{refresh_hook}};	4255	for values %{delete $self->{refresh_hook}};
3721	}	4256	}
3722		4257
3723	if ($self->{realloc}) {	4258	while ($self->{realloc}) {
3724	my %queue;	4259	my %queue;
3725	my @queue;	4260	my @queue;
3726	my $widget;	4261	my $widget;
3727		4262
3728	outer:	4263	outer:
…		…
3775	}	4310	}
3776	}	4311	}
3777		4312
3778	delete $self->{realloc}{$widget+0};	4313	delete $self->{realloc}{$widget+0};
3779	}	4314	}
3780	}
3781		4315
3782	while (my $size_alloc = delete $self->{size_alloc}) {	4316	while (my $size_alloc = delete $self->{size_alloc}) {
3783	my @queue = sort { $b->{visible} <=> $a->{visible} }	4317	my @queue = sort { $a->{visible} <=> $b->{visible} }
3784	values %$size_alloc;	4318	values %$size_alloc;
3785		4319
3786	while () {	4320	while () {
3787	my $widget = pop @queue || last;	4321	my $widget = pop @queue || last;
3788		4322
3789	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4323	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3790		4324
3791	$w = 0 if $w < 0;	4325	$w = max $widget->{min_w}, $w;
3792	$h = 0 if $h < 0;	4326	$h = max $widget->{min_h}, $h;
3793		4327
		4328	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4329	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4330
		4331	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4332	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4333
3794	$w = int $w + 0.5;	4334	$w = int $w + 0.5;
3795	$h = int $h + 0.5;	4335	$h = int $h + 0.5;
3796		4336
3797	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4337	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798	$widget->{old_w} = $widget->{w};	4338	$widget->{old_w} = $widget->{w};
3799	$widget->{old_h} = $widget->{h};	4339	$widget->{old_h} = $widget->{h};
3800		4340
3801	$widget->{w} = $w;	4341	$widget->{w} = $w;
3802	$widget->{h} = $h;	4342	$widget->{h} = $h;
3803		4343
3804	$widget->emit (size_allocate => $w, $h);	4344	$widget->emit (size_allocate => $w, $h);
		4345	}
3805	}	4346	}
3806	}	4347	}
3807	}	4348	}
3808		4349
3809	while ($self->{post_alloc_hook}) {	4350	while ($self->{post_alloc_hook}) {
3810	$_->()	4351	$_->()
3811	for values %{delete $self->{post_alloc_hook}};	4352	for values %{delete $self->{post_alloc_hook}};
3812	}	4353	}
3813
3814		4354
3815	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4355	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3816	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4356	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3817	glClear GL_COLOR_BUFFER_BIT;	4357	glClear GL_COLOR_BUFFER_BIT;
3818		4358
…		…
3821	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4361	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3822	glMatrixMode GL_MODELVIEW;	4362	glMatrixMode GL_MODELVIEW;
3823	glLoadIdentity;	4363	glLoadIdentity;
3824		4364
3825	{	4365	{
3826	package CFClient::UI::Base;	4366	package CFPlus::UI::Base;
3827		4367
3828	($draw_x, $draw_y, $draw_w, $draw_h) =	4368	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3829	(0, 0, $self->{w}, $self->{h});	4369	(0, 0, $self->{w}, $self->{h});
3830	}
3831		4370
3832	$self->_draw;	4371	$self->_draw;
		4372	}
3833	}	4373	}
3834		4374
3835	#############################################################################	4375	#############################################################################
3836		4376
3837	package CFClient::UI;	4377	package CFPlus::UI;
3838		4378
3839	$ROOT = new CFClient::UI::Root;	4379	$ROOT = new CFPlus::UI::Root;
3840	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4380	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3841		4381
3842	1	4382	1
3843		4383

Diff Legend

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