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.284 by root, Mon Jun 5 03:06:04 2006 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
18	our $BUTTON_STATE;	18	our $BUTTON_STATE;
19		19
20	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
21		21
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	return if $ENV{CFPLUS_DEBUG} & 8;
24
25	if (!$GRAB) {	23	if (!$GRAB) {
26	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
27	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
28	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
29	$TOOLTIP->hide;	28	$TOOLTIP->hide;
30		29
31	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
		32
		33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
35	$tip = $tip->($widget) if CODE:: eq ref $tip;	37	$tip = $tip->($widget) if CODE:: eq ref $tip;
36		38
…		…
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
…		…
315	}	348	}
316		349
317	sub move_abs {	350	sub move_abs {
318	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
319		352
320	$self->{x} = List::Util::max 0, int $x;	353	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321	$self->{y} = List::Util::max 0, int $y;	354	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322	$self->{z} = $z if defined $z;	355	$self->{z} = $z if defined $z;
323		356
324	$self->update;	357	$self->update;
325	}	358	}
326		359
…		…
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);
		1926
1559	delete $self->{req_h};	1927	delete $self->{size_req};
1560
1561	$self->realloc;	1928	$self->realloc;
1562	$self->update;	1929	$self->update;
1563	}	1930	}
1564		1931
1565	sub set_markup {	1932	sub set_markup {
…		…
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);
		1941
1575	delete $self->{req_h};	1942	delete $self->{size_req};
1576
1577	$self->realloc;	1943	$self->realloc;
1578	$self->update;	1944	$self->update;
1579	}	1945	}
1580		1946
1581	sub size_request {	1947	sub size_request {
1582	my ($self) = @_;	1948	my ($self) = @_;
1583		1949
1584	if (exists $self->{req_h}) {	1950	$self->{size_req} ||= do {
1585	@$self{qw(req_w req_h)}
1586	} else {
1587	$self->{layout}->set_font ($self->{font}) if $self->{font};	1951	$self->{layout}->set_font ($self->{font}) if $self->{font};
1588	$self->{layout}->set_width ($self->{max_w} || -1);	1952	$self->{layout}->set_width ($self->{max_w} || -1);
1589	$self->{layout}->set_ellipsise ($self->{ellipsise});	1953	$self->{layout}->set_ellipsise ($self->{ellipsise});
1590	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1954	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1955	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592		1956
1593	my ($w, $h) = $self->{layout}->size;	1957	my ($w, $h) = $self->{layout}->size;
1594		1958
1595	if (exists $self->{template}) {	1959	if (exists $self->{template}) {
1596	$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);
1597	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1962	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598		1963
1599	my ($w2, $h2) = $self->{template}->size;	1964	my ($w2, $h2) = $self->{template}->size;
1600		1965
1601	$w = List::Util::max $w, $w2;	1966	$w = List::Util::max $w, $w2;
1602	$h = List::Util::max $h, $h2;	1967	$h = List::Util::max $h, $h2;
1603	}	1968	}
1604		1969
1605	($w, $h)	1970	[$w, $h]
1606	}	1971	};
1607	}
1608		1972
		1973	@{ $self->{size_req} }
		1974	}
		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
		2001	sub reconfigure {
		2002	my ($self) = @_;
		2003
		2004	delete $self->{size_req};
		2005	delete $self->{texture};
		2006
		2007	$self->SUPER::reconfigure;
		2008	}
		2009
1627	sub _draw {	2010	sub _draw {
1628	my ($self) = @_;	2011	my ($self) = @_;
1629		2012
1630	$self->SUPER::_draw; # draw background, if applicable	2013	$self->SUPER::_draw; # draw background, if applicable
1631		2014
1632	my $tex = $self->{texture} ||= do {	2015	my $size = $self->{texture} ||= do {
1633	$self->{layout}->set_foreground (@{$self->{fg}});	2016	$self->{layout}->set_foreground (@{$self->{fg}});
1634	$self->{layout}->set_font ($self->{font}) if $self->{font};	2017	$self->{layout}->set_font ($self->{font}) if $self->{font};
1635	$self->{layout}->set_width ($self->{w});	2018	$self->{layout}->set_width ($self->{w});
1636	$self->{layout}->set_ellipsise ($self->{ellipsise});	2019	$self->{layout}->set_ellipsise ($self->{ellipsise});
1637	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2020	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2021	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639		2022
1640	new_from_layout CFClient::Texture $self->{layout}	2023	[$self->{layout}->size]
1641	};	2024	};
1642		2025
1643	unless (exists $self->{ox}) {	2026	unless (exists $self->{ox}) {
1644	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2027	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2028	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646	: ($self->{w} - $tex->{w}) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
1647		2030
1648	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650	: ($self->{h} - $tex->{h}) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1651	};	2036	};
1652		2037
1653	glEnable GL_TEXTURE_2D;	2038	# unless ($self->{list}) {
1654	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2039	# $self->{list} = CFPlus::OpenGL::glGenList;
		2040	# CFPlus::OpenGL::glNewList $self->{list};
		2041	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2042	# CFPlus::OpenGL::glEndList;
		2043	# }
		2044	#
		2045	# CFPlus::OpenGL::glCallList $self->{list};
1655		2046
1656	glColor_premultiply @{$self->{fg}}	2047	$self->{layout}->draw;
1657	if $tex->{format} == GL_ALPHA;
1658
1659	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1660
1661	glDisable GL_TEXTURE_2D;
1662	}	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	#}
1663		2057
1664	#############################################################################	2058	#############################################################################
1665		2059
1666	package CFClient::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
1667		2061
1668	our @ISA = CFClient::UI::Label::;	2062	our @ISA = CFPlus::UI::Label::;
1669		2063
1670	use CFClient::OpenGL;	2064	use CFPlus::OpenGL;
1671		2065
1672	sub new {	2066	sub new {
1673	my $class = shift;	2067	my $class = shift;
1674		2068
1675	$class->SUPER::new (	2069	$class->SUPER::new (
1676	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
1677	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
1678	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
1679	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
1680	can_hover => 1,	2076	can_hover => 1,
1681	can_focus => 1,	2077	can_focus => 1,
1682	valign => 0,	2078	valign => 0,
1683	can_events => 1,	2079	can_events => 1,
		2080	ellipsise => 0,
1684	#text => ...	2081	#text => ...
		2082	#hidden => "*",
1685	@_	2083	@_
1686	)	2084	)
1687	}	2085	}
1688		2086
1689	sub _set_text {	2087	sub _set_text {
…		…
1696	$self->{last_activity} = $::NOW;	2094	$self->{last_activity} = $::NOW;
1697	$self->{text} = $text;	2095	$self->{text} = $text;
1698		2096
1699	$text =~ s/./*/g if $self->{hidden};	2097	$text =~ s/./*/g if $self->{hidden};
1700	$self->{layout}->set_text ("$text ");	2098	$self->{layout}->set_text ("$text ");
1701	delete $self->{req_h};	2099	delete $self->{size_req};
1702		2100
1703	$self->_emit (changed => $self->{text});	2101	$self->emit (changed => $self->{text});
1704		2102
1705	$self->realloc;	2103	$self->realloc;
1706	$self->update;	2104	$self->update;
1707	}	2105	}
1708		2106
…		…
1723	my ($w, $h) = $self->SUPER::size_request;	2121	my ($w, $h) = $self->SUPER::size_request;
1724		2122
1725	($w + 1, $h) # add 1 for cursor	2123	($w + 1, $h) # add 1 for cursor
1726	}	2124	}
1727		2125
1728	sub key_down {	2126	sub invoke_key_down {
1729	my ($self, $ev) = @_;	2127	my ($self, $ev) = @_;
1730		2128
1731	my $mod = $ev->{mod};	2129	my $mod = $ev->{mod};
1732	my $sym = $ev->{sym};	2130	my $sym = $ev->{sym};
1733	my $uni = $ev->{unicode};	2131	my $uni = $ev->{unicode};
1734		2132
1735	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;
1736		2136
1737	if ($uni == 8) {	2137	if ($uni == 8) {
1738	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2138	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1739	} elsif ($uni == 127) {	2139	} elsif ($uni == 127) {
1740	substr $text, $self->{cursor}, 1, "";	2140	substr $text, $self->{cursor}, 1, "";
1741	} elsif ($sym == CFClient::SDLK_LEFT) {	2141	} elsif ($sym == CFPlus::SDLK_LEFT) {
1742	--$self->{cursor} if $self->{cursor};	2142	--$self->{cursor} if $self->{cursor};
1743	} elsif ($sym == CFClient::SDLK_RIGHT) {	2143	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1744	++$self->{cursor} if $self->{cursor} < length $self->{text};	2144	++$self->{cursor} if $self->{cursor} < length $self->{text};
1745	} 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 = "";
1746	$self->{cursor} = 0;	2159	$self->{cursor} = 0;
1747	} elsif ($sym == CFClient::SDLK_END) {
1748	$self->{cursor} = length $text;
1749	} elsif ($uni == 27) {	2160	} elsif ($uni == 27) {
1750	$self->_emit ('escape');	2161	$self->emit ('escape');
1751	} elsif ($uni) {	2162	} elsif ($uni == 0x0d) {
		2163	substr $text, $self->{cursor}++, 0, "\012";
		2164	} elsif ($uni >= 0x20) {
1752	substr $text, $self->{cursor}++, 0, chr $uni;	2165	substr $text, $self->{cursor}++, 0, chr $uni;
1753	} else {	2166	} else {
1754	return 0;	2167	return 0;
1755	}	2168	}
1756		2169
1757	$self->_set_text ($text);	2170	$self->_set_text ($text);
1758		2171
1759	$self->realloc;	2172	$self->realloc;
		2173	$self->update;
1760		2174
1761	1	2175	1
1762	}	2176	}
1763		2177
1764	sub focus_in {	2178	sub invoke_focus_in {
1765	my ($self) = @_;	2179	my ($self) = @_;
1766		2180
1767	$self->{last_activity} = $::NOW;	2181	$self->{last_activity} = $::NOW;
1768		2182
1769	$self->SUPER::focus_in;	2183	$self->SUPER::invoke_focus_in
1770	}	2184	}
1771		2185
1772	sub button_down {	2186	sub invoke_button_down {
1773	my ($self, $ev, $x, $y) = @_;	2187	my ($self, $ev, $x, $y) = @_;
1774		2188
1775	$self->SUPER::button_down ($ev, $x, $y);	2189	$self->SUPER::invoke_button_down ($ev, $x, $y);
1776		2190
1777	my $idx = $self->{layout}->xy_to_index ($x, $y);	2191	my $idx = $self->{layout}->xy_to_index ($x, $y);
1778		2192
1779	# byte-index to char-index	2193	# byte-index to char-index
1780	my $text = $self->{text};	2194	my $text = $self->{text};
1781	utf8::encode $text;	2195	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1782	$self->{cursor} = length substr $text, 0, $idx;	2196	$self->{cursor} = length $text;
1783		2197
1784	$self->_set_text ($self->{text});	2198	$self->_set_text ($self->{text});
1785	$self->update;	2199	$self->update;
1786		2200
1787	1	2201	1
1788	}	2202	}
1789		2203
1790	sub mouse_motion {	2204	sub invoke_mouse_motion {
1791	my ($self, $ev, $x, $y) = @_;	2205	my ($self, $ev, $x, $y) = @_;
1792	# 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#
1793		2207
1794	0	2208	1
1795	}	2209	}
1796		2210
1797	sub _draw {	2211	sub _draw {
1798	my ($self) = @_;	2212	my ($self) = @_;
1799		2213
…		…
1806	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
1807	}	2221	}
1808		2222
1809	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
1810	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1811	glBegin GL_QUADS;
1812	glVertex 0 , 0;
1813	glVertex 0 , $self->{h};
1814	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
1815	glVertex $self->{w}, 0;
1816	glEnd;
1817	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
1818		2227
1819	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
1820		2229
1821	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
1823		2232
1824	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
1825	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
1826	utf8::encode $text;	2235	utf8::encode $text;
1827		2236
1828	@$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);
1829	}	2238	}
1830		2239
1831	glColor @{$self->{fg}};	2240	glColor_premultiply @{$self->{active_fg}};
1832	glBegin GL_LINES;	2241	glBegin GL_LINES;
1833	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};
1834	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};
1835	glEnd;	2244	glEnd;
1836	}
1837	}
1838		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
1839	package CFClient::UI::Entry;	2265	package CFPlus::UI::Entry;
1840		2266
1841	our @ISA = CFClient::UI::EntryBase::;	2267	our @ISA = CFPlus::UI::EntryBase::;
1842		2268
1843	use CFClient::OpenGL;	2269	use CFPlus::OpenGL;
1844		2270
1845	sub key_down {	2271	sub invoke_key_down {
1846	my ($self, $ev) = @_;	2272	my ($self, $ev) = @_;
1847		2273
1848	my $sym = $ev->{sym};	2274	my $sym = $ev->{sym};
1849		2275
1850	if ($sym == 13) {	2276	if ($ev->{uni} == 0x0d || $sym == 13) {
1851	unshift @{$self->{history}},	2277	unshift @{$self->{history}},
1852	my $txt = $self->get_text;	2278	my $txt = $self->get_text;
		2279
1853	$self->{history_pointer} = -1;	2280	$self->{history_pointer} = -1;
1854	$self->{history_saveback} = '';	2281	$self->{history_saveback} = '';
1855	$self->_emit (activate => $txt);	2282	$self->emit (activate => $txt);
1856	$self->update;	2283	$self->update;
1857		2284
1858	} elsif ($sym == CFClient::SDLK_UP) {	2285	} elsif ($sym == CFPlus::SDLK_UP) {
1859	if ($self->{history_pointer} < 0) {	2286	if ($self->{history_pointer} < 0) {
1860	$self->{history_saveback} = $self->get_text;	2287	$self->{history_saveback} = $self->get_text;
1861	}	2288	}
1862	if (@{$self->{history} || []} > 0) {	2289	if (@{$self->{history} || []} > 0) {
1863	$self->{history_pointer}++;	2290	$self->{history_pointer}++;
…		…
1865	$self->{history_pointer} = @{$self->{history} || []} - 1;	2292	$self->{history_pointer} = @{$self->{history} || []} - 1;
1866	}	2293	}
1867	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2294	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1868	}	2295	}
1869		2296
1870	} elsif ($sym == CFClient::SDLK_DOWN) {	2297	} elsif ($sym == CFPlus::SDLK_DOWN) {
1871	$self->{history_pointer}--;	2298	$self->{history_pointer}--;
1872	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2299	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1873		2300
1874	if ($self->{history_pointer} >= 0) {	2301	if ($self->{history_pointer} >= 0) {
1875	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1876	} else {	2303	} else {
1877	$self->set_text ($self->{history_saveback});	2304	$self->set_text ($self->{history_saveback});
1878	}	2305	}
1879		2306
1880	} else {	2307	} else {
1881	return $self->SUPER::key_down ($ev)	2308	return $self->SUPER::invoke_key_down ($ev)
1882	}	2309	}
1883		2310
1884	1	2311	1
1885	}	2312	}
1886		2313
1887	#############################################################################	2314	#############################################################################
1888		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
1889	package CFClient::UI::Button;	2355	package CFPlus::UI::ButtonBin;
1890		2356
1891	our @ISA = CFClient::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
1892		2358
1893	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
1894		2360
1895	my @tex =	2361	my @tex =
1896	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1897	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
1898		2364
1899	sub new {	2365	sub new {
1900	my $class = shift;	2366	my $class = shift;
1901		2367
1902	$class->SUPER::new (	2368	$class->SUPER::new (
1903	padding_x => 4,
1904	padding_y => 4,
1905	fg => [1, 1, 1],
1906	active_fg => [0, 0, 1],
1907	can_hover => 1,	2369	can_hover => 1,
1908	align => 0,	2370	align => 0,
1909	valign => 0,	2371	valign => 0,
1910	can_events => 1,	2372	can_events => 1,
1911	@_	2373	@_
1912	)	2374	)
1913	}	2375	}
1914		2376
1915	sub activate { }
1916
1917	sub button_up {	2377	sub invoke_button_up {
1918	my ($self, $ev, $x, $y) = @_;	2378	my ($self, $ev, $x, $y) = @_;
1919		2379
1920	$self->emit ("activate")	2380	$self->emit ("activate")
1921	if $x >= 0 && $x < $self->{w}	2381	if $x >= 0 && $x < $self->{w}
1922	&& $y >= 0 && $y < $self->{h};	2382	&& $y >= 0 && $y < $self->{h};
…		…
1925	}	2385	}
1926		2386
1927	sub _draw {	2387	sub _draw {
1928	my ($self) = @_;	2388	my ($self) = @_;
1929		2389
1930	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1931
1932	glEnable GL_TEXTURE_2D;	2390	glEnable GL_TEXTURE_2D;
1933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1934	glColor 0, 0, 0, 1;	2392	glColor 0, 0, 0, 1;
1935		2393
		2394	my $tex = $tex[$GRAB == $self];
1936	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2395	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1937		2396
1938	glDisable GL_TEXTURE_2D;	2397	glDisable GL_TEXTURE_2D;
1939		2398
1940	$self->SUPER::_draw;	2399	$self->SUPER::_draw;
1941	}	2400	}
1942		2401
1943	#############################################################################	2402	#############################################################################
1944		2403
1945	package CFClient::UI::CheckBox;	2404	package CFPlus::UI::Button;
1946		2405
1947	our @ISA = CFClient::UI::DrawBG::;	2406	our @ISA = CFPlus::UI::Label::;
		2407
		2408	use CFPlus::OpenGL;
