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.290 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.434 by root, Wed Aug 22 21:32:09 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __w_ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
272		306
273	return unless $self->{visible};	307	return unless $self->{visible};
274		308
275	$_->set_invisible for $self->children;	309	$_->set_invisible for $self->children;
276		310
		311	delete $self->{visible};
277	delete $self->{root};	312	delete $self->{root};
278	delete $self->{visible};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->focus_out;	320	$self->emit ("focus_out");
287
288	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
289	}	322	}
290		323
291	sub set_visibility {	324	sub set_visibility {
292	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
293		326
294	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
295		328
296	$visible ? $self->hide	329	$visible ? $self->show
297	: $self->show;	330	: $self->hide;
298	}	331	}
299		332
300	sub toggle_visibility {	333	sub toggle_visibility {
301	my ($self) = @_;	334	my ($self) = @_;
302		335
…		…
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);
1559		1926
1560	delete $self->{size_req};	1927	delete $self->{size_req};
1561	$self->realloc;	1928	$self->realloc;
1562	$self->update;	1929	$self->update;
…		…
1568	return if $self->{text} eq "M$markup";	1935	return if $self->{text} eq "M$markup";
1569	$self->{text} = "M$markup";	1936	$self->{text} = "M$markup";
1570		1937
1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1938	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572		1939
1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574	$self->{layout}->set_markup ($markup);	1940	$self->{layout}->set_markup ($markup);
1575		1941
1576	delete $self->{size_req};	1942	delete $self->{size_req};
1577	$self->realloc;	1943	$self->realloc;
1578	$self->update;	1944	$self->update;
…		…
1590		1956
1591	my ($w, $h) = $self->{layout}->size;	1957	my ($w, $h) = $self->{layout}->size;
1592		1958
1593	if (exists $self->{template}) {	1959	if (exists $self->{template}) {
1594	$self->{template}->set_font ($self->{font}) if $self->{font};	1960	$self->{template}->set_font ($self->{font}) if $self->{font};
		1961	$self->{template}->set_width ($self->{max_w} || -1);
1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1962	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596		1963
1597	my ($w2, $h2) = $self->{template}->size;	1964	my ($w2, $h2) = $self->{template}->size;
1598		1965
1599	$w = List::Util::max $w, $w2;	1966	$w = List::Util::max $w, $w2;
…		…
1604	};	1971	};
1605		1972
1606	@{ $self->{size_req} }	1973	@{ $self->{size_req} }
1607	}	1974	}
1608		1975
		1976	sub baseline_shift {
		1977	$_[0]{layout}->descent
		1978	}
		1979
1609	sub size_allocate {	1980	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1981	my ($self, $w, $h) = @_;
1611		1982
1612	delete $self->{ox};	1983	delete $self->{ox};
1613		1984
1614	delete $self->{texture}	1985	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1986	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1987
		1988	1
1616	}	1989	}
1617		1990
1618	sub set_fontsize {	1991	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1992	my ($self, $fontsize) = @_;
1620		1993
1621	$self->{fontsize} = $fontsize;	1994	$self->{fontsize} = $fontsize;
		1995	delete $self->{size_req};
1622	delete $self->{texture};	1996	delete $self->{texture};
1623		1997
1624	$self->realloc;	1998	$self->realloc;
1625	}	1999	}
1626		2000
1627	sub reconfigure {	2001	sub reconfigure {
1628	my ($self) = @_;	2002	my ($self) = @_;
1629		2003
1630	delete $self->{size_req};	2004	delete $self->{size_req};
		2005	delete $self->{texture};
1631		2006
1632	$self->SUPER::reconfigure;	2007	$self->SUPER::reconfigure;
1633	}	2008	}
1634		2009
1635	sub _draw {	2010	sub _draw {
1636	my ($self) = @_;	2011	my ($self) = @_;
1637		2012
1638	$self->SUPER::_draw; # draw background, if applicable	2013	$self->SUPER::_draw; # draw background, if applicable
1639		2014
1640	my $tex = $self->{texture} ||= do {	2015	my $size = $self->{texture} ||= do {
1641	$self->{layout}->set_foreground (@{$self->{fg}});	2016	$self->{layout}->set_foreground (@{$self->{fg}});
1642	$self->{layout}->set_font ($self->{font}) if $self->{font};	2017	$self->{layout}->set_font ($self->{font}) if $self->{font};
1643	$self->{layout}->set_width ($self->{w});	2018	$self->{layout}->set_width ($self->{w});
1644	$self->{layout}->set_ellipsise ($self->{ellipsise});	2019	$self->{layout}->set_ellipsise ($self->{ellipsise});
1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2020	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2021	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647		2022
1648	new_from_layout CFClient::Texture $self->{layout}	2023	[$self->{layout}->size]
1649	};	2024	};
1650		2025
1651	unless (exists $self->{ox}) {	2026	unless (exists $self->{ox}) {
1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2027	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2028	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654	: ($self->{w} - $tex->{w}) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
1655		2030
1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658	: ($self->{h} - $tex->{h}) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1659	};	2036	};
1660		2037
1661	glEnable GL_TEXTURE_2D;	2038	# unless ($self->{list}) {
1662		2039	# $self->{list} = CFPlus::OpenGL::glGenList;
1663	if ($tex->{format} == GL_ALPHA) {	2040	# CFPlus::OpenGL::glNewList $self->{list};
1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	2041	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1665	glColor @{$self->{fg}};	2042	# CFPlus::OpenGL::glEndList;
1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667	} else {
1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670	}	2043	# }
		2044	#
		2045	# CFPlus::OpenGL::glCallList $self->{list};
1671		2046
1672	glDisable GL_TEXTURE_2D;	2047	$self->{layout}->draw;
1673	}	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	#}
1674		2057
1675	#############################################################################	2058	#############################################################################
1676		2059
1677	package CFClient::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
1678		2061
1679	our @ISA = CFClient::UI::Label::;	2062	our @ISA = CFPlus::UI::Label::;
1680		2063
1681	use CFClient::OpenGL;	2064	use CFPlus::OpenGL;
1682		2065
1683	sub new {	2066	sub new {
1684	my $class = shift;	2067	my $class = shift;
1685		2068
1686	$class->SUPER::new (	2069	$class->SUPER::new (
1687	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
1688	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
1689	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
1690	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
1691	can_hover => 1,	2076	can_hover => 1,
1692	can_focus => 1,	2077	can_focus => 1,
1693	valign => 0,	2078	valign => 0,
1694	can_events => 1,	2079	can_events => 1,
		2080	ellipsise => 0,
1695	#text => ...	2081	#text => ...
		2082	#hidden => "*",
1696	@_	2083	@_
1697	)	2084	)
1698	}	2085	}
1699		2086
1700	sub _set_text {	2087	sub _set_text {
…		…
1709		2096
1710	$text =~ s/./*/g if $self->{hidden};	2097	$text =~ s/./*/g if $self->{hidden};
1711	$self->{layout}->set_text ("$text ");	2098	$self->{layout}->set_text ("$text ");
1712	delete $self->{size_req};	2099	delete $self->{size_req};
1713		2100
1714	$self->_emit (changed => $self->{text});	2101	$self->emit (changed => $self->{text});
1715		2102
1716	$self->realloc;	2103	$self->realloc;
1717	$self->update;	2104	$self->update;
1718	}	2105	}
1719		2106
…		…
1734	my ($w, $h) = $self->SUPER::size_request;	2121	my ($w, $h) = $self->SUPER::size_request;
1735		2122
1736	($w + 1, $h) # add 1 for cursor	2123	($w + 1, $h) # add 1 for cursor
1737	}	2124	}
1738		2125
1739	sub key_down {	2126	sub invoke_key_down {
1740	my ($self, $ev) = @_;	2127	my ($self, $ev) = @_;
1741		2128
1742	my $mod = $ev->{mod};	2129	my $mod = $ev->{mod};
1743	my $sym = $ev->{sym};	2130	my $sym = $ev->{sym};
1744	my $uni = $ev->{unicode};	2131	my $uni = $ev->{unicode};
1745		2132
1746	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;
1747		2136
1748	if ($uni == 8) {	2137	if ($uni == 8) {
1749	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2138	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1750	} elsif ($uni == 127) {	2139	} elsif ($uni == 127) {
1751	substr $text, $self->{cursor}, 1, "";	2140	substr $text, $self->{cursor}, 1, "";
1752	} elsif ($sym == CFClient::SDLK_LEFT) {	2141	} elsif ($sym == CFPlus::SDLK_LEFT) {
1753	--$self->{cursor} if $self->{cursor};	2142	--$self->{cursor} if $self->{cursor};
1754	} elsif ($sym == CFClient::SDLK_RIGHT) {	2143	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1755	++$self->{cursor} if $self->{cursor} < length $self->{text};	2144	++$self->{cursor} if $self->{cursor} < length $self->{text};
1756	} 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 = "";
1757	$self->{cursor} = 0;	2159	$self->{cursor} = 0;
1758	} elsif ($sym == CFClient::SDLK_END) {
1759	$self->{cursor} = length $text;
1760	} elsif ($uni == 27) {	2160	} elsif ($uni == 27) {
1761	$self->_emit ('escape');	2161	$self->emit ('escape');
1762	} elsif ($uni) {	2162	} elsif ($uni == 0x0d) {
		2163	substr $text, $self->{cursor}++, 0, "\012";
		2164	} elsif ($uni >= 0x20) {
1763	substr $text, $self->{cursor}++, 0, chr $uni;	2165	substr $text, $self->{cursor}++, 0, chr $uni;
1764	} else {	2166	} else {
1765	return 0;	2167	return 0;
1766	}	2168	}
1767		2169
1768	$self->_set_text ($text);	2170	$self->_set_text ($text);
1769		2171
1770	$self->realloc;	2172	$self->realloc;
		2173	$self->update;
1771		2174
1772	1	2175	1
1773	}	2176	}
1774		2177
1775	sub focus_in {	2178	sub invoke_focus_in {
1776	my ($self) = @_;	2179	my ($self) = @_;
1777		2180
1778	$self->{last_activity} = $::NOW;	2181	$self->{last_activity} = $::NOW;
1779		2182
1780	$self->SUPER::focus_in;	2183	$self->SUPER::invoke_focus_in
1781	}	2184	}
1782		2185
1783	sub button_down {	2186	sub invoke_button_down {
1784	my ($self, $ev, $x, $y) = @_;	2187	my ($self, $ev, $x, $y) = @_;
1785		2188
1786	$self->SUPER::button_down ($ev, $x, $y);	2189	$self->SUPER::invoke_button_down ($ev, $x, $y);
1787		2190
1788	my $idx = $self->{layout}->xy_to_index ($x, $y);	2191	my $idx = $self->{layout}->xy_to_index ($x, $y);
1789		2192
1790	# byte-index to char-index	2193	# byte-index to char-index
1791	my $text = $self->{text};	2194	my $text = $self->{text};
1792	utf8::encode $text;	2195	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1793	$self->{cursor} = length substr $text, 0, $idx;	2196	$self->{cursor} = length $text;
1794		2197
1795	$self->_set_text ($self->{text});	2198	$self->_set_text ($self->{text});
1796	$self->update;	2199	$self->update;
1797		2200
1798	1	2201	1
1799	}	2202	}
1800		2203
1801	sub mouse_motion {	2204	sub invoke_mouse_motion {
1802	my ($self, $ev, $x, $y) = @_;	2205	my ($self, $ev, $x, $y) = @_;
1803	# 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#
1804		2207
1805	0	2208	1
1806	}	2209	}
1807		2210
1808	sub _draw {	2211	sub _draw {
1809	my ($self) = @_;	2212	my ($self) = @_;
1810		2213
…		…
1817	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
1818	}	2221	}
1819		2222
1820	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
1821	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1822	glBegin GL_QUADS;
1823	glVertex 0 , 0;
1824	glVertex 0 , $self->{h};
1825	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
1826	glVertex $self->{w}, 0;
1827	glEnd;
1828	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
1829		2227
1830	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
1831		2229
1832	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
1834		2232
1835	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
1836	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
1837	utf8::encode $text;	2235	utf8::encode $text;
1838		2236
1839	@$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);
1840	}	2238	}
1841		2239
1842	glColor @{$self->{fg}};	2240	glColor_premultiply @{$self->{active_fg}};
1843	glBegin GL_LINES;	2241	glBegin GL_LINES;
1844	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};
1845	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};
1846	glEnd;	2244	glEnd;
1847	}
1848	}
1849		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
1850	package CFClient::UI::Entry;	2265	package CFPlus::UI::Entry;
1851		2266
1852	our @ISA = CFClient::UI::EntryBase::;	2267	our @ISA = CFPlus::UI::EntryBase::;
1853		2268
1854	use CFClient::OpenGL;	2269	use CFPlus::OpenGL;
1855		2270
1856	sub key_down {	2271	sub invoke_key_down {
1857	my ($self, $ev) = @_;	2272	my ($self, $ev) = @_;
1858		2273
1859	my $sym = $ev->{sym};	2274	my $sym = $ev->{sym};
1860		2275
1861	if ($sym == 13) {	2276	if ($ev->{uni} == 0x0d || $sym == 13) {
1862	unshift @{$self->{history}},	2277	unshift @{$self->{history}},
1863	my $txt = $self->get_text;	2278	my $txt = $self->get_text;
		2279
1864	$self->{history_pointer} = -1;	2280	$self->{history_pointer} = -1;
1865	$self->{history_saveback} = '';	2281	$self->{history_saveback} = '';
1866	$self->_emit (activate => $txt);	2282	$self->emit (activate => $txt);
1867	$self->update;	2283	$self->update;
1868		2284
1869	} elsif ($sym == CFClient::SDLK_UP) {	2285	} elsif ($sym == CFPlus::SDLK_UP) {
1870	if ($self->{history_pointer} < 0) {	2286	if ($self->{history_pointer} < 0) {
1871	$self->{history_saveback} = $self->get_text;	2287	$self->{history_saveback} = $self->get_text;
1872	}	2288	}
1873	if (@{$self->{history} || []} > 0) {	2289	if (@{$self->{history} || []} > 0) {
1874	$self->{history_pointer}++;	2290	$self->{history_pointer}++;
…		…
1876	$self->{history_pointer} = @{$self->{history} || []} - 1;	2292	$self->{history_pointer} = @{$self->{history} || []} - 1;
1877	}	2293	}
1878	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2294	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1879	}	2295	}
1880		2296
1881	} elsif ($sym == CFClient::SDLK_DOWN) {	2297	} elsif ($sym == CFPlus::SDLK_DOWN) {
1882	$self->{history_pointer}--;	2298	$self->{history_pointer}--;
1883	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2299	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1884		2300
1885	if ($self->{history_pointer} >= 0) {	2301	if ($self->{history_pointer} >= 0) {
1886	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1887	} else {	2303	} else {
1888	$self->set_text ($self->{history_saveback});	2304	$self->set_text ($self->{history_saveback});
1889	}	2305	}
1890		2306
1891	} else {	2307	} else {
1892	return $self->SUPER::key_down ($ev)	2308	return $self->SUPER::invoke_key_down ($ev)
1893	}	2309	}
1894		2310
1895	1	2311	1
1896	}	2312	}
1897		2313
1898	#############################################################################	2314	#############################################################################
1899		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
1900	package CFClient::UI::Button;	2355	package CFPlus::UI::ButtonBin;
1901		2356
1902	our @ISA = CFClient::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
1903		2358
1904	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
1905		2360
1906	my @tex =	2361	my @tex =
1907	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1908	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
1909		2364
1910	sub new {	2365	sub new {
1911	my $class = shift;	2366	my $class = shift;
1912		2367
1913	$class->SUPER::new (	2368	$class->SUPER::new (
1914	padding_x => 4,
1915	padding_y => 4,
1916	fg => [1, 1, 1],
1917	active_fg => [0, 0, 1],
1918	can_hover => 1,	2369	can_hover => 1,
1919	align => 0,	2370	align => 0,
1920	valign => 0,	2371	valign => 0,
1921	can_events => 1,	2372	can_events => 1,
1922	@_	2373	@_
1923	)	2374	)
1924	}	2375	}
1925		2376
1926	sub activate { }
1927
1928	sub button_up {	2377	sub invoke_button_up {
1929	my ($self, $ev, $x, $y) = @_;	2378	my ($self, $ev, $x, $y) = @_;
1930		2379
1931	$self->emit ("activate")	2380	$self->emit ("activate")
1932	if $x >= 0 && $x < $self->{w}	2381	if $x >= 0 && $x < $self->{w}
1933	&& $y >= 0 && $y < $self->{h};	2382	&& $y >= 0 && $y < $self->{h};
…		…
1936	}	2385	}
1937		2386
1938	sub _draw {	2387	sub _draw {
1939	my ($self) = @_;	2388	my ($self) = @_;
1940		2389
1941	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1942
1943	glEnable GL_TEXTURE_2D;	2390	glEnable GL_TEXTURE_2D;
1944	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1945	glColor 0, 0, 0, 1;	2392	glColor 0, 0, 0, 1;
1946		2393
		2394	my $tex = $tex[$GRAB == $self];
1947	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2395	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1948		2396
1949	glDisable GL_TEXTURE_2D;	2397	glDisable GL_TEXTURE_2D;
1950		2398
1951	$self->SUPER::_draw;	2399	$self->SUPER::_draw;
1952	}	2400	}
1953		2401
1954	#############################################################################	2402	#############################################################################
1955		2403
1956	package CFClient::UI::CheckBox;	2404	package CFPlus::UI::Button;
1957		2405
1958	our @ISA = CFClient::UI::DrawBG::;	2406	our @ISA = CFPlus::UI::Label::;
		2407
		2408	use CFPlus::OpenGL;
