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.275 by root, Sat Jun 3 22:50:48 2006 UTC vs.
Revision 1.452 by root, Wed Dec 26 20:09:38 2007 UTC

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

Diff Legend

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