1948		2409
1949	my @tex =	2410	my @tex =
1950	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 }
1951	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2465	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1952		2466
1953	use CFClient::OpenGL;	2467	use CFPlus::OpenGL;
1954		2468
1955	sub new {	2469	sub new {
1956	my $class = shift;	2470	my $class = shift;
1957		2471
1958	$class->SUPER::new (	2472	$class->SUPER::new (
…		…
1972	my ($self) = @_;	2486	my ($self) = @_;
1973		2487
1974	(6) x 2	2488	(6) x 2
1975	}	2489	}
1976		2490
		2491	sub toggle {
		2492	my ($self) = @_;
		2493
		2494	$self->{state} = !$self->{state};
		2495	$self->emit (changed => $self->{state});
		2496	$self->update;
		2497	}
		2498
1977	sub button_down {	2499	sub invoke_button_down {
1978	my ($self, $ev, $x, $y) = @_;	2500	my ($self, $ev, $x, $y) = @_;
1979		2501
1980	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2502	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1981	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2503	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1982	$self->{state} = !$self->{state};	2504	$self->toggle;
1983	$self->_emit (changed => $self->{state});
1984	} else {	2505	} else {
1985	return 0	2506	return 0
1986	}	2507	}
1987		2508
1988	1	2509	1
…		…
2008	glDisable GL_TEXTURE_2D;	2529	glDisable GL_TEXTURE_2D;
2009	}	2530	}
2010		2531
2011	#############################################################################	2532	#############################################################################
2012		2533
2013	package CFClient::UI::Image;	2534	package CFPlus::UI::Image;
2014		2535
2015	our @ISA = CFClient::UI::Base::;	2536	our @ISA = CFPlus::UI::Base::;
2016		2537
2017	use CFClient::OpenGL;	2538	use CFPlus::OpenGL;
2018	use Carp qw/confess/;
2019		2539
2020	our %loaded_images;	2540	our %texture_cache;
2021		2541
2022	sub new {	2542	sub new {
2023	my $class = shift;	2543	my $class = shift;
2024		2544
2025	my $self = $class->SUPER::new (can_events => 0, @_);	2545	my $self = $class->SUPER::new (
		2546	can_events => 0,
		2547	scale => 1,
		2548	@_,
		2549	);
2026		2550
2027	$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";
2028		2553
2029	$loaded_images{$self->{image}} ||=	2554	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2030	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;
2031		2556
2032	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2557	CFPlus::weaken $texture_cache{$self->{path}};
2033		2558
2034	Scalar::Util::weaken $loaded_images{$self->{image}};	2559	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2035
2036	$self->{aspect} = $tex->{w} / $tex->{h};
2037		2560
2038	$self	2561	$self
2039	}	2562	}
2040		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
2041	sub size_request {	2579	sub size_request {
2042	my ($self) = @_;	2580	my ($self) = @_;
2043		2581
2044	($self->{tex}->{w}, $self->{tex}->{h})	2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2045	}	2583	}
2046		2584
2047	sub _draw {	2585	sub _draw {
2048	my ($self) = @_;	2586	my ($self) = @_;
2049		2587
…		…
2066	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2067	}	2605	}
2068		2606
2069	#############################################################################	2607	#############################################################################
2070		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
2071	package CFClient::UI::VGauge;	2651	package CFPlus::UI::VGauge;
2072		2652
2073	our @ISA = CFClient::UI::Base::;	2653	our @ISA = CFPlus::UI::Base::;
2074		2654
2075	use List::Util qw(min max);	2655	use List::Util qw(min max);
2076		2656
2077	use CFClient::OpenGL;	2657	use CFPlus::OpenGL;
2078		2658
2079	my %tex = (	2659	my %tex = (
2080	food => [	2660	food => [
2081	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2661	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2662	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2083	],	2663	],
2084	grace => [	2664	grace => [
2085	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2665	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2086	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/
2087	],	2667	],
2088	hp => [	2668	hp => [
2089	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2669	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2090	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2670	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2091	],	2671	],
2092	mana => [	2672	mana => [
2093	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2673	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094	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/
2095	],	2675	],
2096	);	2676	);
2097		2677
2098	# eg. VGauge->new (gauge => 'food'), default gauge: food	2678	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2158	my $ycut1 = max 0, min 1, $ycut;	2738	my $ycut1 = max 0, min 1, $ycut;
2159	my $ycut2 = max 0, min 1, $ycut - 1;	2739	my $ycut2 = max 0, min 1, $ycut - 1;
2160		2740
2161	my $h1 = $self->{h} * (1 - $ycut1);	2741	my $h1 = $self->{h} * (1 - $ycut1);
2162	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);
2163		2746
2164	glEnable GL_BLEND;	2747	glEnable GL_BLEND;
2165	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2748	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2749	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2167	glEnable GL_TEXTURE_2D;	2750	glEnable GL_TEXTURE_2D;
…		…
2186		2769
2187	if ($t3) {	2770	if ($t3) {
2188	glBindTexture GL_TEXTURE_2D, $t3->{name};	2771	glBindTexture GL_TEXTURE_2D, $t3->{name};
2189	glBegin GL_QUADS;	2772	glBegin GL_QUADS;
2190	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2773	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2191	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2774	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2192	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2775	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2193	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2776	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2194	glEnd;	2777	glEnd;
2195	}	2778	}
2196		2779
2197	glDisable GL_BLEND;	2780	glDisable GL_BLEND;
2198	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2199	}	2782	}
2200		2783
2201	#############################################################################	2784	#############################################################################
2202		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	label => "%d%%",
		2806	%arg,
		2807	);
		2808
		2809	$self->set_value ($arg{value} || -1);
		2810
		2811	$self
		2812	}
		2813
		2814	sub set_label {
		2815	my ($self, $label) = @_;
		2816
		2817	return if $self->{label} eq $label;
		2818	$self->{label} = $label;
		2819
		2820	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2821	}
		2822
		2823	sub set_value {
		2824	my ($self, $value) = @_;
		2825
		2826	if ($self->{value} ne $value) {
		2827	$self->{value} = $value;
		2828
		2829	if ($value < 0) {
		2830	$self->set_text ("-");
		2831	} else {
		2832	$self->set_text (sprintf $self->{label}, $value * 100);
		2833	}
		2834
		2835	$self->update;
		2836	}
		2837	}
		2838
		2839	sub _draw {
		2840	my ($self) = @_;
		2841
		2842	glEnable GL_BLEND;
		2843	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2844
		2845	if ($self->{value} >= 0) {
		2846	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2847
		2848	glColor_premultiply @{$self->{bar}};
		2849	glRect 2, 2, $s, $self->{h} - 2;
		2850	glColor_premultiply @{$self->{bg}};
		2851	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2852	}
		2853
		2854	glColor_premultiply @{$self->{outline}};
		2855	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2856
		2857	glDisable GL_BLEND;
		2858
		2859	{
		2860	local $self->{bg}; # do not draw background
		2861	$self->SUPER::_draw;
		2862	}
		2863	}
		2864
		2865	#############################################################################
		2866
		2867	package CFPlus::UI::ExperienceProgress;
		2868
		2869	our @ISA = CFPlus::UI::Progress::;
		2870
		2871	sub new {
		2872	my ($class, %arg) = @_;
		2873
		2874	my $self = $class->SUPER::new (
		2875	%arg
		2876	);
		2877
		2878	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2879	if $::CONN;
		2880
		2881	$self
		2882	}
		2883
		2884	sub DESTROY {
		2885	my ($self) = @_;
		2886
		2887	delete $::CONN->{on_exp_update}{$self+0}
		2888	if $::CONN;
		2889
		2890	$self->SUPER::DESTROY;
		2891	}
		2892
		2893	sub set_value {
		2894	my ($self, $lvl, $exp) = @_;
		2895
		2896	my $v = -1;
		2897
		2898	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2899	my $l0 = $table->[$lvl - 1];
		2900	my $l1 = $table->[$lvl];
		2901
		2902	$v = ($exp - $l0) / ($l1 - $l0);
		2903	}
		2904
		2905	$self->SUPER::set_value ($v);
		2906	}
		2907
		2908	#############################################################################
		2909