1959		2409
1960	my @tex =	2410	my @tex =
1961	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 }
1962	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2465	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1963		2466
1964	use CFClient::OpenGL;	2467	use CFPlus::OpenGL;
1965		2468
1966	sub new {	2469	sub new {
1967	my $class = shift;	2470	my $class = shift;
1968		2471
1969	$class->SUPER::new (	2472	$class->SUPER::new (
…		…
1983	my ($self) = @_;	2486	my ($self) = @_;
1984		2487
1985	(6) x 2	2488	(6) x 2
1986	}	2489	}
1987		2490
		2491	sub toggle {
		2492	my ($self) = @_;
		2493
		2494	$self->{state} = !$self->{state};
		2495	$self->emit (changed => $self->{state});
		2496	$self->update;
		2497	}
		2498
1988	sub button_down {	2499	sub invoke_button_down {
1989	my ($self, $ev, $x, $y) = @_;	2500	my ($self, $ev, $x, $y) = @_;
1990		2501
1991	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2502	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1992	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2503	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1993	$self->{state} = !$self->{state};	2504	$self->toggle;
1994	$self->_emit (changed => $self->{state});
1995	} else {	2505	} else {
1996	return 0	2506	return 0
1997	}	2507	}
1998		2508
1999	1	2509	1
…		…
2019	glDisable GL_TEXTURE_2D;	2529	glDisable GL_TEXTURE_2D;
2020	}	2530	}
2021		2531
2022	#############################################################################	2532	#############################################################################
2023		2533
2024	package CFClient::UI::Image;	2534	package CFPlus::UI::Image;
2025		2535
2026	our @ISA = CFClient::UI::Base::;	2536	our @ISA = CFPlus::UI::Base::;
2027		2537
2028	use CFClient::OpenGL;	2538	use CFPlus::OpenGL;
2029	use Carp qw/confess/;
2030		2539
2031	our %loaded_images;	2540	our %texture_cache;
2032		2541
2033	sub new {	2542	sub new {
2034	my $class = shift;	2543	my $class = shift;
2035		2544
2036	my $self = $class->SUPER::new (can_events => 0, @_);	2545	my $self = $class->SUPER::new (
		2546	can_events => 0,
		2547	scale => 1,
		2548	@_,
		2549	);
2037		2550
2038	$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";
2039		2553
2040	$loaded_images{$self->{image}} ||=	2554	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2041	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;
2042		2556
2043	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2557	CFPlus::weaken $texture_cache{$self->{path}};
2044		2558
2045	Scalar::Util::weaken $loaded_images{$self->{image}};	2559	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2046
2047	$self->{aspect} = $tex->{w} / $tex->{h};
2048		2560
2049	$self	2561	$self
2050	}	2562	}
2051		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
2052	sub size_request {	2579	sub size_request {
2053	my ($self) = @_;	2580	my ($self) = @_;
2054		2581
2055	($self->{tex}->{w}, $self->{tex}->{h})	2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2056	}	2583	}
2057		2584
2058	sub _draw {	2585	sub _draw {
2059	my ($self) = @_;	2586	my ($self) = @_;
2060		2587
…		…
2077	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2078	}	2605	}
2079		2606
2080	#############################################################################	2607	#############################################################################
2081		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
2082	package CFClient::UI::VGauge;	2651	package CFPlus::UI::VGauge;
2083		2652
2084	our @ISA = CFClient::UI::Base::;	2653	our @ISA = CFPlus::UI::Base::;
2085		2654
2086	use List::Util qw(min max);	2655	use List::Util qw(min max);
2087		2656
2088	use CFClient::OpenGL;	2657	use CFPlus::OpenGL;
2089		2658
2090	my %tex = (	2659	my %tex = (
2091	food => [	2660	food => [
2092	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2661	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2662	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2094	],	2663	],
2095	grace => [	2664	grace => [
2096	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2665	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097	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/
2098	],	2667	],
2099	hp => [	2668	hp => [
2100	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2669	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2670	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2102	],	2671	],
2103	mana => [	2672	mana => [
2104	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2673	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2105	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/
2106	],	2675	],
2107	);	2676	);
2108		2677
2109	# eg. VGauge->new (gauge => 'food'), default gauge: food	2678	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2169	my $ycut1 = max 0, min 1, $ycut;	2738	my $ycut1 = max 0, min 1, $ycut;
2170	my $ycut2 = max 0, min 1, $ycut - 1;	2739	my $ycut2 = max 0, min 1, $ycut - 1;
2171		2740
2172	my $h1 = $self->{h} * (1 - $ycut1);	2741	my $h1 = $self->{h} * (1 - $ycut1);
2173	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);
2174		2746
2175	glEnable GL_BLEND;	2747	glEnable GL_BLEND;
2176	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2748	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2749	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2178	glEnable GL_TEXTURE_2D;	2750	glEnable GL_TEXTURE_2D;
…		…
2197		2769
2198	if ($t3) {	2770	if ($t3) {
2199	glBindTexture GL_TEXTURE_2D, $t3->{name};	2771	glBindTexture GL_TEXTURE_2D, $t3->{name};
2200	glBegin GL_QUADS;	2772	glBegin GL_QUADS;
2201	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2773	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2202	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2774	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2203	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2775	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2204	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2776	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2205	glEnd;	2777	glEnd;
2206	}	2778	}
2207		2779
2208	glDisable GL_BLEND;	2780	glDisable GL_BLEND;
2209	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2210	}	2782	}
2211		2783
2212	#############################################################################	2784	#############################################################################
2213		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	tooltip => sub {
		2876	my ($self) = @_;
		2877
		2878	sprintf "%s points experience (level %d).\n%s points to next level %s.",
		2879	::formsep $self->{exp},
		2880	$self->{lvl},
		2881	::formsep $self->{nxt}
		2882	},
		2883	%arg
		2884	);
		2885
		2886	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2887	if $::CONN;
		2888
		2889	$self
		2890	}
		2891
		2892	sub DESTROY {
		2893	my ($self) = @_;
		2894
		2895	delete $::CONN->{on_exp_update}{$self+0}
		2896	if $::CONN;
		2897
		2898	$self->SUPER::DESTROY;
		2899	}
		2900
		2901	sub set_value {
		2902	my ($self, $lvl, $exp) = @_;
		2903
		2904	$self->{lvl} = $exp;
		2905	$self->{exp} = $exp;
		2906
		2907	my $v = -1;
		2908
		2909	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2910	my $l0 = $table->[$lvl - 1];
		2911	my $l1 = $table->[$lvl];
		2912
		2913	$self->{nxt} = $l1;
		2914
		2915	$v = ($exp - $l0) / ($l1 - $l0);
		2916	}
		2917
		2918	$self->SUPER::set_value ($v);
		2919	}
		2920
		2921	#############################################################################
		2922
