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

Diff Legend

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