2203	package CFClient::UI::Gauge;	2910	package CFPlus::UI::Gauge;
2204		2911
2205	our @ISA = CFClient::UI::VBox::;	2912	our @ISA = CFPlus::UI::VBox::;
2206		2913
2207	sub new {	2914	sub new {
2208	my ($class, %arg) = @_;	2915	my ($class, %arg) = @_;
2209		2916
2210	my $self = $class->SUPER::new (	2917	my $self = $class->SUPER::new (
…		…
2212	can_hover => 1,	2919	can_hover => 1,
2213	can_events => 1,	2920	can_events => 1,
2214	%arg,	2921	%arg,
2215	);	2922	);
2216		2923
2217	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2924	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2218	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2925	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2219	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2926	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2220		2927
2221	$self	2928	$self
2222	}	2929	}
2223		2930
2224	sub set_fontsize {	2931	sub set_fontsize {
…		…
2245	$self->{value}->set_text ($val);	2952	$self->{value}->set_text ($val);
2246	}	2953	}
2247		2954
2248	#############################################################################	2955	#############################################################################
2249		2956
2250	package CFClient::UI::Slider;	2957	package CFPlus::UI::Slider;
2251		2958
2252	use strict;	2959	use strict;
2253		2960
2254	use CFClient::OpenGL;	2961	use CFPlus::OpenGL;
2255		2962
2256	our @ISA = CFClient::UI::DrawBG::;	2963	our @ISA = CFPlus::UI::DrawBG::;
2257		2964
2258	my @tex =	2965	my @tex =
2259	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2966	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2260	qw(s1_slider.png s1_slider_bg.png);	2967	qw(s1_slider.png s1_slider_bg.png);
2261		2968
2262	sub new {	2969	sub new {
2263	my $class = shift;	2970	my $class = shift;
2264		2971
…		…
2285	$self->update;	2992	$self->update;
2286		2993
2287	$self	2994	$self
2288	}	2995	}
2289		2996
2290	sub changed { }
2291
2292	sub set_range {	2997	sub set_range {
2293	my ($self, $range) = @_;	2998	my ($self, $range) = @_;
2294		2999
2295	($range, $self->{range}) = ($self->{range}, $range);	3000	($range, $self->{range}) = ($self->{range}, $range);
2296		3001
2297	$self->update
2298	if "@$range" ne "@{$self->{range}}";	3002	if ("@$range" ne "@{$self->{range}}") {
		3003	$self->update;
		3004	$self->set_value ($self->{range}[0]);
		3005	}
2299	}	3006	}
2300		3007
2301	sub set_value {	3008	sub set_value {
2302	my ($self, $value) = @_;	3009	my ($self, $value) = @_;
2303		3010
…		…
2314	if $unit;	3021	if $unit;
2315		3022
2316	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	3023	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317		3024
2318	if ($value != $old_value) {	3025	if ($value != $old_value) {
2319	$self->_emit (changed => $value);	3026	$self->emit (changed => $value);
2320	$self->update;	3027	$self->update;
2321	}	3028	}
2322	}	3029	}
2323		3030
2324	sub size_request {	3031	sub size_request {
2325	my ($self) = @_;	3032	my ($self) = @_;
2326		3033
2327	($self->{req_w}, $self->{req_h})	3034	($self->{req_w}, $self->{req_h})
2328	}	3035	}
2329		3036
2330	sub button_down {	3037	sub invoke_button_down {
2331	my ($self, $ev, $x, $y) = @_;	3038	my ($self, $ev, $x, $y) = @_;
2332		3039
2333	$self->SUPER::button_down ($ev, $x, $y);	3040	$self->SUPER::invoke_button_down ($ev, $x, $y);
2334		3041
2335	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3042	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336		3043
2337	$self->mouse_motion ($ev, $x, $y)	3044	$self->invoke_mouse_motion ($ev, $x, $y);
2338	}
2339		3045
		3046	1
		3047	}
		3048