2214	package CFClient::UI::Gauge;	2923	package CFPlus::UI::Gauge;
2215		2924
2216	our @ISA = CFClient::UI::VBox::;	2925	our @ISA = CFPlus::UI::VBox::;
2217		2926
2218	sub new {	2927	sub new {
2219	my ($class, %arg) = @_;	2928	my ($class, %arg) = @_;
2220		2929
2221	my $self = $class->SUPER::new (	2930	my $self = $class->SUPER::new (
…		…
2223	can_hover => 1,	2932	can_hover => 1,
2224	can_events => 1,	2933	can_events => 1,
2225	%arg,	2934	%arg,
2226	);	2935	);
2227		2936
2228	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2937	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2229	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2938	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2230	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2939	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2231		2940
2232	$self	2941	$self
2233	}	2942	}
2234		2943
2235	sub set_fontsize {	2944	sub set_fontsize {
…		…
2256	$self->{value}->set_text ($val);	2965	$self->{value}->set_text ($val);
2257	}	2966	}
2258		2967
2259	#############################################################################	2968	#############################################################################
2260		2969
2261	package CFClient::UI::Slider;	2970	package CFPlus::UI::Slider;
2262		2971
2263	use strict;	2972	use strict;
2264		2973
2265	use CFClient::OpenGL;	2974	use CFPlus::OpenGL;
2266		2975
2267	our @ISA = CFClient::UI::DrawBG::;	2976	our @ISA = CFPlus::UI::DrawBG::;
2268		2977
2269	my @tex =	2978	my @tex =
2270	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2979	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2271	qw(s1_slider.png s1_slider_bg.png);	2980	qw(s1_slider.png s1_slider_bg.png);
2272		2981
2273	sub new {	2982	sub new {
2274	my $class = shift;	2983	my $class = shift;
2275		2984
…		…
2296	$self->update;	3005	$self->update;
2297		3006
2298	$self	3007	$self
2299	}	3008	}
2300		3009
2301	sub changed { }
2302
2303	sub set_range {	3010	sub set_range {
2304	my ($self, $range) = @_;	3011	my ($self, $range) = @_;
2305		3012
2306	($range, $self->{range}) = ($self->{range}, $range);	3013	($range, $self->{range}) = ($self->{range}, $range);
2307		3014
2308	$self->update
2309	if "@$range" ne "@{$self->{range}}";	3015	if ("@$range" ne "@{$self->{range}}") {
		3016	$self->update;
		3017	$self->set_value ($self->{range}[0]);
		3018	}
2310	}	3019	}
2311		3020
2312	sub set_value {	3021	sub set_value {
2313	my ($self, $value) = @_;	3022	my ($self, $value) = @_;
2314		3023
…		…
2325	if $unit;	3034	if $unit;
2326		3035
2327	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	3036	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2328		3037
2329	if ($value != $old_value) {	3038	if ($value != $old_value) {
2330	$self->_emit (changed => $value);	3039	$self->emit (changed => $value);
2331	$self->update;	3040	$self->update;
2332	}	3041	}
2333	}	3042	}
2334		3043
2335	sub size_request {	3044	sub size_request {
2336	my ($self) = @_;	3045	my ($self) = @_;
2337		3046
2338	($self->{req_w}, $self->{req_h})	3047	($self->{req_w}, $self->{req_h})
2339	}	3048	}
2340		3049
2341	sub button_down {	3050	sub invoke_button_down {
2342	my ($self, $ev, $x, $y) = @_;	3051	my ($self, $ev, $x, $y) = @_;
2343		3052
2344	$self->SUPER::button_down ($ev, $x, $y);	3053	$self->SUPER::invoke_button_down ($ev, $x, $y);
2345		3054
2346	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3055	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2347		3056
2348	$self->mouse_motion ($ev, $x, $y)	3057	$self->invoke_mouse_motion ($ev, $x, $y);
2349	}
2350		3058
		3059	1
		3060	}
		3061
