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.288 by root, Mon Jun 5 21:14:40 2006 UTC vs.
Revision 1.425 by root, Fri Aug 10 04:02:13 2007 UTC

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

Diff Legend

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