2340	sub mouse_motion {	3049	sub invoke_mouse_motion {
2341	my ($self, $ev, $x, $y) = @_;	3050	my ($self, $ev, $x, $y) = @_;
2342		3051
2343	if ($GRAB == $self) {	3052	if ($GRAB == $self) {
2344	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	3053	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345		3054
…		…
2349		3058
2350	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3059	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2351	} else {	3060	} else {
2352	return 0;	3061	return 0;
2353	}	3062	}
		3063
		3064	1
		3065	}
		3066
		3067	sub invoke_mouse_wheel {
		3068	my ($self, $ev) = @_;
		3069
		3070	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3071
		3072	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3073
		3074	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2354		3075
2355	1	3076	1
2356	}	3077	}
2357		3078
2358	sub update {	3079	sub update {
…		…
2409	glDisable GL_TEXTURE_2D;	3130	glDisable GL_TEXTURE_2D;
2410	}	3131	}
2411		3132
2412	#############################################################################	3133	#############################################################################
2413		3134
2414	package CFClient::UI::ValSlider;	3135	package CFPlus::UI::ValSlider;
2415		3136
2416	our @ISA = CFClient::UI::HBox::;	3137	our @ISA = CFPlus::UI::HBox::;
2417		3138
2418	sub new {	3139	sub new {
2419	my ($class, %arg) = @_;	3140	my ($class, %arg) = @_;
2420		3141
2421	my $range = delete $arg{range};	3142	my $range = delete $arg{range};
2422		3143
2423	my $self = $class->SUPER::new (	3144	my $self = $class->SUPER::new (
2424	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3145	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2425	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3146	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2426	to_value => sub { shift },	3147	to_value => sub { shift },
2427	from_value => sub { shift },	3148	from_value => sub { shift },
2428	%arg,	3149	%arg,
2429	);	3150	);
2430		3151
…		…
2450	sub set_range { shift->{slider}->set_range (@_) }	3171	sub set_range { shift->{slider}->set_range (@_) }
2451	sub set_value { shift->{slider}->set_value (@_) }	3172	sub set_value { shift->{slider}->set_value (@_) }
2452		3173
2453	#############################################################################	3174	#############################################################################
2454		3175
2455	package CFClient::UI::TextView;	3176	package CFPlus::UI::TextScroller;
2456		3177
2457	our @ISA = CFClient::UI::HBox::;	3178	our @ISA = CFPlus::UI::HBox::;
2458		3179
2459	use CFClient::OpenGL;	3180	use CFPlus::OpenGL;
2460		3181
2461	sub new {	3182	sub new {
2462	my $class = shift;	3183	my $class = shift;
2463		3184
2464	my $self = $class->SUPER::new (	3185	my $self = $class->SUPER::new (
2465	fontsize => 1,	3186	fontsize => 1,
2466	can_events => 0,	3187	can_events => 1,
		3188	indent => 0,
2467	#font => default_font	3189	#font => default_font
2468	@_,	3190	@_,
2469		3191
2470	layout => (new CFClient::Layout 1),	3192	layout => (new CFPlus::Layout),
2471	par => [],	3193	par => [],
		3194	max_par => 0,
2472	height => 0,	3195	height => 0,
2473	children => [	3196	children => [
2474	(new CFClient::UI::Empty expand => 1),	3197	(new CFPlus::UI::Empty expand => 1),
2475	(new CFClient::UI::Slider vertical => 1),	3198	(new CFPlus::UI::Slider vertical => 1),
2476	],	3199	],
2477	);	3200	);
2478		3201
2479	$self->{children}[1]->connect (changed => sub { $self->update });	3202	$self->{children}[1]->connect (changed => sub { $self->update });
2480		3203
…		…
2486		3209
2487	$self->{fontsize} = $fontsize;	3210	$self->{fontsize} = $fontsize;
2488	$self->reflow;	3211	$self->reflow;
2489	}	3212	}
2490		3213
		3214	sub size_request {
		3215	my ($self) = @_;
		3216
		3217	my ($empty, $slider) = $self->visible_children;
		3218
		3219	local $self->{children} = [$empty, $slider];
		3220	$self->SUPER::size_request
		3221	}
		3222
2491	sub size_allocate {	3223	sub invoke_size_allocate {
2492	my ($self, $w, $h) = @_;	3224	my ($self, $w, $h) = @_;
2493		3225
2494	$self->SUPER::size_allocate ($w, $h);	3226	my ($empty, $slider, @other) = @{ $self->{children} };
		3227	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2495		3228
2496	$self->{layout}->set_font ($self->{font}) if $self->{font};	3229	$self->{layout}->set_font ($self->{font}) if $self->{font};
2497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3230	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2498	$self->{layout}->set_width ($self->{children}[0]{w});	3231	$self->{layout}->set_width ($empty->{w});
		3232	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499		3233
2500	$self->reflow;	3234	$self->reflow;
2501	}
2502		3235
2503	sub text_size {	3236	local $self->{children} = [$empty, $slider];
		3237	$self->SUPER::invoke_size_allocate ($w, $h)
		3238	}
		3239
		3240	sub invoke_mouse_wheel {
2504	my ($self, $text, $indent) = @_;	3241	my ($self, $ev) = @_;
		3242
		3243	return 0 unless $ev->{dy}; # only vertical movements
		3244
		3245	$self->{children}[1]->emit (mouse_wheel => $ev);
		3246
		3247	1
		3248	}
		3249
		3250	sub get_layout {
		3251	my ($self, $para) = @_;
2505		3252
2506	my $layout = $self->{layout};	3253	my $layout = $self->{layout};
2507		3254
		3255	$layout->set_font ($self->{font}) if $self->{font};
		3256	$layout->set_foreground (@{$para->{fg}});
2508	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3257	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2509	$layout->set_width ($self->{children}[0]{w} - $indent);	3258	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3259	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510	$layout->set_markup ($text);	3260	$layout->set_markup ($para->{markup});
		3261
		3262	$layout->set_shapes (
		3263	map
		3264	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3265	@{$para->{widget}}
2511		3266	);
		3267
2512	$layout->size	3268	$layout
2513	}	3269	}
2514		3270
2515	sub reflow {	3271	sub reflow {
2516	my ($self) = @_;	3272	my ($self) = @_;
2517		3273
…		…
2524		3280
2525	# todo: base offset on lines or so, not on pixels	3281	# todo: base offset on lines or so, not on pixels
2526	$self->{children}[1]->set_value ($offset);	3282	$self->{children}[1]->set_value ($offset);
2527	}	3283	}
2528		3284
		3285	sub current_paragraph {
		3286	my ($self) = @_;
		3287
		3288	$self->{top_paragraph} - 1
		3289	}
		3290
		3291	sub scroll_to {
		3292	my ($self, $para) = @_;
		3293
		3294	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3295
		3296	$self->{scroll_to} = $para;
		3297	$self->update;
		3298	}
		3299
2529	sub clear {	3300	sub clear {
2530	my ($self) = @_;	3301	my ($self) = @_;
		3302
		3303	my (undef, undef, @other) = @{ $self->{children} };
		3304	$self->remove ($_) for @other;
2531		3305
2532	$self->{par} = [];	3306	$self->{par} = [];
2533	$self->{height} = 0;	3307	$self->{height} = 0;
2534	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3308	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2535	}	3309	}
2536		3310
2537	sub add_paragraph {	3311	sub add_paragraph {
2538	my ($self, $color, $text, $indent) = @_;	3312	my $self = shift;
2539		3313
2540	for my $line (split /\n/, $text) {	3314	for my $para (@_) {
2541	my ($w, $h) = $self->text_size ($line);	3315	$para = {
		3316	fg => [1, 1, 1, 1],
		3317	indent => 0,
		3318	markup => "",
		3319	widget => [],
		3320	ref $para ? %$para : (markup => $para),
		3321	w => 1e10,
		3322	wrapped => 1,
		3323	};
		3324
		3325	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3326	push @{$self->{par}}, $para;
		3327	}
		3328
		3329	if (my $max = $self->{max_par}) {
		3330	shift @{$self->{par}} while @{$self->{par}} > $max;
		3331	}
		3332
		3333	$self->{need_reflow}++;
		3334	$self->update;
		3335	}
		3336
		3337	sub scroll_to_bottom {
		3338	my ($self) = @_;
		3339
		3340	$self->{scroll_to} = $#{$self->{par}};
		3341	$self->update;
		3342	}
		3343
		3344	sub force_uptodate {
		3345	my ($self) = @_;
		3346
		3347	if (delete $self->{need_reflow}) {
		3348	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3349
		3350	my $height = 0;
		3351
		3352	for my $para (@{$self->{par}}) {
		3353	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3354	my $layout = $self->get_layout ($para);
		3355	my ($w, $h) = $layout->size;
		3356
		3357	$para->{w} = $w + $para->{indent};
		3358	$para->{h} = $h;
		3359	$para->{wrapped} = $layout->has_wrapped;
		3360	}
		3361
		3362	$para->{y} = $height;
		3363	$height += $para->{h};
		3364	}
		3365
2542	$self->{height} += $h;	3366	$self->{height} = $height;
2543	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3367	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2544	}
2545		3368
2546	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3369	delete $self->{texture};
		3370	}
		3371
		3372	if (my $paridx = delete $self->{scroll_to}) {
		3373	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3374	}
2547	}	3375	}
2548		3376
2549	sub update {	3377	sub update {
2550	my ($self) = @_;	3378	my ($self) = @_;
2551		3379
…		…
2553		3381
2554	return unless $self->{h} > 0;	3382	return unless $self->{h} > 0;
2555		3383
2556	delete $self->{texture};	3384	delete $self->{texture};
2557		3385
2558	$ROOT->on_post_alloc ($self, sub {	3386	$ROOT->on_post_alloc ($self => sub {
		3387	$self->force_uptodate;
		3388
2559	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3389	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560		3390
2561	if (delete $self->{need_reflow}) {
2562	my $height = 0;
2563
2564	my $layout = $self->{layout};
2565
2566	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
2568	for (@{$self->{par}}) {
2569	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2570	$layout->set_width ($W - $_->[3]);
2571	$layout->set_markup ($_->[4]);
2572	my ($w, $h) = $layout->size;
2573	$_->[0] = $w + $_->[3];
2574	$_->[1] = $h;
2575	}
2576
2577	$height += $_->[1];
2578	}
2579
2580	$self->{height} = $height;
2581
2582	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2583
2584	delete $self->{texture};
2585	}
2586
2587	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3391	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2588	glClearColor 0, 0, 0, 0;	3392	glClearColor 0, 0, 0, 0;
2589	glClear GL_COLOR_BUFFER_BIT;	3393	glClear GL_COLOR_BUFFER_BIT;
2590		3394
		3395	package CFPlus::UI::Base;
		3396	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3397	(0, 0, $self->{w}, $self->{h});
		3398
		3399	my $top = int $self->{children}[1]{range}[0];
		3400
		3401	my $paridx = 0;
		3402	my $top_paragraph;
2591	my $top = int $self->{children}[1]{range}[0];	3403	my $top = int $self->{children}[1]{range}[0];
2592		3404
2593	my $y0 = $top;	3405	my $y0 = $top;
2594	my $y1 = $top + $H;	3406	my $y1 = $top + $H;
2595		3407
2596	my $y = 0;
2597
2598	my $layout = $self->{layout};
2599
2600	$layout->set_font ($self->{font}) if $self->{font};
2601
2602	glEnable GL_BLEND;
2603	#TODO# not correct in windows where rgba is forced off
2604	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2605
2606	for my $par (@{$self->{par}}) {	3408	for my $para (@{$self->{par}}) {
2607	my $h = $par->[1];	3409	my $h = $para->{h};
		3410	my $y = $para->{y};
2608		3411
2609	if ($y0 < $y + $h && $y < $y1) {	3412	if ($y0 < $y + $h && $y < $y1) {
2610	$layout->set_foreground (@{ $par->[2] });	3413	my $layout = $self->get_layout ($para);
2611	$layout->set_width ($W - $par->[3]);
2612	$layout->set_markup ($par->[4]);
2613		3414
2614	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3415	$layout->render ($para->{indent}, $y - $y0);
		3416	$layout->draw;
2615		3417
2616	glRasterPos $par->[3], $y - $y0;	3418	if (my @w = @{ $para->{widget} }) {
2617	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3419	my @s = $layout->get_shapes;
		3420
		3421	for (@w) {
		3422	my ($dx, $dy) = splice @s, 0, 2, ();
		3423
		3424	$_->{x} = $dx + $para->{indent};
		3425	$_->{y} = $dy + $y - $y0;
		3426
		3427	$_->draw;
		3428	}
		3429	}
2618	}	3430	}
2619		3431
2620	$y += $h;	3432	$paridx++;
		3433	$top_paragraph ||= $paridx if $y >= $top;
2621	}	3434	}
2622		3435
2623	glDisable GL_BLEND;	3436	$self->{top_paragraph} = $top_paragraph;
2624	};	3437	};
2625	});	3438	});
		3439	}
		3440
		3441	sub reconfigure {
		3442	my ($self) = @_;
		3443
		3444	$self->SUPER::reconfigure;
		3445
		3446	$_->{w} = 1e10 for @{ $self->{par} };
		3447	$self->reflow;
2626	}	3448	}
2627		3449
2628	sub _draw {	3450	sub _draw {
2629	my ($self) = @_;	3451	my ($self) = @_;
2630		3452
…		…
2633	glColor 0, 0, 0, 1;	3455	glColor 0, 0, 0, 1;
2634	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3456	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2635	glDisable GL_TEXTURE_2D;	3457	glDisable GL_TEXTURE_2D;
2636		3458
2637	$self->{children}[1]->draw;	3459	$self->{children}[1]->draw;
2638
2639	}	3460	}
2640		3461
2641	#############################################################################	3462	#############################################################################
2642		3463
2643	package CFClient::UI::Animator;	3464	package CFPlus::UI::Animator;
2644		3465
2645	use CFClient::OpenGL;	3466	use CFPlus::OpenGL;
2646		3467
2647	our @ISA = CFClient::UI::Bin::;	3468	our @ISA = CFPlus::UI::Bin::;
2648		3469
2649	sub moveto {	3470	sub moveto {
2650	my ($self, $x, $y) = @_;	3471	my ($self, $x, $y) = @_;
2651		3472
2652	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3473	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2680	glPopMatrix;	3501	glPopMatrix;
2681	}	3502	}
2682		3503
2683	#############################################################################	3504	#############################################################################
2684		3505
2685	package CFClient::UI::Flopper;	3506	package CFPlus::UI::Flopper;
2686		3507
2687	our @ISA = CFClient::UI::Button::;	3508	our @ISA = CFPlus::UI::Button::;
2688		3509
2689	sub new {	3510	sub new {
2690	my $class = shift;	3511	my $class = shift;
2691		3512
2692	my $self = $class->SUPER::new (	3513	my $self = $class->SUPER::new (
…		…
2704	$self->{other}->toggle_visibility;	3525	$self->{other}->toggle_visibility;
2705	}	3526	}
2706		3527
2707	#############################################################################	3528	#############################################################################
2708		3529
2709	package CFClient::UI::Tooltip;	3530	package CFPlus::UI::Tooltip;
2710		3531
2711	our @ISA = CFClient::UI::Bin::;	3532	our @ISA = CFPlus::UI::Bin::;
2712		3533
2713	use CFClient::OpenGL;	3534	use CFPlus::OpenGL;
2714		3535
2715	sub new {	3536	sub new {
2716	my $class = shift;	3537	my $class = shift;
2717		3538
2718	$class->SUPER::new (	3539	$class->SUPER::new (
…		…
2721	)	3542	)
2722	}	3543	}
2723		3544
2724	sub set_tooltip_from {	3545	sub set_tooltip_from {
2725	my ($self, $widget) = @_;	3546	my ($self, $widget) = @_;
		3547
		3548	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3549	if $widget->{tooltip} =~ /^#(.*)$/;
2726		3550
2727	my $tooltip = $widget->{tooltip};	3551	my $tooltip = $widget->{tooltip};
2728		3552
2729	if ($ENV{CFPLUS_DEBUG} & 2) {	3553	if ($ENV{CFPLUS_DEBUG} & 2) {
2730	$tooltip .= "\n\n" . (ref $widget) . "\n"	3554	$tooltip .= "\n\n" . (ref $widget) . "\n"
2731	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3555	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732	. "req $widget->{req_w} $widget->{req_h}\n"	3556	. "req $widget->{req_w} $widget->{req_h}\n"
2733	. "visible $widget->{visible}";	3557	. "visible $widget->{visible}";
2734	}	3558	}
2735		3559
		3560	$tooltip =~ s/^\n+//;
		3561	$tooltip =~ s/\n+$//;
		3562
2736	$self->add (new CFClient::UI::Label	3563	$self->add (new CFPlus::UI::Label
2737	markup => $tooltip,	3564	markup => $tooltip,
2738	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3565	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2739	fontsize => 0.8,	3566	fontsize => 0.8,
2740	fg => [0, 0, 0, 1],	3567	style => 1, # FLAG_INVERSE
2741	ellipsise => 0,	3568	ellipsise => 0,
2742	font => ($widget->{tooltip_font} || $::FONT_PROP),	3569	font => ($widget->{tooltip_font} || $::FONT_PROP),
2743	);	3570	);
2744	}	3571	}
2745		3572
…		…
2749	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3576	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2750		3577
2751	($w + 4, $h + 4)	3578	($w + 4, $h + 4)
2752	}	3579	}
2753		3580
2754	sub size_allocate {	3581	sub invoke_size_allocate {
2755	my ($self, $w, $h) = @_;	3582	my ($self, $w, $h) = @_;
2756		3583
2757	$self->SUPER::size_allocate ($w - 4, $h - 4);	3584	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2758	}	3585	}
2759		3586
2760	sub visibility_change {	3587	sub invoke_visibility_change {
2761	my ($self, $visible) = @_;	3588	my ($self, $visible) = @_;
2762		3589
2763	return unless $visible;	3590	return unless $visible;
2764		3591
2765	$self->{root}->on_post_alloc ("move_$self" => sub {	3592	$self->{root}->on_post_alloc ("move_$self" => sub {
2766	my $widget = $self->{owner}	3593	my $widget = $self->{owner}
2767	or return;	3594	or return;
2768		3595
		3596	if ($widget->{visible}) {
2769	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3597	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770		3598
2771	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3599	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772	if $x + $self->{w} > $::WIDTH;	3600	if $x + $self->{w} > $self->{root}{w};
2773		3601
2774	$self->move_abs ($x, $y);	3602	$self->move_abs ($x, $y);
		3603	} else {
		3604	$self->hide;
		3605	}
2775	});	3606	});
2776	}	3607	}
2777		3608
2778	sub _draw {	3609	sub _draw {
2779	my ($self) = @_;	3610	my ($self) = @_;
…		…
2781	glTranslate 0.375, 0.375;	3612	glTranslate 0.375, 0.375;
2782		3613
2783	my ($w, $h) = @$self{qw(w h)};	3614	my ($w, $h) = @$self{qw(w h)};
2784		3615
2785	glColor 1, 0.8, 0.4;	3616	glColor 1, 0.8, 0.4;
2786	glBegin GL_QUADS;	3617	glRect 0, 0, $w, $h;
2787	glVertex 0 , 0;
2788	glVertex 0 , $h;
2789	glVertex $w, $h;
2790	glVertex $w, 0;
2791	glEnd;
2792		3618
2793	glColor 0, 0, 0;	3619	glColor 0, 0, 0;
2794	glBegin GL_LINE_LOOP;	3620	glRect_lineloop 0, 0, $w, $h;
2795	glVertex 0 , 0;
2796	glVertex 0 , $h;
2797	glVertex $w, $h;
2798	glVertex $w, 0;
2799	glEnd;
2800		3621
2801	glTranslate 2 - 0.375, 2 - 0.375;	3622	glTranslate 2 - 0.375, 2 - 0.375;
2802		3623
2803	$self->SUPER::_draw;	3624	$self->SUPER::_draw;
2804	}	3625	}
2805		3626
2806	#############################################################################	3627	#############################################################################
2807		3628
2808	package CFClient::UI::Face;	3629	package CFPlus::UI::Face;
2809		3630
2810	our @ISA = CFClient::UI::Base::;	3631	our @ISA = CFPlus::UI::DrawBG::;
2811		3632
2812	use CFClient::OpenGL;	3633	use CFPlus::OpenGL;
2813		3634
2814	sub new {	3635	sub new {
2815	my $class = shift;	3636	my $class = shift;
2816		3637
2817	my $self = $class->SUPER::new (	3638	my $self = $class->SUPER::new (
		3639	size_w => 32,
		3640	size_h => 8,
2818	aspect => 1,	3641	aspect => 1,
2819	can_events => 0,	3642	can_events => 0,
2820	@_,	3643	@_,
2821	);	3644	);
2822		3645
2823	if ($self->{anim} && $self->{animspeed}) {	3646	if ($self->{anim} && $self->{animspeed}) {
2824	Scalar::Util::weaken (my $widget = $self);	3647	CFPlus::weaken (my $widget = $self);
2825		3648
		3649	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3650	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2826	$self->{timer} = Event->timer (	3651	$self->{timer} = Event->timer (
2827	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2828	hard => 1,	3652	parked => 1,
2829	interval => $self->{animspeed},
2830	cb => sub {	3653	cb => sub {
		3654	return unless $::CONN;
		3655
		3656	my $w = $widget
		3657	or return;
		3658
2831	++$widget->{frame};	3659	++$w->{frame};
		3660	$w->update_face;
		3661
		3662	# somehow, $widget can go away
2832	$widget->update;	3663	$w->update;
		3664	$w->update_timer;
2833	},	3665	},
2834	);	3666	);
		3667
		3668	$self->update_face;
		3669	$self->update_timer;
2835	}	3670	}
2836		3671
2837	$self	3672	$self
2838	}	3673	}
2839		3674
		3675	sub update_timer {
		3676	my ($self) = @_;
		3677
		3678	return unless $self->{timer};
		3679
		3680	if ($self->{visible}) {
		3681	$self->{timer}->at (
		3682	$self->{anim_start}
		3683	+ $self->{animspeed}
		3684	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3685	);
		3686	$self->{timer}->start;
		3687	} else {
		3688	$self->{timer}->stop;
		3689	}
		3690	}
		3691
		3692	sub update_face {
		3693	my ($self) = @_;
		3694
		3695	if ($::CONN) {
		3696	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3697	if ($anim && @$anim) {
		3698	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3699	delete $self->{face_change_cb};
		3700
		3701	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3702	unless ($tex->{name} || $tex->{loading}) {
		3703	$tex->upload (sub { $self->reconfigure });
		3704	}
		3705	}
		3706	}
		3707	}
		3708	}
		3709	}
		3710
