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

Diff Legend

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