2351	sub mouse_motion {	3062	sub invoke_mouse_motion {
2352	my ($self, $ev, $x, $y) = @_;	3063	my ($self, $ev, $x, $y) = @_;
2353		3064
2354	if ($GRAB == $self) {	3065	if ($GRAB == $self) {
2355	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	3066	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2356		3067
…		…
2360		3071
2361	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3072	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2362	} else {	3073	} else {
2363	return 0;	3074	return 0;
2364	}	3075	}
		3076
		3077	1
		3078	}
		3079
		3080	sub invoke_mouse_wheel {
		3081	my ($self, $ev) = @_;
		3082
		3083	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3084
		3085	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3086
		3087	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2365		3088
2366	1	3089	1
2367	}	3090	}
2368		3091
2369	sub update {	3092	sub update {
…		…
2420	glDisable GL_TEXTURE_2D;	3143	glDisable GL_TEXTURE_2D;
2421	}	3144	}
2422		3145
2423	#############################################################################	3146	#############################################################################
2424		3147
2425	package CFClient::UI::ValSlider;	3148	package CFPlus::UI::ValSlider;
2426		3149
2427	our @ISA = CFClient::UI::HBox::;	3150	our @ISA = CFPlus::UI::HBox::;
2428		3151
2429	sub new {	3152	sub new {
2430	my ($class, %arg) = @_;	3153	my ($class, %arg) = @_;
2431		3154
2432	my $range = delete $arg{range};	3155	my $range = delete $arg{range};
2433		3156
2434	my $self = $class->SUPER::new (	3157	my $self = $class->SUPER::new (
2435	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3158	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2436	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3159	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2437	to_value => sub { shift },	3160	to_value => sub { shift },
2438	from_value => sub { shift },	3161	from_value => sub { shift },
2439	%arg,	3162	%arg,
2440	);	3163	);
2441		3164
…		…
2461	sub set_range { shift->{slider}->set_range (@_) }	3184	sub set_range { shift->{slider}->set_range (@_) }
2462	sub set_value { shift->{slider}->set_value (@_) }	3185	sub set_value { shift->{slider}->set_value (@_) }
2463		3186
2464	#############################################################################	3187	#############################################################################
2465		3188
2466	package CFClient::UI::TextView;	3189	package CFPlus::UI::TextScroller;
2467		3190
2468	our @ISA = CFClient::UI::HBox::;	3191	our @ISA = CFPlus::UI::HBox::;
2469		3192
2470	use CFClient::OpenGL;	3193	use CFPlus::OpenGL;
2471		3194
2472	sub new {	3195	sub new {
2473	my $class = shift;	3196	my $class = shift;
2474		3197
2475	my $self = $class->SUPER::new (	3198	my $self = $class->SUPER::new (
2476	fontsize => 1,	3199	fontsize => 1,
2477	can_events => 0,	3200	can_events => 1,
		3201	indent => 0,
2478	#font => default_font	3202	#font => default_font
2479	@_,	3203	@_,
2480		3204
2481	layout => (new CFClient::Layout 1),	3205	layout => (new CFPlus::Layout),
2482	par => [],	3206	par => [],
		3207	max_par => 0,
2483	height => 0,	3208	height => 0,
2484	children => [	3209	children => [
2485	(new CFClient::UI::Empty expand => 1),	3210	(new CFPlus::UI::Empty expand => 1),
2486	(new CFClient::UI::Slider vertical => 1),	3211	(new CFPlus::UI::Slider vertical => 1),
2487	],	3212	],
2488	);	3213	);
2489		3214
2490	$self->{children}[1]->connect (changed => sub { $self->update });	3215	$self->{children}[1]->connect (changed => sub { $self->update });
2491		3216
…		…
2497		3222
2498	$self->{fontsize} = $fontsize;	3223	$self->{fontsize} = $fontsize;
2499	$self->reflow;	3224	$self->reflow;
2500	}	3225	}
2501		3226
		3227	sub size_request {
		3228	my ($self) = @_;
		3229
		3230	my ($empty, $slider) = $self->visible_children;
		3231
		3232	local $self->{children} = [$empty, $slider];
		3233	$self->SUPER::size_request
		3234	}
		3235
2502	sub size_allocate {	3236	sub invoke_size_allocate {
2503	my ($self, $w, $h) = @_;	3237	my ($self, $w, $h) = @_;
2504		3238
2505	$self->SUPER::size_allocate ($w, $h);	3239	my ($empty, $slider, @other) = @{ $self->{children} };
		3240	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2506		3241
2507	$self->{layout}->set_font ($self->{font}) if $self->{font};	3242	$self->{layout}->set_font ($self->{font}) if $self->{font};
2508	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3243	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2509	$self->{layout}->set_width ($self->{children}[0]{w});	3244	$self->{layout}->set_width ($empty->{w});
		3245	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510		3246
2511	$self->reflow;	3247	$self->reflow;
2512	}
2513		3248
2514	sub text_size {	3249	local $self->{children} = [$empty, $slider];
		3250	$self->SUPER::invoke_size_allocate ($w, $h)
		3251	}
		3252
		3253	sub invoke_mouse_wheel {
2515	my ($self, $text, $indent) = @_;	3254	my ($self, $ev) = @_;
		3255
		3256	return 0 unless $ev->{dy}; # only vertical movements
		3257
		3258	$self->{children}[1]->emit (mouse_wheel => $ev);
		3259
		3260	1
		3261	}
		3262
		3263	sub get_layout {
		3264	my ($self, $para) = @_;
2516		3265
2517	my $layout = $self->{layout};	3266	my $layout = $self->{layout};
2518		3267
		3268	$layout->set_font ($self->{font}) if $self->{font};
		3269	$layout->set_foreground (@{$para->{fg}});
2519	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3270	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520	$layout->set_width ($self->{children}[0]{w} - $indent);	3271	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3272	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521	$layout->set_markup ($text);	3273	$layout->set_markup ($para->{markup});
		3274
		3275	$layout->set_shapes (
		3276	map
		3277	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3278	@{$para->{widget}}
2522		3279	);
		3280
2523	$layout->size	3281	$layout
2524	}	3282	}
2525		3283
2526	sub reflow {	3284	sub reflow {
2527	my ($self) = @_;	3285	my ($self) = @_;
2528		3286
…		…
2535		3293
2536	# todo: base offset on lines or so, not on pixels	3294	# todo: base offset on lines or so, not on pixels
2537	$self->{children}[1]->set_value ($offset);	3295	$self->{children}[1]->set_value ($offset);
2538	}	3296	}
2539		3297
		3298	sub current_paragraph {
		3299	my ($self) = @_;
		3300
		3301	$self->{top_paragraph} - 1
		3302	}
		3303
		3304	sub scroll_to {
		3305	my ($self, $para) = @_;
		3306
		3307	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3308
		3309	$self->{scroll_to} = $para;
		3310	$self->update;
		3311	}
		3312
2540	sub clear {	3313	sub clear {
2541	my ($self) = @_;	3314	my ($self) = @_;
		3315
		3316	my (undef, undef, @other) = @{ $self->{children} };
		3317	$self->remove ($_) for @other;
2542		3318
2543	$self->{par} = [];	3319	$self->{par} = [];
2544	$self->{height} = 0;	3320	$self->{height} = 0;
2545	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3321	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2546	}	3322	}
2547		3323
2548	sub add_paragraph {	3324	sub add_paragraph {
2549	my ($self, $color, $text, $indent) = @_;	3325	my $self = shift;
2550		3326
2551	for my $line (split /\n/, $text) {	3327	for my $para (@_) {
2552	my ($w, $h) = $self->text_size ($line);	3328	$para = {
		3329	fg => [1, 1, 1, 1],
		3330	indent => 0,
		3331	markup => "",
		3332	widget => [],
		3333	ref $para ? %$para : (markup => $para),
		3334	w => 1e10,
		3335	wrapped => 1,
		3336	};
		3337
		3338	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3339	push @{$self->{par}}, $para;
		3340	}
		3341
		3342	if (my $max = $self->{max_par}) {
		3343	shift @{$self->{par}} while @{$self->{par}} > $max;
		3344	}
		3345
		3346	$self->{need_reflow}++;
		3347	$self->update;
		3348	}
		3349
		3350	sub scroll_to_bottom {
		3351	my ($self) = @_;
		3352
		3353	$self->{scroll_to} = $#{$self->{par}};
		3354	$self->update;
		3355	}
		3356
		3357	sub force_uptodate {
		3358	my ($self) = @_;
		3359
		3360	if (delete $self->{need_reflow}) {
		3361	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3362
		3363	my $height = 0;
		3364
		3365	for my $para (@{$self->{par}}) {
		3366	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3367	my $layout = $self->get_layout ($para);
		3368	my ($w, $h) = $layout->size;
		3369
		3370	$para->{w} = $w + $para->{indent};
		3371	$para->{h} = $h;
		3372	$para->{wrapped} = $layout->has_wrapped;
		3373	}
		3374
		3375	$para->{y} = $height;
		3376	$height += $para->{h};
		3377	}
		3378
2553	$self->{height} += $h;	3379	$self->{height} = $height;
2554	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3380	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2555	}
2556		3381
2557	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3382	delete $self->{texture};
		3383	}
		3384
		3385	if (my $paridx = delete $self->{scroll_to}) {
		3386	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3387	}
2558	}	3388	}
2559		3389
2560	sub update {	3390	sub update {
2561	my ($self) = @_;	3391	my ($self) = @_;
2562		3392
…		…
2564		3394
2565	return unless $self->{h} > 0;	3395	return unless $self->{h} > 0;
2566		3396
2567	delete $self->{texture};	3397	delete $self->{texture};
2568		3398
2569	$ROOT->on_post_alloc ($self, sub {	3399	$ROOT->on_post_alloc ($self => sub {
		3400	$self->force_uptodate;
		3401
2570	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3402	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2571		3403
2572	if (delete $self->{need_reflow}) {
2573	my $height = 0;
2574
2575	my $layout = $self->{layout};
2576
2577	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578
2579	for (@{$self->{par}}) {
2580	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2581	$layout->set_width ($W - $_->[3]);
2582	$layout->set_markup ($_->[4]);
2583	my ($w, $h) = $layout->size;
2584	$_->[0] = $w + $_->[3];
2585	$_->[1] = $h;
2586	}
2587
2588	$height += $_->[1];
2589	}
2590
2591	$self->{height} = $height;
2592
2593	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2594
2595	delete $self->{texture};
2596	}
2597
2598	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3404	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2599	glClearColor 0, 0, 0, 0;	3405	glClearColor 0, 0, 0, 0;
2600	glClear GL_COLOR_BUFFER_BIT;	3406	glClear GL_COLOR_BUFFER_BIT;
2601		3407
		3408	package CFPlus::UI::Base;
		3409	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3410	(0, 0, $self->{w}, $self->{h});
		3411
		3412	my $top = int $self->{children}[1]{range}[0];
		3413
		3414	my $paridx = 0;
		3415	my $top_paragraph;
2602	my $top = int $self->{children}[1]{range}[0];	3416	my $top = int $self->{children}[1]{range}[0];
2603		3417
2604	my $y0 = $top;	3418	my $y0 = $top;
2605	my $y1 = $top + $H;	3419	my $y1 = $top + $H;
2606		3420
2607	my $y = 0;
2608
2609	my $layout = $self->{layout};
2610
2611	$layout->set_font ($self->{font}) if $self->{font};
2612
2613	glEnable GL_BLEND;
2614	#TODO# not correct in windows where rgba is forced off
2615	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2616
2617	for my $par (@{$self->{par}}) {	3421	for my $para (@{$self->{par}}) {
2618	my $h = $par->[1];	3422	my $h = $para->{h};
		3423	my $y = $para->{y};
2619		3424
2620	if ($y0 < $y + $h && $y < $y1) {	3425	if ($y0 < $y + $h && $y < $y1) {
2621	$layout->set_foreground (@{ $par->[2] });	3426	my $layout = $self->get_layout ($para);
2622	$layout->set_width ($W - $par->[3]);
2623	$layout->set_markup ($par->[4]);
2624		3427
2625	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3428	$layout->render ($para->{indent}, $y - $y0);
		3429	$layout->draw;
2626		3430
2627	glRasterPos $par->[3], $y - $y0;	3431	if (my @w = @{ $para->{widget} }) {
2628	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3432	my @s = $layout->get_shapes;
		3433
		3434	for (@w) {
		3435	my ($dx, $dy) = splice @s, 0, 2, ();
		3436
		3437	$_->{x} = $dx + $para->{indent};
		3438	$_->{y} = $dy + $y - $y0;
		3439
		3440	$_->draw;
		3441	}
		3442	}
2629	}	3443	}
2630		3444
2631	$y += $h;	3445	$paridx++;
		3446	$top_paragraph ||= $paridx if $y >= $top;
2632	}	3447	}
2633		3448
2634	glDisable GL_BLEND;	3449	$self->{top_paragraph} = $top_paragraph;
2635	};	3450	};
2636	});	3451	});
		3452	}
		3453
		3454	sub reconfigure {
		3455	my ($self) = @_;
		3456
		3457	$self->SUPER::reconfigure;
		3458
		3459	$_->{w} = 1e10 for @{ $self->{par} };
		3460	$self->reflow;
2637	}	3461	}
2638		3462
2639	sub _draw {	3463	sub _draw {
2640	my ($self) = @_;	3464	my ($self) = @_;
2641		3465
…		…
2644	glColor 0, 0, 0, 1;	3468	glColor 0, 0, 0, 1;
2645	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3469	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2646	glDisable GL_TEXTURE_2D;	3470	glDisable GL_TEXTURE_2D;
2647		3471
2648	$self->{children}[1]->draw;	3472	$self->{children}[1]->draw;
2649
2650	}	3473	}
2651		3474
2652	#############################################################################	3475	#############################################################################
2653		3476
2654	package CFClient::UI::Animator;	3477	package CFPlus::UI::Animator;
2655		3478
2656	use CFClient::OpenGL;	3479	use CFPlus::OpenGL;
2657		3480
2658	our @ISA = CFClient::UI::Bin::;	3481	our @ISA = CFPlus::UI::Bin::;
2659		3482
2660	sub moveto {	3483	sub moveto {
2661	my ($self, $x, $y) = @_;	3484	my ($self, $x, $y) = @_;
2662		3485
2663	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3486	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2691	glPopMatrix;	3514	glPopMatrix;
2692	}	3515	}
2693		3516
2694	#############################################################################	3517	#############################################################################
2695		3518
2696	package CFClient::UI::Flopper;	3519	package CFPlus::UI::Flopper;
2697		3520
2698	our @ISA = CFClient::UI::Button::;	3521	our @ISA = CFPlus::UI::Button::;
2699		3522
2700	sub new {	3523	sub new {
2701	my $class = shift;	3524	my $class = shift;
2702		3525
2703	my $self = $class->SUPER::new (	3526	my $self = $class->SUPER::new (
…		…
2715	$self->{other}->toggle_visibility;	3538	$self->{other}->toggle_visibility;
2716	}	3539	}
2717		3540
2718	#############################################################################	3541	#############################################################################
2719		3542
2720	package CFClient::UI::Tooltip;	3543	package CFPlus::UI::Tooltip;
2721		3544
2722	our @ISA = CFClient::UI::Bin::;	3545	our @ISA = CFPlus::UI::Bin::;
2723		3546
2724	use CFClient::OpenGL;	3547	use CFPlus::OpenGL;
2725		3548
2726	sub new {	3549	sub new {
2727	my $class = shift;	3550	my $class = shift;
2728		3551
2729	$class->SUPER::new (	3552	$class->SUPER::new (
…		…
2732	)	3555	)
2733	}	3556	}
2734		3557
2735	sub set_tooltip_from {	3558	sub set_tooltip_from {
2736	my ($self, $widget) = @_;	3559	my ($self, $widget) = @_;
		3560
		3561	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3562	if $widget->{tooltip} =~ /^#(.*)$/;
2737		3563
2738	my $tooltip = $widget->{tooltip};	3564	my $tooltip = $widget->{tooltip};
2739		3565
2740	if ($ENV{CFPLUS_DEBUG} & 2) {	3566	if ($ENV{CFPLUS_DEBUG} & 2) {
2741	$tooltip .= "\n\n" . (ref $widget) . "\n"	3567	$tooltip .= "\n\n" . (ref $widget) . "\n"
2742	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3568	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743	. "req $widget->{req_w} $widget->{req_h}\n"	3569	. "req $widget->{req_w} $widget->{req_h}\n"
2744	. "visible $widget->{visible}";	3570	. "visible $widget->{visible}";
2745	}	3571	}
2746		3572
		3573	$tooltip =~ s/^\n+//;
		3574	$tooltip =~ s/\n+$//;
		3575
2747	$self->add (new CFClient::UI::Label	3576	$self->add (new CFPlus::UI::Label
2748	markup => $tooltip,	3577	markup => $tooltip,
2749	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3578	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2750	fontsize => 0.8,	3579	fontsize => 0.8,
2751	fg => [0, 0, 0, 1],	3580	style => 1, # FLAG_INVERSE
2752	ellipsise => 0,	3581	ellipsise => 0,
2753	font => ($widget->{tooltip_font} || $::FONT_PROP),	3582	font => ($widget->{tooltip_font} || $::FONT_PROP),
2754	);	3583	);
2755	}	3584	}
2756		3585
…		…
2760	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3589	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2761		3590
2762	($w + 4, $h + 4)	3591	($w + 4, $h + 4)
2763	}	3592	}
2764		3593
2765	sub size_allocate {	3594	sub invoke_size_allocate {
2766	my ($self, $w, $h) = @_;	3595	my ($self, $w, $h) = @_;
2767		3596
2768	$self->SUPER::size_allocate ($w - 4, $h - 4);	3597	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2769	}	3598	}
2770		3599
2771	sub visibility_change {	3600	sub invoke_visibility_change {
2772	my ($self, $visible) = @_;	3601	my ($self, $visible) = @_;
2773		3602
2774	return unless $visible;	3603	return unless $visible;
2775		3604
2776	$self->{root}->on_post_alloc ("move_$self" => sub {	3605	$self->{root}->on_post_alloc ("move_$self" => sub {
2777	my $widget = $self->{owner}	3606	my $widget = $self->{owner}
2778	or return;	3607	or return;
2779		3608
		3609	if ($widget->{visible}) {
2780	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3610	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781		3611
2782	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3612	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783	if $x + $self->{w} > $::WIDTH;	3613	if $x + $self->{w} > $self->{root}{w};
2784		3614
2785	$self->move_abs ($x, $y);	3615	$self->move_abs ($x, $y);
		3616	} else {
		3617	$self->hide;
		3618	}
2786	});	3619	});
2787	}	3620	}
2788		3621
2789	sub _draw {	3622	sub _draw {
2790	my ($self) = @_;	3623	my ($self) = @_;
…		…
2792	glTranslate 0.375, 0.375;	3625	glTranslate 0.375, 0.375;
2793		3626
2794	my ($w, $h) = @$self{qw(w h)};	3627	my ($w, $h) = @$self{qw(w h)};
2795		3628
2796	glColor 1, 0.8, 0.4;	3629	glColor 1, 0.8, 0.4;
2797	glBegin GL_QUADS;	3630	glRect 0, 0, $w, $h;
2798	glVertex 0 , 0;
2799	glVertex 0 , $h;
2800	glVertex $w, $h;
2801	glVertex $w, 0;
2802	glEnd;
2803		3631
2804	glColor 0, 0, 0;	3632	glColor 0, 0, 0;
2805	glBegin GL_LINE_LOOP;	3633	glRect_lineloop 0, 0, $w, $h;
2806	glVertex 0 , 0;
2807	glVertex 0 , $h;
2808	glVertex $w, $h;
2809	glVertex $w, 0;
2810	glEnd;
2811		3634
2812	glTranslate 2 - 0.375, 2 - 0.375;	3635	glTranslate 2 - 0.375, 2 - 0.375;
2813		3636
2814	$self->SUPER::_draw;	3637	$self->SUPER::_draw;
2815	}	3638	}
2816		3639
2817	#############################################################################	3640	#############################################################################
2818		3641
2819	package CFClient::UI::Face;	3642	package CFPlus::UI::Face;
2820		3643
2821	our @ISA = CFClient::UI::Base::;	3644	our @ISA = CFPlus::UI::DrawBG::;
2822		3645
2823	use CFClient::OpenGL;	3646	use CFPlus::OpenGL;
2824		3647
2825	sub new {	3648	sub new {
2826	my $class = shift;	3649	my $class = shift;
2827		3650
2828	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
		3652	size_w => 32,
		3653	size_h => 8,
2829	aspect => 1,	3654	aspect => 1,
2830	can_events => 0,	3655	can_events => 0,
2831	@_,	3656	@_,
2832	);	3657	);
2833		3658
2834	if ($self->{anim} && $self->{animspeed}) {	3659	if ($self->{anim} && $self->{animspeed}) {
2835	Scalar::Util::weaken (my $widget = $self);	3660	CFPlus::weaken (my $widget = $self);
2836		3661
		3662	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3663	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2837	$self->{timer} = Event->timer (	3664	$self->{timer} = Event->timer (
2838	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2839	hard => 1,	3665	parked => 1,
2840	interval => $self->{animspeed},
2841	cb => sub {	3666	cb => sub {
		3667	return unless $::CONN;
		3668
		3669	my $w = $widget
		3670	or return;
		3671
2842	++$widget->{frame};	3672	++$w->{frame};
		3673	$w->update_face;
		3674
		3675	# somehow, $widget can go away
2843	$widget->update;	3676	$w->update;
		3677	$w->update_timer;
2844	},	3678	},
2845	);	3679	);
		3680
		3681	$self->update_face;
		3682	$self->update_timer;
2846	}	3683	}
2847		3684
2848	$self	3685	$self
2849	}	3686	}
2850		3687
		3688	sub update_timer {
		3689	my ($self) = @_;
		3690
		3691	return unless $self->{timer};
		3692
		3693	if ($self->{visible}) {
		3694	$self->{timer}->at (
		3695	$self->{anim_start}
		3696	+ $self->{animspeed}
		3697	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3698	);
		3699	$self->{timer}->start;
		3700	} else {
		3701	$self->{timer}->stop;
		3702	}
		3703	}
		3704
		3705	sub update_face {
		3706	my ($self) = @_;
		3707
		3708	if ($::CONN) {
		3709	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3710	if ($anim && @$anim) {
		3711	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3712	delete $self->{face_change_cb};
		3713
		3714	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3715	unless ($tex->{name} || $tex->{loading}) {
		3716	$tex->upload (sub { $self->reconfigure });
		3717	}
		3718	}
		3719	}
		3720	}
		3721	}
		3722	}
		3723
