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

Diff Legend

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