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

Diff Legend

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