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

Diff Legend

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