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

Diff Legend

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