2840	sub size_request {	3711	sub size_request {
2841	(32, 8)	3712	my ($self) = @_;
		3713
		3714	if ($::CONN) {
		3715	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3716	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3717	if ($tex->{name}) {
		3718	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3719	} elsif (!$tex->{loading}) {
		3720	$tex->upload (sub { $self->reconfigure });
		3721	}
		3722	}
		3723
		3724	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3725	}
		3726	}
		3727
		3728	($self->{size_w} || 8, $self->{size_h} || 8)
2842	}	3729	}
2843		3730
2844	sub update {	3731	sub update {
2845	my ($self) = @_;	3732	my ($self) = @_;
2846		3733
2847	return unless $self->{visible};	3734	return unless $self->{visible};
2848		3735
2849	$self->SUPER::update;	3736	$self->SUPER::update;
2850	}	3737	}
2851		3738
		3739	sub invoke_visibility_change {
		3740	my ($self) = @_;
		3741
		3742	$self->update_timer;
		3743
		3744	0
		3745	}
		3746
2852	sub _draw {	3747	sub _draw {
2853	my ($self) = @_;	3748	my ($self) = @_;
2854		3749
2855	return unless $::CONN;	3750	$self->SUPER::_draw;
2856		3751
2857	my $face;	3752	if (my $tex = $self->{tex}) {
2858
2859	if ($self->{frame}) {
2860	my $anim = $::CONN->{anim}[$self->{anim}];
2861
2862	$face = $anim->[ $self->{frame} % @$anim ]
2863	if $anim && @$anim;
2864	}
2865
2866	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2867
2868	if ($tex) {
2869	glEnable GL_TEXTURE_2D;	3753	glEnable GL_TEXTURE_2D;
2870	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3754	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2871	glColor 0, 0, 0, 1;	3755	glColor 0, 0, 0, 1;
2872	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3756	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873	glDisable GL_TEXTURE_2D;	3757	glDisable GL_TEXTURE_2D;
2874	}	3758	}
2875	}	3759	}
2876		3760
2877	sub DESTROY {	3761	sub destroy {
2878	my ($self) = @_;	3762	my ($self) = @_;
2879		3763
2880	$self->{timer}->cancel	3764	(delete $self->{timer})->cancel
2881	if $self->{timer};	3765	if $self->{timer};
2882		3766
2883	$self->SUPER::DESTROY;	3767	$self->SUPER::destroy;
2884	}	3768	}
2885		3769
2886	#############################################################################	3770	#############################################################################
2887		3771
2888	package CFClient::UI::Buttonbar;	3772	package CFPlus::UI::Buttonbar;
2889		3773
2890	our @ISA = CFClient::UI::HBox::;	3774	our @ISA = CFPlus::UI::HBox::;
2891		3775
2892	# TODO: should actualyl wrap buttons and other goodies.	3776	# TODO: should actually wrap buttons and other goodies.
2893		3777
2894	#############################################################################	3778	#############################################################################
2895		3779
2896	package CFClient::UI::Menu;	3780	package CFPlus::UI::Menu;
2897		3781
2898	our @ISA = CFClient::UI::FancyFrame::;	3782	our @ISA = CFPlus::UI::Toplevel::;
2899		3783
2900	use CFClient::OpenGL;	3784	use CFPlus::OpenGL;
2901		3785
2902	sub new {	3786	sub new {
2903	my $class = shift;	3787	my $class = shift;
2904		3788
2905	my $self = $class->SUPER::new (	3789	my $self = $class->SUPER::new (
2906	items => [],	3790	items => [],
2907	z => 100,	3791	z => 100,
2908	@_,	3792	@_,
2909	);	3793	);
2910		3794
2911	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3795	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2912		3796
2913	for my $item (@{ $self->{items} }) {	3797	for my $item (@{ $self->{items} }) {
2914	my ($widget, $cb) = @$item;	3798	my ($widget, $cb, $tooltip) = @$item;
2915		3799
2916	# handle various types of items, only text for now	3800	# handle various types of items, only text for now
2917	if (!ref $widget) {	3801	if (!ref $widget) {
		3802	if ($widget =~ /\t/) {
		3803	my ($left, $right) = split /\t/, $widget, 2;
		3804
2918	$widget = new CFClient::UI::Label	3805	$widget = new CFPlus::UI::HBox
2919	can_hover => 1,	3806	can_hover => 1,
2920	can_events => 1,	3807	can_events => 1,
		3808	tooltip => $tooltip,
		3809	children => [
		3810	(new CFPlus::UI::Label markup => $left, expand => 1),
		3811	(new CFPlus::UI::Label markup => $right, align => +1),
		3812	],
		3813	;
		3814
		3815	} else {
		3816	$widget = new CFPlus::UI::Label
		3817	can_hover => 1,
		3818	can_events => 1,
2921	text => $widget;	3819	markup => $widget,
		3820	tooltip => $tooltip;
		3821	}
2922	}	3822	}
2923		3823
2924	$self->{item}{$widget} = $item;	3824	$self->{item}{$widget} = $item;
2925		3825
2926	$self->{vbox}->add ($widget);	3826	$self->{vbox}->add ($widget);
…		…
2931		3831
2932	# popup given the event (must be a mouse button down event currently)	3832	# popup given the event (must be a mouse button down event currently)
2933	sub popup {	3833	sub popup {
2934	my ($self, $ev) = @_;	3834	my ($self, $ev) = @_;
2935		3835
2936	$self->_emit ("popdown");	3836	$self->emit ("popdown");
2937		3837
2938	# maybe save $GRAB? must be careful about events...	3838	# maybe save $GRAB? must be careful about events...
2939	$GRAB = $self;	3839	$GRAB = $self;
2940	$self->{button} = $ev->{button};	3840	$self->{button} = $ev->{button};
2941		3841
2942	$self->show;	3842	$self->show;
2943	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3843	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2944	}	3844	}
2945		3845
2946	sub mouse_motion {	3846	sub invoke_mouse_motion {
2947	my ($self, $ev, $x, $y) = @_;	3847	my ($self, $ev, $x, $y) = @_;
2948		3848
2949	# TODO: should use vbox->find_widget or so	3849	# TODO: should use vbox->find_widget or so
2950	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3850	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951	$self->{hover} = $self->{item}{$HOVER};	3851	$self->{hover} = $self->{item}{$HOVER};
2952		3852
2953	0	3853	0
2954	}	3854	}
2955		3855
2956	sub button_up {	3856	sub invoke_button_up {
2957	my ($self, $ev, $x, $y) = @_;	3857	my ($self, $ev, $x, $y) = @_;
2958		3858
2959	if ($ev->{button} == $self->{button}) {	3859	if ($ev->{button} == $self->{button}) {
2960	undef $GRAB;	3860	undef $GRAB;
2961	$self->hide;	3861	$self->hide;
2962		3862
2963	$self->_emit ("popdown");	3863	$self->emit ("popdown");
2964	$self->{hover}[1]->() if $self->{hover};	3864	$self->{hover}[1]->() if $self->{hover};
2965	} else {	3865	} else {
2966	return 0	3866	return 0
2967	}	3867	}
2968		3868
2969	1	3869	1
2970	}	3870	}
2971		3871
2972	#############################################################################	3872	#############################################################################
2973		3873
2974	package CFClient::UI::Multiplexer;	3874	package CFPlus::UI::Multiplexer;
2975		3875
2976	our @ISA = CFClient::UI::Container::;	3876	our @ISA = CFPlus::UI::Container::;
2977		3877
2978	sub new {	3878	sub new {
2979	my $class = shift;	3879	my $class = shift;
2980		3880
2981	my $self = $class->SUPER::new (	3881	my $self = $class->SUPER::new (
…		…
2995		3895
2996	$self->{current} = $self->{children}[0]	3896	$self->{current} = $self->{children}[0]
2997	if @{ $self->{children} };	3897	if @{ $self->{children} };
2998	}	3898	}
2999		3899
		3900	sub get_current_page {
		3901	my ($self) = @_;
		3902
		3903	$self->{current}
		3904	}
		3905
3000	sub set_current_page {	3906	sub set_current_page {
3001	my ($self, $page_or_widget) = @_;	3907	my ($self, $page_or_widget) = @_;
3002		3908
3003	my $widget = ref $page_or_widget	3909	my $widget = ref $page_or_widget
3004	? $page_or_widget	3910	? $page_or_widget
3005	: $self->{children}[$page_or_widget];	3911	: $self->{children}[$page_or_widget];
3006		3912
3007	$self->{current} = $widget;	3913	$self->{current} = $widget;
3008	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3914	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009		3915
3010	$self->_emit (page_changed => $self->{current});	3916	$self->emit (page_changed => $self->{current});
3011		3917
3012	$self->realloc;	3918	$self->realloc;
3013	}	3919	}
3014		3920
3015	sub visible_children {	3921	sub visible_children {
…		…
3020	my ($self) = @_;	3926	my ($self) = @_;
3021		3927
3022	$self->{current}->size_request	3928	$self->{current}->size_request
3023	}	3929	}
3024		3930
3025	sub size_allocate {	3931	sub invoke_size_allocate {
3026	my ($self, $w, $h) = @_;	3932	my ($self, $w, $h) = @_;
3027		3933
3028	$self->{current}->configure (0, 0, $w, $h);	3934	$self->{current}->configure (0, 0, $w, $h);
		3935
		3936	1
3029	}	3937	}
3030		3938
3031	sub _draw {	3939	sub _draw {
3032	my ($self) = @_;	3940	my ($self) = @_;
3033		3941
3034	$self->{current}->draw;	3942	$self->{current}->draw;
3035	}	3943	}
3036		3944
3037	#############################################################################	3945	#############################################################################
3038		3946
3039	package CFClient::UI::Notebook;	3947	package CFPlus::UI::Notebook;
3040		3948
		3949	use CFPlus::OpenGL;
		3950
3041	our @ISA = CFClient::UI::VBox::;	3951	our @ISA = CFPlus::UI::VBox::;
3042		3952
3043	sub new {	3953	sub new {
3044	my $class = shift;	3954	my $class = shift;
3045		3955
3046	my $self = $class->SUPER::new (	3956	my $self = $class->SUPER::new (
3047	buttonbar => (new CFClient::UI::Buttonbar),	3957	buttonbar => (new CFPlus::UI::Buttonbar),
3048	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3958	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3959	active_outline => [1, 1, 0],
3049	# filter => # will be put between multiplexer and $self	3960	# filter => # will be put between multiplexer and $self
3050	@_,	3961	@_,
3051	);	3962	);
3052		3963
3053	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3964	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3054	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3965	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3055		3966
		3967	{
		3968	Scalar::Util::weaken (my $wself = $self);
		3969
		3970	$self->{multiplexer}->connect (c_add => sub {
		3971	my ($mplex, $widgets) = @_;
		3972
		3973	for my $child (@$widgets) {
		3974	Scalar::Util::weaken $child;
		3975	$child->{c_tab_} ||= do {
		3976	my $tab =
		3977	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3978	? $child->{c_tab}
		3979	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3980
		3981	$tab->connect (activate => sub {
		3982	$wself->set_current_page ($child);
		3983	});
		3984
		3985	$tab
		3986	};
		3987
		3988	$self->{buttonbar}->add ($child->{c_tab_});
		3989	}
		3990	});
		3991
		3992	$self->{multiplexer}->connect (c_remove => sub {
		3993	my ($mplex, $widgets) = @_;
		3994
		3995	for my $child (@$widgets) {
		3996	$wself->{buttonbar}->remove ($child->{c_tab_});
		3997	}
		3998	});
		3999	}
		4000
3056	$self	4001	$self
3057	}	4002	}
3058		4003
3059	sub add {	4004	sub add {
		4005	my ($self, @widgets) = @_;
		4006
		4007	$self->{multiplexer}->add (@widgets)
		4008	}
		4009
		4010	sub remove {
		4011	my ($self, @widgets) = @_;
		4012
		4013	$self->{multiplexer}->remove (@widgets)
		4014	}
		4015
		4016	sub pages {
		4017	my ($self) = @_;
		4018	$self->{multiplexer}->children
		4019	}
		4020
		4021	sub add_tab {
3060	my ($self, $title, $widget, $tooltip) = @_;	4022	my ($self, $title, $widget, $tooltip) = @_;
3061		4023
3062	Scalar::Util::weaken $self;	4024	$title = [$title, $tooltip] unless ref $title;
		4025	$widget->{c_tab} = $title;
3063		4026
3064	$self->{buttonbar}->add (new CFClient::UI::Button
3065	markup => $title,
3066	tooltip => $tooltip,
3067	on_activate => sub { $self->set_current_page ($widget) },
3068	);
3069
3070	$self->{multiplexer}->add ($widget);	4027	$self->add ($widget);
		4028	}
		4029
		4030	sub get_current_page {
		4031	my ($self) = @_;
		4032
		4033	$self->{multiplexer}->get_current_page
3071	}	4034	}
3072		4035
3073	sub set_current_page {	4036	sub set_current_page {
3074	my ($self, $page) = @_;	4037	my ($self, $page) = @_;
3075		4038
3076	$self->{multiplexer}->set_current_page ($page);	4039	$self->{multiplexer}->set_current_page ($page);
3077	$self->_emit (page_changed => $self->{multiplexer}{current});	4040	$self->emit (page_changed => $self->{multiplexer}{current});
		4041	}
		4042
		4043	sub _draw {
		4044	my ($self) = @_;
		4045
		4046	$self->SUPER::_draw ();
		4047
		4048	if (my $cur = $self->{multiplexer}{current}) {
		4049	if ($cur = $cur->{c_tab_}) {
		4050	glTranslate $cur->{x}, $cur->{y};
		4051	glLineWidth 3;
		4052	glColor @{$self->{active_outline}};
		4053	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4054	glLineWidth 1;
		4055	}
		4056	}
3078	}	4057	}
3079		4058
3080	#############################################################################	4059	#############################################################################
3081		4060
		4061	package CFPlus::UI::Selector;
		4062
		4063	use utf8;
		4064
		4065	our @ISA = CFPlus::UI::Button::;
		4066
		4067	sub new {
		4068	my $class = shift;
		4069
		4070	my $self = $class->SUPER::new (
		4071	options => [], # [value, title, longdesc], ...
		4072	value => undef,
		4073	@_,
		4074	);
		4075
		4076	$self->_set_value ($self->{value});
		4077
		4078	$self
		4079	}
		4080
		4081	sub invoke_button_down {
		4082	my ($self, $ev) = @_;
		4083
		4084	my @menu_items;
		4085
		4086	for (@{ $self->{options} }) {
		4087	my ($value, $title, $tooltip) = @$_;
		4088
		4089	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		4090	}
		4091
		4092	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		4093	}
		4094
		4095	sub _set_value {
		4096	my ($self, $value) = @_;
		4097
		4098	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		4099	or return;
		4100
		4101	$self->{value} = $item->[0];
		4102	$self->set_markup ("$item->[1] ⇓");
		4103	$self->set_tooltip ($item->[2]);
		4104	}
		4105
		4106	sub set_value {
		4107	my ($self, $value) = @_;
		4108
		4109	return unless $self->{value} ne $value;
		4110
		4111	$self->_set_value ($value);
		4112	$self->emit (changed => $value);
		4113	}
		4114
		4115	#############################################################################
		4116
3082	package CFClient::UI::Statusbox;	4117	package CFPlus::UI::Statusbox;
3083		4118
3084	our @ISA = CFClient::UI::VBox::;	4119	our @ISA = CFPlus::UI::VBox::;
3085		4120
3086	sub new {	4121	sub new {
3087	my $class = shift;	4122	my $class = shift;
3088		4123
3089	my $self = $class->SUPER::new (	4124	my $self = $class->SUPER::new (
3090	fontsize => 0.8,	4125	fontsize => 0.8,
3091	@_,	4126	@_,
3092	);	4127	);
3093		4128
3094	Scalar::Util::weaken (my $this = $self);	4129	CFPlus::weaken (my $this = $self);
3095		4130
3096	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4131	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3097		4132
3098	$self	4133	$self
3099	}	4134	}
…		…
3101	sub reorder {	4136	sub reorder {
3102	my ($self) = @_;	4137	my ($self) = @_;
3103	my $NOW = Time::HiRes::time;	4138	my $NOW = Time::HiRes::time;
3104		4139
3105	# freeze display when hovering over any label	4140	# freeze display when hovering over any label
3106	return if $CFClient::UI::TOOLTIP->{owner}	4141	return if $CFPlus::UI::TOOLTIP->{owner}
3107	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4142	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3108	values %{ $self->{item} };	4143	values %{ $self->{item} };
3109		4144
3110	while (my ($k, $v) = each %{ $self->{item} }) {	4145	while (my ($k, $v) = each %{ $self->{item} }) {
3111	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4146	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3112	}	4147	}
…		…
3133	for ($short) {	4168	for ($short) {
3134	s/^\s+//;	4169	s/^\s+//;
3135	s/\s+/ /g;	4170	s/\s+/ /g;
3136	}	4171	}
3137		4172
3138	new CFClient::UI::Label	4173	new CFPlus::UI::Label
3139	markup => $short,	4174	markup => $short,
3140	tooltip => $item->{tooltip},	4175	tooltip => $item->{tooltip},
3141	tooltip_font => $::FONT_PROP,	4176	tooltip_font => $::FONT_PROP,
3142	tooltip_width => 0.67,	4177	tooltip_width => 0.67,
3143	fontsize => $item->{fontsize} || $self->{fontsize},	4178	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3181	$item->{count}++;	4216	$item->{count}++;
3182	} else {	4217	} else {
3183	$item->{count} = 1;	4218	$item->{count} = 1;
3184	$item->{text} = $item->{tooltip} = $text;	4219	$item->{text} = $item->{tooltip} = $text;
3185	}	4220	}
3186	$item->{id} = ++$self->{id};	4221	$item->{id} += 0.2;#d#
3187	$item->{timeout} = $timeout;	4222	$item->{timeout} = $timeout;
3188	delete $item->{label};	4223	delete $item->{label};
3189	} else {	4224	} else {
3190	$self->{item}{$group} = {	4225	$self->{item}{$group} = {
3191	id => ++$self->{id},	4226	id => ++$self->{id},
…		…
3197	count => 1,	4232	count => 1,
3198	%arg,	4233	%arg,
3199	};	4234	};
3200	}	4235	}
3201		4236
		4237	$ROOT->on_refresh (reorder => sub {
3202	$self->reorder;	4238	$self->reorder;
		4239	});
3203	}	4240	}
3204		4241
3205	sub reconfigure {	4242	sub reconfigure {
3206	my ($self) = @_;	4243	my ($self) = @_;
3207		4244
…		…
3210		4247
3211	$self->reorder;	4248	$self->reorder;
3212	$self->SUPER::reconfigure;	4249	$self->SUPER::reconfigure;
3213	}	4250	}
3214		4251
3215	sub DESTROY {	4252	sub destroy {
3216	my ($self) = @_;	4253	my ($self) = @_;
3217		4254
3218	$self->{timer}->cancel;	4255	$self->{timer}->cancel;
3219		4256
3220	$self->SUPER::DESTROY;	4257	$self->SUPER::destroy;
3221	}	4258	}
3222		4259
3223	#############################################################################	4260	#############################################################################
3224		4261
3225	package CFClient::UI::Inventory;
3226
3227	our @ISA = CFClient::UI::ScrolledWindow::;
3228
3229	sub new {
3230	my $class = shift;
3231
3232	my $self = $class->SUPER::new (
3233	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3234	@_,
3235	);
3236
3237	$self
3238	}
3239
3240	sub set_items {
3241	my ($self, $items) = @_;
3242
3243	$self->{child}->clear;
3244	return unless $items;
3245
3246	my @items = sort {
3247	($a->{type} <=> $b->{type})
3248	or ($a->{name} cmp $b->{name})
3249	} @$items;
3250
3251	$self->{real_items} = \@items;
3252
3253	my $row = 0;
3254	for my $item (@items) {
3255	CFClient::Item::update_widgets $item;
3256
3257	$self->{child}->add (0, $row, $item->{face_widget});
3258	$self->{child}->add (1, $row, $item->{desc_widget});
3259	$self->{child}->add (2, $row, $item->{weight_widget});
3260
3261	$row++;
3262	}
3263	}
3264
3265	#############################################################################
3266
3267	package CFClient::UI::BindEditor;
3268
3269	our @ISA = CFClient::UI::FancyFrame::;
3270
3271	sub new {
3272	my $class = shift;
3273
3274	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276	$self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280	text => "start recording",
3281	tooltip => "Start/Stops recording of actions."
3282	."All subsequent actions after the recording started will be captured."
3283	."The actions are displayed after the record was stopped."
3284	."To bind the action you have to click on the 'Bind' button",
3285	on_activate => sub {
3286	unless ($self->{recording}) {
3287	$self->start;
3288	} else {
3289	$self->stop;
3290	}
3291	});
3292
3293	$vb->add (new CFClient::UI::Label text => "Actions:");
3294	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3297	$vb->add (my $hb = new CFClient::UI::HBox);
3298	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299	$hb->add (new CFClient::UI::Button
3300	text => "bind",
3301	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302	on_activate => sub {
3303	$self->ask_for_bind;
3304	});
3305
3306	$vb->add (my $hb = new CFClient::UI::HBox);
3307	$hb->add (new CFClient::UI::Button
3308	text => "ok",
3309	expand => 1,
3310	tooltip => "This closes the binding editor and saves the binding",
3311	on_activate => sub {
3312	$self->hide;
3313	$self->commit;
3314	});
3315
3316	$hb->add (new CFClient::UI::Button
3317	text => "cancel",
3318	expand => 1,
3319	tooltip => "This closes the binding editor without saving",
3320	on_activate => sub {
3321	$self->hide;
3322	$self->{binding_cancel}->()
3323	if $self->{binding_cancel};
3324	});
3325
3326	$self->update_binding_widgets;
3327
3328	$self
3329	}
3330
3331	sub commit {
3332	my ($self) = @_;
3333	my ($mod, $sym, $cmds) = $self->get_binding;
3334	if ($sym != 0 && @$cmds > 0) {
3335	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336	."'. Don't forget 'Save Config'!");
3337	$self->{binding_change}->($mod, $sym, $cmds)
3338	if $self->{binding_change};
3339	} else {
3340	$::STATUSBOX->add ("No action bound, no key or action specified!");
3341	$self->{binding_cancel}->()
3342	if $self->{binding_cancel};
3343	}
3344	}
3345
3346	sub start {
3347	my ($self) = @_;
3348
3349	$self->{rec_btn}->set_text ("stop recording");
3350	$self->{recording} = 1;
3351	$self->clear_command_list;
3352	$::CONN->start_record if $::CONN;
3353	}
3354
3355	sub stop {
3356	my ($self) = @_;
3357
3358	$self->{rec_btn}->set_text ("start recording");
3359	$self->{recording} = 0;
3360
3361	my $rec;
3362	$rec = $::CONN->stop_record if $::CONN;
3363	return unless ref $rec eq 'ARRAY';
3364	$self->set_command_list ($rec);
3365	}
3366
3367
3368	sub ask_for_bind_and_commit {
3369	my ($self) = @_;
3370	$self->ask_for_bind (1);
3371	}
3372
3373	sub ask_for_bind {
3374	my ($self, $commit) = @_;
3375
3376	CFClient::Binder::open_binding_dialog (sub {
3377	my ($mod, $sym) = @_;
3378	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379	$self->update_binding_widgets;
3380	$self->commit if $commit;
3381	});
3382	}
3383
3384	# $mod and $sym are the modifiers and key symbol
3385	# $cmds is a array ref of strings (the commands)
3386	# $cb is the callback that is executed on OK
3387	# $ccb is the callback that is executed on CANCEL and
3388	# when the binding was unsuccessful on OK
3389	sub set_binding {
3390	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392	$self->clear_command_list;
3393	$self->{recording} = 0;
3394	$self->{rec_btn}->set_text ("start recording");
3395
3396	$self->{binding} = [$mod, $sym];
3397	$self->{commands} = $cmds;
3398
3399	$self->{binding_change} = $cb;
3400	$self->{binding_cancel} = $ccb;
3401
3402	$self->update_binding_widgets;
3403	}
3404
3405	# this is a shortcut method that asks for a binding
3406	# and then just binds it.
3407	sub do_quick_binding {
3408	my ($self, $cmds) = @_;
3409	$self->set_binding (undef, undef, $cmds, sub {
3410	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411	});
3412	$self->ask_for_bind (1);
3413	}
3414
3415	sub update_binding_widgets {
3416	my ($self) = @_;
3417	my ($mod, $sym, $cmds) = $self->get_binding;
3418	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419	$self->set_command_list ($cmds);
3420	}
3421
3422	sub get_binding {
3423	my ($self) = @_;
3424	return (
3425	$self->{binding}->[0],
3426	$self->{binding}->[1],
3427	[ grep { defined $_ } @{$self->{commands}} ]
3428	);
3429	}
3430
3431	sub clear_command_list {
3432	my ($self) = @_;
3433	$self->{cmdbox}->clear ();
3434	}
3435
3436	sub set_command_list {
3437	my ($self, $cmds) = @_;
3438
3439	$self->{cmdbox}->clear ();
3440	$self->{commands} = $cmds;
3441
3442	my $idx = 0;
3443
3444	for (@$cmds) {
3445	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447	my $i = $idx;
3448	$hb->add (new CFClient::UI::Label text => $_);
3449	$hb->add (new CFClient::UI::Button
3450	text => "delete",
3451	tooltip => "Deletes the action from the record",
3452	on_activate => sub {
3453	$self->{cmdbox}->remove ($hb);
3454	$cmds->[$i] = undef;
3455	});
3456
3457
3458	$idx++
3459	}
3460	}
3461
3462	#############################################################################
3463
3464	package CFClient::UI::SpellList;
3465
3466	our @ISA = CFClient::UI::Table::;
3467
3468	sub new {
3469	my $class = shift;
3470
3471	my $self = $class->SUPER::new (
3472	binding => [],
3473	commands => [],
3474	@_,
3475	)
3476	}
3477
3478	# XXX: Do sorting? Argl...
3479	sub add_spell {
3480	my ($self, $spell) = @_;
3481	$self->{spells}->{$spell->{name}} = $spell;
3482
3483	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484	face => $spell->{face},
3485	can_hover => 1,
3486	can_events => 1,
3487	tooltip => $spell->{message});
3488
3489	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490	text => $spell->{name},
3491	can_hover => 1,
3492	can_events => 1,
3493	tooltip => $spell->{message},
3494	expand => 1);
3495
3496	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499	expand => 1);
3500
3501	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502	text => "bind to key",
3503	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504	}
3505
3506	sub rebuild_spell_list {
3507	my ($self) = @_;
3508	$self->{tbl_idx} = 0;
3509	$self->add_spell ($_) for values %{$self->{spells}};
3510	}
3511
3512	sub remove_spell {
3513	my ($self, $spell) = @_;
3514	delete $self->{spells}->{$spell->{name}};
3515	$self->rebuild_spell_list;
3516	}
3517
3518	#############################################################################
3519
3520	package CFClient::UI::Root;	4262	package CFPlus::UI::Root;
3521		4263
3522	our @ISA = CFClient::UI::Container::;	4264	our @ISA = CFPlus::UI::Container::;
3523		4265
3524	use List::Util qw(min max);	4266	use List::Util qw(min max);
3525		4267
3526	use CFClient::OpenGL;	4268	use CFPlus::OpenGL;
3527		4269
3528	sub new {	4270	sub new {
3529	my $class = shift;	4271	my $class = shift;
3530		4272
3531	my $self = $class->SUPER::new (	4273	my $self = $class->SUPER::new (
3532	visible => 1,	4274	visible => 1,
3533	@_,	4275	@_,
3534	);	4276	);
3535		4277
3536	Scalar::Util::weaken ($self->{root} = $self);	4278	CFPlus::weaken ($self->{root} = $self);
3537		4279
3538	$self	4280	$self
3539	}	4281	}
3540		4282
3541	sub size_request {	4283	sub size_request {
…		…
3556	$coord = $max - $size if $coord > $max - $size;	4298	$coord = $max - $size if $coord > $max - $size;
3557		4299
3558	int $coord + 0.5	4300	int $coord + 0.5
3559	}	4301	}
3560		4302
3561	sub size_allocate {	4303	sub invoke_size_allocate {
3562	my ($self, $w, $h) = @_;	4304	my ($self, $w, $h) = @_;
3563		4305
3564	for my $child ($self->children) {	4306	for my $child ($self->children) {
3565	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4307	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3566		4308
…		…
3570	$X = _to_pixel $X, $W, $self->{w};	4312	$X = _to_pixel $X, $W, $self->{w};
3571	$Y = _to_pixel $Y, $H, $self->{h};	4313	$Y = _to_pixel $Y, $H, $self->{h};
3572		4314
3573	$child->configure ($X, $Y, $W, $H);	4315	$child->configure ($X, $Y, $W, $H);
3574	}	4316	}
		4317
		4318	1
3575	}	4319	}
3576		4320
3577	sub coord2local {	4321	sub coord2local {
3578	my ($self, $x, $y) = @_;	4322	my ($self, $x, $y) = @_;
3579		4323
…		…
3587	}	4331	}
3588		4332
3589	sub update {	4333	sub update {
3590	my ($self) = @_;	4334	my ($self) = @_;
3591		4335
3592	$::WANT_REFRESH++;	4336	$::WANT_REFRESH->start;
3593	}	4337	}
3594		4338
3595	sub add {	4339	sub add {
3596	my ($self, @children) = @_;	4340	my ($self, @children) = @_;
3597		4341
…		…
3634	while ($self->{refresh_hook}) {	4378	while ($self->{refresh_hook}) {
3635	$_->()	4379	$_->()
3636	for values %{delete $self->{refresh_hook}};	4380	for values %{delete $self->{refresh_hook}};
3637	}	4381	}
3638		4382
3639	if ($self->{realloc}) {	4383	while ($self->{realloc}) {
3640	my %queue;	4384	my %queue;
3641	my @queue;	4385	my @queue;
3642	my $widget;	4386	my $widget;
3643		4387
3644	outer:	4388	outer:
…		…
3691	}	4435	}
3692	}	4436	}
3693		4437
3694	delete $self->{realloc}{$widget+0};	4438	delete $self->{realloc}{$widget+0};
3695	}	4439	}
3696	}
3697		4440
3698	while (my $size_alloc = delete $self->{size_alloc}) {	4441	while (my $size_alloc = delete $self->{size_alloc}) {
3699	my @queue = sort { $b->{visible} <=> $a->{visible} }	4442	my @queue = sort { $a->{visible} <=> $b->{visible} }
3700	values %$size_alloc;	4443	values %$size_alloc;
3701		4444
3702	while () {	4445	while () {
3703	my $widget = pop @queue || last;	4446	my $widget = pop @queue || last;
3704		4447
3705	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4448	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3706		4449
3707	$w = 0 if $w < 0;	4450	$w = max $widget->{min_w}, $w;
3708	$h = 0 if $h < 0;	4451	$h = max $widget->{min_h}, $h;
3709		4452
		4453	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4454	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4455
		4456	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4457	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4458
3710	$w = int $w + 0.5;	4459	$w = int $w + 0.5;
3711	$h = int $h + 0.5;	4460	$h = int $h + 0.5;
3712		4461
3713	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4462	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3714	$widget->{old_w} = $widget->{w};	4463	$widget->{old_w} = $widget->{w};
3715	$widget->{old_h} = $widget->{h};	4464	$widget->{old_h} = $widget->{h};
3716		4465
3717	$widget->{w} = $w;	4466	$widget->{w} = $w;
3718	$widget->{h} = $h;	4467	$widget->{h} = $h;
3719		4468
3720	$widget->emit (size_allocate => $w, $h);	4469	$widget->emit (size_allocate => $w, $h);
		4470	}
3721	}	4471	}
3722	}	4472	}
3723	}	4473	}
3724		4474
3725	while ($self->{post_alloc_hook}) {	4475	while ($self->{post_alloc_hook}) {
3726	$_->()	4476	$_->()
3727	for values %{delete $self->{post_alloc_hook}};	4477	for values %{delete $self->{post_alloc_hook}};
3728	}	4478	}
3729
3730		4479
3731	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4480	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3732	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4481	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3733	glClear GL_COLOR_BUFFER_BIT;	4482	glClear GL_COLOR_BUFFER_BIT;
3734		4483
…		…
3737	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4486	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3738	glMatrixMode GL_MODELVIEW;	4487	glMatrixMode GL_MODELVIEW;
3739	glLoadIdentity;	4488	glLoadIdentity;
3740		4489
3741	{	4490	{
3742	package CFClient::UI::Base;	4491	package CFPlus::UI::Base;
3743		4492
3744	($draw_x, $draw_y, $draw_w, $draw_h) =	4493	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3745	(0, 0, $self->{w}, $self->{h});	4494	(0, 0, $self->{w}, $self->{h});
3746	}
3747		4495
3748	$self->_draw;	4496	$self->_draw;
		4497	}
3749	}	4498	}
3750		4499
3751	#############################################################################	4500	#############################################################################
3752		4501
3753	package CFClient::UI;	4502	package CFPlus::UI;
3754		4503
3755	$ROOT = new CFClient::UI::Root;	4504	$ROOT = new CFPlus::UI::Root;
3756	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4505	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3757		4506
3758	1	4507	1
3759		4508

Diff Legend

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