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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.406 by root, Sat Jul 21 23:17:35 2007 UTC

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

Diff Legend

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