2851	sub size_request {	3724	sub size_request {
2852	(32, 8)	3725	my ($self) = @_;
		3726
		3727	if ($::CONN) {
		3728	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3729	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3730	if ($tex->{name}) {
		3731	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3732	} elsif (!$tex->{loading}) {
		3733	$tex->upload (sub { $self->reconfigure });
		3734	}
		3735	}
		3736
		3737	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3738	}
		3739	}
		3740
		3741	($self->{size_w} || 8, $self->{size_h} || 8)
2853	}	3742	}
2854		3743
2855	sub update {	3744	sub update {
2856	my ($self) = @_;	3745	my ($self) = @_;
2857		3746
2858	return unless $self->{visible};	3747	return unless $self->{visible};
2859		3748
2860	$self->SUPER::update;	3749	$self->SUPER::update;
2861	}	3750	}
2862		3751
		3752	sub invoke_visibility_change {
		3753	my ($self) = @_;
		3754
		3755	$self->update_timer;
		3756
		3757	0
		3758	}
		3759
2863	sub _draw {	3760	sub _draw {
2864	my ($self) = @_;	3761	my ($self) = @_;
2865		3762
2866	return unless $::CONN;	3763	$self->SUPER::_draw;
2867		3764
2868	my $face;	3765	if (my $tex = $self->{tex}) {
2869
2870	if ($self->{frame}) {
2871	my $anim = $::CONN->{anim}[$self->{anim}];
2872
2873	$face = $anim->[ $self->{frame} % @$anim ]
2874	if $anim && @$anim;
2875	}
2876
2877	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2878
2879	if ($tex) {
2880	glEnable GL_TEXTURE_2D;	3766	glEnable GL_TEXTURE_2D;
2881	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3767	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2882	glColor 0, 0, 0, 1;	3768	glColor 0, 0, 0, 1;
2883	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3769	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2884	glDisable GL_TEXTURE_2D;	3770	glDisable GL_TEXTURE_2D;
2885	}	3771	}
2886	}	3772	}
2887		3773
2888	sub DESTROY {	3774	sub destroy {
2889	my ($self) = @_;	3775	my ($self) = @_;
2890		3776
2891	$self->{timer}->cancel	3777	(delete $self->{timer})->cancel
2892	if $self->{timer};	3778	if $self->{timer};
2893		3779
2894	$self->SUPER::DESTROY;	3780	$self->SUPER::destroy;
2895	}	3781	}
2896		3782
2897	#############################################################################	3783	#############################################################################
2898		3784
2899	package CFClient::UI::Buttonbar;	3785	package CFPlus::UI::Buttonbar;
2900		3786
2901	our @ISA = CFClient::UI::HBox::;	3787	our @ISA = CFPlus::UI::HBox::;
2902		3788
2903	# TODO: should actualyl wrap buttons and other goodies.	3789	# TODO: should actually wrap buttons and other goodies.
2904		3790
2905	#############################################################################	3791	#############################################################################
2906		3792
2907	package CFClient::UI::Menu;	3793	package CFPlus::UI::Menu;
2908		3794
2909	our @ISA = CFClient::UI::FancyFrame::;	3795	our @ISA = CFPlus::UI::Toplevel::;
2910		3796
2911	use CFClient::OpenGL;	3797	use CFPlus::OpenGL;
2912		3798
2913	sub new {	3799	sub new {
2914	my $class = shift;	3800	my $class = shift;
2915		3801
2916	my $self = $class->SUPER::new (	3802	my $self = $class->SUPER::new (
2917	items => [],	3803	items => [],
2918	z => 100,	3804	z => 100,
2919	@_,	3805	@_,
2920	);	3806	);
2921		3807
2922	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3808	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2923		3809
2924	for my $item (@{ $self->{items} }) {	3810	for my $item (@{ $self->{items} }) {
2925	my ($widget, $cb) = @$item;	3811	my ($widget, $cb, $tooltip) = @$item;
2926		3812
2927	# handle various types of items, only text for now	3813	# handle various types of items, only text for now
2928	if (!ref $widget) {	3814	if (!ref $widget) {
		3815	if ($widget =~ /\t/) {
		3816	my ($left, $right) = split /\t/, $widget, 2;
		3817
2929	$widget = new CFClient::UI::Label	3818	$widget = new CFPlus::UI::HBox
2930	can_hover => 1,	3819	can_hover => 1,
2931	can_events => 1,	3820	can_events => 1,
		3821	tooltip => $tooltip,
		3822	children => [
		3823	(new CFPlus::UI::Label markup => $left, expand => 1),
		3824	(new CFPlus::UI::Label markup => $right, align => +1),
		3825	],
		3826	;
		3827
		3828	} else {
		3829	$widget = new CFPlus::UI::Label
		3830	can_hover => 1,
		3831	can_events => 1,
2932	text => $widget;	3832	markup => $widget,
		3833	tooltip => $tooltip;
		3834	}
2933	}	3835	}
2934		3836
2935	$self->{item}{$widget} = $item;	3837	$self->{item}{$widget} = $item;
2936		3838
2937	$self->{vbox}->add ($widget);	3839	$self->{vbox}->add ($widget);
…		…
2942		3844
2943	# popup given the event (must be a mouse button down event currently)	3845	# popup given the event (must be a mouse button down event currently)
2944	sub popup {	3846	sub popup {
2945	my ($self, $ev) = @_;	3847	my ($self, $ev) = @_;
2946		3848
2947	$self->_emit ("popdown");	3849	$self->emit ("popdown");
2948		3850
2949	# maybe save $GRAB? must be careful about events...	3851	# maybe save $GRAB? must be careful about events...
2950	$GRAB = $self;	3852	$GRAB = $self;
2951	$self->{button} = $ev->{button};	3853	$self->{button} = $ev->{button};
2952		3854
2953	$self->show;	3855	$self->show;
2954	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3856	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2955	}	3857	}
2956		3858
2957	sub mouse_motion {	3859	sub invoke_mouse_motion {
2958	my ($self, $ev, $x, $y) = @_;	3860	my ($self, $ev, $x, $y) = @_;
2959		3861
2960	# TODO: should use vbox->find_widget or so	3862	# TODO: should use vbox->find_widget or so
2961	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3863	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2962	$self->{hover} = $self->{item}{$HOVER};	3864	$self->{hover} = $self->{item}{$HOVER};
2963		3865
2964	0	3866	0
2965	}	3867	}
2966		3868
2967	sub button_up {	3869	sub invoke_button_up {
2968	my ($self, $ev, $x, $y) = @_;	3870	my ($self, $ev, $x, $y) = @_;
2969		3871
2970	if ($ev->{button} == $self->{button}) {	3872	if ($ev->{button} == $self->{button}) {
2971	undef $GRAB;	3873	undef $GRAB;
2972	$self->hide;	3874	$self->hide;
2973		3875
2974	$self->_emit ("popdown");	3876	$self->emit ("popdown");
2975	$self->{hover}[1]->() if $self->{hover};	3877	$self->{hover}[1]->() if $self->{hover};
2976	} else {	3878	} else {
2977	return 0	3879	return 0
2978	}	3880	}
2979		3881
2980	1	3882	1
2981	}	3883	}
2982		3884
2983	#############################################################################	3885	#############################################################################
2984		3886
2985	package CFClient::UI::Multiplexer;	3887	package CFPlus::UI::Multiplexer;
2986		3888
2987	our @ISA = CFClient::UI::Container::;	3889	our @ISA = CFPlus::UI::Container::;
2988		3890
2989	sub new {	3891	sub new {
2990	my $class = shift;	3892	my $class = shift;
2991		3893
2992	my $self = $class->SUPER::new (	3894	my $self = $class->SUPER::new (
…		…
3006		3908
3007	$self->{current} = $self->{children}[0]	3909	$self->{current} = $self->{children}[0]
3008	if @{ $self->{children} };	3910	if @{ $self->{children} };
3009	}	3911	}
3010		3912
		3913	sub get_current_page {
		3914	my ($self) = @_;
		3915
		3916	$self->{current}
		3917	}
		3918
3011	sub set_current_page {	3919	sub set_current_page {
3012	my ($self, $page_or_widget) = @_;	3920	my ($self, $page_or_widget) = @_;
3013		3921
3014	my $widget = ref $page_or_widget	3922	my $widget = ref $page_or_widget
3015	? $page_or_widget	3923	? $page_or_widget
3016	: $self->{children}[$page_or_widget];	3924	: $self->{children}[$page_or_widget];
3017		3925
3018	$self->{current} = $widget;	3926	$self->{current} = $widget;
3019	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3927	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020		3928
3021	$self->_emit (page_changed => $self->{current});	3929	$self->emit (page_changed => $self->{current});
3022		3930
3023	$self->realloc;	3931	$self->realloc;
3024	}	3932	}
3025		3933
3026	sub visible_children {	3934	sub visible_children {
…		…
3031	my ($self) = @_;	3939	my ($self) = @_;
3032		3940
3033	$self->{current}->size_request	3941	$self->{current}->size_request
3034	}	3942	}
3035		3943
3036	sub size_allocate {	3944	sub invoke_size_allocate {
3037	my ($self, $w, $h) = @_;	3945	my ($self, $w, $h) = @_;
3038		3946
3039	$self->{current}->configure (0, 0, $w, $h);	3947	$self->{current}->configure (0, 0, $w, $h);
		3948
		3949	1
3040	}	3950	}
3041		3951
3042	sub _draw {	3952	sub _draw {
3043	my ($self) = @_;	3953	my ($self) = @_;
3044		3954
3045	$self->{current}->draw;	3955	$self->{current}->draw;
3046	}	3956	}
3047		3957
3048	#############################################################################	3958	#############################################################################
3049		3959
3050	package CFClient::UI::Notebook;	3960	package CFPlus::UI::Notebook;
3051		3961
		3962	use CFPlus::OpenGL;
		3963
3052	our @ISA = CFClient::UI::VBox::;	3964	our @ISA = CFPlus::UI::VBox::;
3053		3965
3054	sub new {	3966	sub new {
3055	my $class = shift;	3967	my $class = shift;
3056		3968
3057	my $self = $class->SUPER::new (	3969	my $self = $class->SUPER::new (
3058	buttonbar => (new CFClient::UI::Buttonbar),	3970	buttonbar => (new CFPlus::UI::Buttonbar),
3059	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3971	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3972	active_outline => [1, 1, 0],
3060	# filter => # will be put between multiplexer and $self	3973	# filter => # will be put between multiplexer and $self
3061	@_,	3974	@_,
3062	);	3975	);
3063		3976
3064	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3977	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3065	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3978	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3066		3979
		3980	{
		3981	Scalar::Util::weaken (my $wself = $self);
		3982
		3983	$self->{multiplexer}->connect (c_add => sub {
		3984	my ($mplex, $widgets) = @_;
		3985
		3986	for my $child (@$widgets) {
		3987	Scalar::Util::weaken $child;
		3988	$child->{c_tab_} ||= do {
		3989	my $tab =
		3990	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3991	? $child->{c_tab}
		3992	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3993
		3994	$tab->connect (activate => sub {
		3995	$wself->set_current_page ($child);
		3996	});
		3997
		3998	$tab
		3999	};
		4000
		4001	$self->{buttonbar}->add ($child->{c_tab_});
		4002	}
		4003	});
		4004
		4005	$self->{multiplexer}->connect (c_remove => sub {
		4006	my ($mplex, $widgets) = @_;
		4007
		4008	for my $child (@$widgets) {
		4009	$wself->{buttonbar}->remove ($child->{c_tab_});
		4010	}
		4011	});
		4012	}
		4013
3067	$self	4014	$self
3068	}	4015	}
3069		4016
3070	sub add {	4017	sub add {
		4018	my ($self, @widgets) = @_;
		4019
		4020	$self->{multiplexer}->add (@widgets)
		4021	}
		4022
		4023	sub remove {
		4024	my ($self, @widgets) = @_;
		4025
		4026	$self->{multiplexer}->remove (@widgets)
		4027	}
		4028
		4029	sub pages {
		4030	my ($self) = @_;
		4031	$self->{multiplexer}->children
		4032	}
		4033
		4034	sub add_tab {
3071	my ($self, $title, $widget, $tooltip) = @_;	4035	my ($self, $title, $widget, $tooltip) = @_;
3072		4036
3073	Scalar::Util::weaken $self;	4037	$title = [$title, $tooltip] unless ref $title;
		4038	$widget->{c_tab} = $title;
3074		4039
3075	$self->{buttonbar}->add (new CFClient::UI::Button
3076	markup => $title,
3077	tooltip => $tooltip,
3078	on_activate => sub { $self->set_current_page ($widget) },
3079	);
3080
3081	$self->{multiplexer}->add ($widget);	4040	$self->add ($widget);
		4041	}
		4042
		4043	sub get_current_page {
		4044	my ($self) = @_;
		4045
		4046	$self->{multiplexer}->get_current_page
3082	}	4047	}
3083		4048
3084	sub set_current_page {	4049	sub set_current_page {
3085	my ($self, $page) = @_;	4050	my ($self, $page) = @_;
3086		4051
3087	$self->{multiplexer}->set_current_page ($page);	4052	$self->{multiplexer}->set_current_page ($page);
3088	$self->_emit (page_changed => $self->{multiplexer}{current});	4053	$self->emit (page_changed => $self->{multiplexer}{current});
		4054	}
		4055
		4056	sub _draw {
		4057	my ($self) = @_;
		4058
		4059	$self->SUPER::_draw ();
		4060
		4061	if (my $cur = $self->{multiplexer}{current}) {
		4062	if ($cur = $cur->{c_tab_}) {
		4063	glTranslate $cur->{x}, $cur->{y};
		4064	glLineWidth 3;
		4065	glColor @{$self->{active_outline}};
		4066	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4067	glLineWidth 1;
		4068	}
		4069	}
3089	}	4070	}
3090		4071
3091	#############################################################################	4072	#############################################################################
3092		4073
		4074	package CFPlus::UI::Selector;
		4075
		4076	use utf8;
		4077
		4078	our @ISA = CFPlus::UI::Button::;
		4079
		4080	sub new {
		4081	my $class = shift;
		4082
		4083	my $self = $class->SUPER::new (
		4084	options => [], # [value, title, longdesc], ...
		4085	value => undef,
		4086	@_,
		4087	);
		4088
		4089	$self->_set_value ($self->{value});
		4090
		4091	$self
		4092	}
		4093
		4094	sub invoke_button_down {
		4095	my ($self, $ev) = @_;
		4096
		4097	my @menu_items;
		4098
		4099	for (@{ $self->{options} }) {
		4100	my ($value, $title, $tooltip) = @$_;
		4101
		4102	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		4103	}
		4104
		4105	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		4106	}
		4107
		4108	sub _set_value {
		4109	my ($self, $value) = @_;
		4110
		4111	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		4112	or return;
		4113
		4114	$self->{value} = $item->[0];
		4115	$self->set_markup ("$item->[1] ⇓");
		4116	$self->set_tooltip ($item->[2]);
		4117	}
		4118
		4119	sub set_value {
		4120	my ($self, $value) = @_;
		4121
		4122	return unless $self->{value} ne $value;
		4123
		4124	$self->_set_value ($value);
		4125	$self->emit (changed => $value);
		4126	}
		4127
		4128	#############################################################################
		4129
3093	package CFClient::UI::Statusbox;	4130	package CFPlus::UI::Statusbox;
3094		4131
3095	our @ISA = CFClient::UI::VBox::;	4132	our @ISA = CFPlus::UI::VBox::;
3096		4133
3097	sub new {	4134	sub new {
3098	my $class = shift;	4135	my $class = shift;
3099		4136
3100	my $self = $class->SUPER::new (	4137	my $self = $class->SUPER::new (
3101	fontsize => 0.8,	4138	fontsize => 0.8,
3102	@_,	4139	@_,
3103	);	4140	);
3104		4141
3105	Scalar::Util::weaken (my $this = $self);	4142	CFPlus::weaken (my $this = $self);
3106		4143
3107	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4144	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3108		4145
3109	$self	4146	$self
3110	}	4147	}
…		…
3112	sub reorder {	4149	sub reorder {
3113	my ($self) = @_;	4150	my ($self) = @_;
3114	my $NOW = Time::HiRes::time;	4151	my $NOW = Time::HiRes::time;
3115		4152
3116	# freeze display when hovering over any label	4153	# freeze display when hovering over any label
3117	return if $CFClient::UI::TOOLTIP->{owner}	4154	return if $CFPlus::UI::TOOLTIP->{owner}
3118	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4155	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3119	values %{ $self->{item} };	4156	values %{ $self->{item} };
3120		4157
3121	while (my ($k, $v) = each %{ $self->{item} }) {	4158	while (my ($k, $v) = each %{ $self->{item} }) {
3122	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4159	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3123	}	4160	}
…		…
3144	for ($short) {	4181	for ($short) {
3145	s/^\s+//;	4182	s/^\s+//;
3146	s/\s+/ /g;	4183	s/\s+/ /g;
3147	}	4184	}
3148		4185
3149	new CFClient::UI::Label	4186	new CFPlus::UI::Label
3150	markup => $short,	4187	markup => $short,
3151	tooltip => $item->{tooltip},	4188	tooltip => $item->{tooltip},
3152	tooltip_font => $::FONT_PROP,	4189	tooltip_font => $::FONT_PROP,
3153	tooltip_width => 0.67,	4190	tooltip_width => 0.67,
3154	fontsize => $item->{fontsize} || $self->{fontsize},	4191	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3192	$item->{count}++;	4229	$item->{count}++;
3193	} else {	4230	} else {
3194	$item->{count} = 1;	4231	$item->{count} = 1;
3195	$item->{text} = $item->{tooltip} = $text;	4232	$item->{text} = $item->{tooltip} = $text;
3196	}	4233	}
3197	$item->{id} = ++$self->{id};	4234	$item->{id} += 0.2;#d#
3198	$item->{timeout} = $timeout;	4235	$item->{timeout} = $timeout;
3199	delete $item->{label};	4236	delete $item->{label};
3200	} else {	4237	} else {
3201	$self->{item}{$group} = {	4238	$self->{item}{$group} = {
3202	id => ++$self->{id},	4239	id => ++$self->{id},
…		…
3208	count => 1,	4245	count => 1,
3209	%arg,	4246	%arg,
3210	};	4247	};
3211	}	4248	}
3212		4249
		4250	$ROOT->on_refresh (reorder => sub {
3213	$self->reorder;	4251	$self->reorder;
		4252	});
3214	}	4253	}
3215		4254
3216	sub reconfigure {	4255	sub reconfigure {
3217	my ($self) = @_;	4256	my ($self) = @_;
3218		4257
…		…
3221		4260
3222	$self->reorder;	4261	$self->reorder;
3223	$self->SUPER::reconfigure;	4262	$self->SUPER::reconfigure;
3224	}	4263	}
3225		4264
3226	sub DESTROY {	4265	sub destroy {
3227	my ($self) = @_;	4266	my ($self) = @_;
3228		4267
3229	$self->{timer}->cancel;	4268	$self->{timer}->cancel;
3230		4269
3231	$self->SUPER::DESTROY;	4270	$self->SUPER::destroy;
3232	}	4271	}
3233		4272
3234	#############################################################################	4273	#############################################################################
3235		4274
3236	package CFClient::UI::Inventory;
3237
3238	our @ISA = CFClient::UI::ScrolledWindow::;
3239
3240	sub new {
3241	my $class = shift;
3242
3243	my $self = $class->SUPER::new (
3244	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3245	@_,
3246	);
3247
3248	$self
3249	}
3250
3251	sub set_items {
3252	my ($self, $items) = @_;
3253
3254	$self->{child}->clear;
3255	return unless $items;
3256
3257	my @items = sort {
3258	($a->{type} <=> $b->{type})
3259	or ($a->{name} cmp $b->{name})
3260	} @$items;
3261
3262	$self->{real_items} = \@items;
3263
3264	my $row = 0;
3265	for my $item (@items) {
3266	CFClient::Item::update_widgets $item;
3267
3268	$self->{child}->add (0, $row, $item->{face_widget});
3269	$self->{child}->add (1, $row, $item->{desc_widget});
3270	$self->{child}->add (2, $row, $item->{weight_widget});
3271
3272	$row++;
3273	}
3274	}
3275
3276	#############################################################################
3277
3278	package CFClient::UI::BindEditor;
3279
3280	our @ISA = CFClient::UI::FancyFrame::;
3281
3282	sub new {
3283	my $class = shift;
3284
3285	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3286
3287	$self->add (my $vb = new CFClient::UI::VBox);
3288
3289
3290	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3291	text => "start recording",
3292	tooltip => "Start/Stops recording of actions."
3293	."All subsequent actions after the recording started will be captured."
3294	."The actions are displayed after the record was stopped."
3295	."To bind the action you have to click on the 'Bind' button",
3296	on_activate => sub {
3297	unless ($self->{recording}) {
3298	$self->start;
3299	} else {
3300	$self->stop;
3301	}
3302	});
3303
3304	$vb->add (new CFClient::UI::Label text => "Actions:");
3305	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3306
3307	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3308	$vb->add (my $hb = new CFClient::UI::HBox);
3309	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3310	$hb->add (new CFClient::UI::Button
3311	text => "bind",
3312	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3313	on_activate => sub {
3314	$self->ask_for_bind;
3315	});
3316
3317	$vb->add (my $hb = new CFClient::UI::HBox);
3318	$hb->add (new CFClient::UI::Button
3319	text => "ok",
3320	expand => 1,
3321	tooltip => "This closes the binding editor and saves the binding",
3322	on_activate => sub {
3323	$self->hide;
3324	$self->commit;
3325	});
3326
3327	$hb->add (new CFClient::UI::Button
3328	text => "cancel",
3329	expand => 1,
3330	tooltip => "This closes the binding editor without saving",
3331	on_activate => sub {
3332	$self->hide;
3333	$self->{binding_cancel}->()
3334	if $self->{binding_cancel};
3335	});
3336
3337	$self->update_binding_widgets;
3338
3339	$self
3340	}
3341
3342	sub commit {
3343	my ($self) = @_;
3344	my ($mod, $sym, $cmds) = $self->get_binding;
3345	if ($sym != 0 && @$cmds > 0) {
3346	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3347	."'. Don't forget 'Save Config'!");
3348	$self->{binding_change}->($mod, $sym, $cmds)
3349	if $self->{binding_change};
3350	} else {
3351	$::STATUSBOX->add ("No action bound, no key or action specified!");
3352	$self->{binding_cancel}->()
3353	if $self->{binding_cancel};
3354	}
3355	}
3356
3357	sub start {
3358	my ($self) = @_;
3359
3360	$self->{rec_btn}->set_text ("stop recording");
3361	$self->{recording} = 1;
3362	$self->clear_command_list;
3363	$::CONN->start_record if $::CONN;
3364	}
3365
3366	sub stop {
3367	my ($self) = @_;
3368
3369	$self->{rec_btn}->set_text ("start recording");
3370	$self->{recording} = 0;
3371
3372	my $rec;
3373	$rec = $::CONN->stop_record if $::CONN;
3374	return unless ref $rec eq 'ARRAY';
3375	$self->set_command_list ($rec);
3376	}
3377
3378
3379	sub ask_for_bind_and_commit {
3380	my ($self) = @_;
3381	$self->ask_for_bind (1);
3382	}
3383
3384	sub ask_for_bind {
3385	my ($self, $commit) = @_;
3386
3387	CFClient::Binder::open_binding_dialog (sub {
3388	my ($mod, $sym) = @_;
3389	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390	$self->update_binding_widgets;
3391	$self->commit if $commit;
3392	});
3393	}
3394
3395	# $mod and $sym are the modifiers and key symbol
3396	# $cmds is a array ref of strings (the commands)
3397	# $cb is the callback that is executed on OK
3398	# $ccb is the callback that is executed on CANCEL and
3399	# when the binding was unsuccessful on OK
3400	sub set_binding {
3401	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3402
3403	$self->clear_command_list;
3404	$self->{recording} = 0;
3405	$self->{rec_btn}->set_text ("start recording");
3406
3407	$self->{binding} = [$mod, $sym];
3408	$self->{commands} = $cmds;
3409
3410	$self->{binding_change} = $cb;
3411	$self->{binding_cancel} = $ccb;
3412
3413	$self->update_binding_widgets;
3414	}
3415
3416	# this is a shortcut method that asks for a binding
3417	# and then just binds it.
3418	sub do_quick_binding {
3419	my ($self, $cmds) = @_;
3420	$self->set_binding (undef, undef, $cmds, sub {
3421	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422	});
3423	$self->ask_for_bind (1);
3424	}
3425
3426	sub update_binding_widgets {
3427	my ($self) = @_;
3428	my ($mod, $sym, $cmds) = $self->get_binding;
3429	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3430	$self->set_command_list ($cmds);
3431	}
3432
3433	sub get_binding {
3434	my ($self) = @_;
3435	return (
3436	$self->{binding}->[0],
3437	$self->{binding}->[1],
3438	[ grep { defined $_ } @{$self->{commands}} ]
3439	);
3440	}
3441
3442	sub clear_command_list {
3443	my ($self) = @_;
3444	$self->{cmdbox}->clear ();
3445	}
3446
3447	sub set_command_list {
3448	my ($self, $cmds) = @_;
3449
3450	$self->{cmdbox}->clear ();
3451	$self->{commands} = $cmds;
3452
3453	my $idx = 0;
3454
3455	for (@$cmds) {
3456	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3457
3458	my $i = $idx;
3459	$hb->add (new CFClient::UI::Label text => $_);
3460	$hb->add (new CFClient::UI::Button
3461	text => "delete",
3462	tooltip => "Deletes the action from the record",
3463	on_activate => sub {
3464	$self->{cmdbox}->remove ($hb);
3465	$cmds->[$i] = undef;
3466	});
3467
3468
3469	$idx++
3470	}
3471	}
3472
3473	#############################################################################
3474
3475	package CFClient::UI::SpellList;
3476
3477	our @ISA = CFClient::UI::Table::;
3478
3479	sub new {
3480	my $class = shift;
3481
3482	my $self = $class->SUPER::new (
3483	binding => [],
3484	commands => [],
3485	@_,
3486	)
3487	}
3488
3489	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3491	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3493	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
3495
3496	sub rebuild_spell_list {
3497	my ($self) = @_;
3498
3499	$CFClient::UI::ROOT->on_refresh ($self => sub {
3500	$self->clear;
3501
3502	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3503	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506
3507	my $row = 0;
3508
3509	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510	my $spell = $self->{spell}{$_};
3511
3512	$row++;
3513
3514	$self->add (0, $row, new CFClient::UI::Face
3515	face => $spell->{face},
3516	can_hover => 1,
3517	can_events => 1,
3518	tooltip => $spell->{message},
3519	);
3520
3521	$self->add (1, $row, new CFClient::UI::Label
3522	expand => 1,
3523	text => $spell->{name},
3524	can_hover => 1,
3525	can_events => 1,
3526	tooltip => $spell->{message},
3527	);
3528
3529	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533	# TODO: should be done via popup
3534	$self->add (5, $row, new CFClient::UI::Button
3535	text => "bind",
3536	tooltip => "bind spell readying (cast command) to key",
3537	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538	);
3539	}
3540	});
3541	}
3542
3543	sub add_spell {
3544	my ($self, $spell) = @_;
3545
3546	$self->{spell}->{$spell->{name}} = $spell;
3547	$self->rebuild_spell_list;
3548	}
3549
3550	sub remove_spell {
3551	my ($self, $spell) = @_;
3552
3553	delete $self->{spell}->{$spell->{name}};
3554	$self->rebuild_spell_list;
3555	}
3556
3557	#############################################################################
3558
3559	package CFClient::UI::Root;	4275	package CFPlus::UI::Root;
3560		4276
3561	our @ISA = CFClient::UI::Container::;	4277	our @ISA = CFPlus::UI::Container::;
3562		4278
3563	use List::Util qw(min max);	4279	use List::Util qw(min max);
3564		4280
3565	use CFClient::OpenGL;	4281	use CFPlus::OpenGL;
3566		4282
3567	sub new {	4283	sub new {
3568	my $class = shift;	4284	my $class = shift;
3569		4285
3570	my $self = $class->SUPER::new (	4286	my $self = $class->SUPER::new (
3571	visible => 1,	4287	visible => 1,
3572	@_,	4288	@_,
3573	);	4289	);
3574		4290
3575	Scalar::Util::weaken ($self->{root} = $self);	4291	CFPlus::weaken ($self->{root} = $self);
3576		4292
3577	$self	4293	$self
3578	}	4294	}
3579		4295
3580	sub size_request {	4296	sub size_request {
…		…
3595	$coord = $max - $size if $coord > $max - $size;	4311	$coord = $max - $size if $coord > $max - $size;
3596		4312
3597	int $coord + 0.5	4313	int $coord + 0.5
3598	}	4314	}
3599		4315
3600	sub size_allocate {	4316	sub invoke_size_allocate {
3601	my ($self, $w, $h) = @_;	4317	my ($self, $w, $h) = @_;
3602		4318
3603	for my $child ($self->children) {	4319	for my $child ($self->children) {
3604	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4320	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3605		4321
…		…
3609	$X = _to_pixel $X, $W, $self->{w};	4325	$X = _to_pixel $X, $W, $self->{w};
3610	$Y = _to_pixel $Y, $H, $self->{h};	4326	$Y = _to_pixel $Y, $H, $self->{h};
3611		4327
3612	$child->configure ($X, $Y, $W, $H);	4328	$child->configure ($X, $Y, $W, $H);
3613	}	4329	}
		4330
		4331	1
3614	}	4332	}
3615		4333
3616	sub coord2local {	4334	sub coord2local {
3617	my ($self, $x, $y) = @_;	4335	my ($self, $x, $y) = @_;
3618		4336
…		…
3626	}	4344	}
3627		4345
3628	sub update {	4346	sub update {
3629	my ($self) = @_;	4347	my ($self) = @_;
3630		4348
3631	$::WANT_REFRESH++;	4349	$::WANT_REFRESH->start;
3632	}	4350	}
3633		4351
3634	sub add {	4352	sub add {
3635	my ($self, @children) = @_;	4353	my ($self, @children) = @_;
3636		4354
…		…
3673	while ($self->{refresh_hook}) {	4391	while ($self->{refresh_hook}) {
3674	$_->()	4392	$_->()
3675	for values %{delete $self->{refresh_hook}};	4393	for values %{delete $self->{refresh_hook}};
3676	}	4394	}
3677		4395
3678	if ($self->{realloc}) {	4396	while ($self->{realloc}) {
3679	my %queue;	4397	my %queue;
3680	my @queue;	4398	my @queue;
3681	my $widget;	4399	my $widget;
3682		4400
3683	outer:	4401	outer:
…		…
3730	}	4448	}
3731	}	4449	}
3732		4450
3733	delete $self->{realloc}{$widget+0};	4451	delete $self->{realloc}{$widget+0};
3734	}	4452	}
3735	}
3736		4453
3737	while (my $size_alloc = delete $self->{size_alloc}) {	4454	while (my $size_alloc = delete $self->{size_alloc}) {
3738	my @queue = sort { $b->{visible} <=> $a->{visible} }	4455	my @queue = sort { $a->{visible} <=> $b->{visible} }
3739	values %$size_alloc;	4456	values %$size_alloc;
3740		4457
3741	while () {	4458	while () {
3742	my $widget = pop @queue || last;	4459	my $widget = pop @queue || last;
3743		4460
3744	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4461	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3745		4462
3746	$w = 0 if $w < 0;	4463	$w = max $widget->{min_w}, $w;
3747	$h = 0 if $h < 0;	4464	$h = max $widget->{min_h}, $h;
3748		4465
		4466	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4467	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4468
		4469	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4470	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4471
3749	$w = int $w + 0.5;	4472	$w = int $w + 0.5;
3750	$h = int $h + 0.5;	4473	$h = int $h + 0.5;
3751		4474
3752	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4475	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3753	$widget->{old_w} = $widget->{w};	4476	$widget->{old_w} = $widget->{w};
3754	$widget->{old_h} = $widget->{h};	4477	$widget->{old_h} = $widget->{h};
3755		4478
3756	$widget->{w} = $w;	4479	$widget->{w} = $w;
3757	$widget->{h} = $h;	4480	$widget->{h} = $h;
3758		4481
3759	$widget->emit (size_allocate => $w, $h);	4482	$widget->emit (size_allocate => $w, $h);
		4483	}
3760	}	4484	}
3761	}	4485	}
3762	}	4486	}
3763		4487
3764	while ($self->{post_alloc_hook}) {	4488	while ($self->{post_alloc_hook}) {
3765	$_->()	4489	$_->()
3766	for values %{delete $self->{post_alloc_hook}};	4490	for values %{delete $self->{post_alloc_hook}};
3767	}	4491	}
3768
3769		4492
3770	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4493	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3771	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4494	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3772	glClear GL_COLOR_BUFFER_BIT;	4495	glClear GL_COLOR_BUFFER_BIT;
3773		4496
…		…
3776	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4499	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3777	glMatrixMode GL_MODELVIEW;	4500	glMatrixMode GL_MODELVIEW;
3778	glLoadIdentity;	4501	glLoadIdentity;
3779		4502
3780	{	4503	{
3781	package CFClient::UI::Base;	4504	package CFPlus::UI::Base;
3782		4505
3783	($draw_x, $draw_y, $draw_w, $draw_h) =	4506	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3784	(0, 0, $self->{w}, $self->{h});	4507	(0, 0, $self->{w}, $self->{h});
3785	}
3786		4508
3787	$self->_draw;	4509	$self->_draw;
		4510	}
3788	}	4511	}
3789		4512
3790	#############################################################################	4513	#############################################################################
3791		4514
3792	package CFClient::UI;	4515	package CFPlus::UI;
3793		4516
3794	$ROOT = new CFClient::UI::Root;	4517	$ROOT = new CFPlus::UI::Root;
3795	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4518	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3796		4519
3797	1	4520	1
3798		4521

Diff Legend

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