ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
16our $TOOLTIP;
13our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
14 70
15# class methods for events 71# class methods for events
16sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 73 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS;
18} 75}
19 76
20sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 78 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS;
22} 80}
23 81
24sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
25 my ($ev) = @_; 83 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 86 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 87 my $widget = $ROOT->find_widget ($x, $y);
30 88
31 $GRAB = $widget; 89 $GRAB = $widget;
32 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
33 } 93 }
34 94
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 96
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
98 if $GRAB;
38} 99}
39 100
40sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
41 my ($ev) = @_; 102 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
43 104
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 106
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 108
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
110 if $GRAB;
49 111
50 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 114 $grab->update if $grab;
53 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
116
117 check_tooltip;
54 } 118 }
55} 119}
56 120
57sub feed_sdl_motion_event { 121sub feed_sdl_motion_event {
58 my ($ev) = @_; 122 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 127 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 128 my $hover = $HOVER; $HOVER = $widget;
65 129
66 $hover->update if $hover && $hover->{can_hover}; 130 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 132
133 check_tooltip;
134 }
135
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER;
71} 138}
72 139
73# convert position array to integers 140# convert position array to integers
74sub harmonize { 141sub harmonize {
75 my ($vals) = @_; 142 my ($vals) = @_;
… …
81 $rem += $_ - $i; 148 $rem += $_ - $i;
82 $_ = $i; 149 $_ = $i;
83 } 150 }
84} 151}
85 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
86############################################################################# 194#############################################################################
87 195
88package CFClient::UI::Base; 196package CFClient::UI::Base;
89 197
90use strict; 198use strict;
… …
93 201
94sub new { 202sub new {
95 my $class = shift; 203 my $class = shift;
96 204
97 my $self = bless { 205 my $self = bless {
98 x => 0, 206 x => "center",
99 y => 0, 207 y => "center",
100 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
101 can_events => 1, 211 can_events => 1,
102 @_ 212 @_
103 }, $class; 213 }, $class;
104 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
105 for (keys %$self) { 217 for (keys %$self) {
106 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
107 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
108 } 220 }
109 } 221 }
110 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
111 $self 235 $self
112} 236}
113 237
238sub destroy {
239 my ($self) = @_;
240
241 $self->hide;
242 %$self = ();
243}
244
114sub show { 245sub show {
115 my ($self) = @_; 246 my ($self) = @_;
116 247
117 return if $self->{parent}; 248 return if $self->{parent};
118 249
119 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
120} 251}
121 252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
277
278 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self;
280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
122sub hide { 306sub hide {
123 my ($self) = @_; 307 my ($self) = @_;
124 308
125 return unless $self->{parent}; 309 $self->set_invisible;
126 310
127 $self->{parent}->remove ($self); 311 $self->{parent}->remove ($self)
312 if $self->{parent};
128} 313}
129 314
130sub move { 315sub move_abs {
131 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
132 317
133 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
134 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
135 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
136 321
137 $self->update; 322 $self->update;
138} 323}
139 324
140sub needs_redraw { 325sub set_size {
141 0 326 my ($self, $w, $h) = @_;
327
328 $self->{force_w} = $w;
329 $self->{force_h} = $h;
330
331 $self->realloc;
142} 332}
143 333
144sub size_request { 334sub size_request {
145 require Carp; 335 require Carp;
146 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
148 338
149sub configure { 339sub configure {
150 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
151 341
152 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
153 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
154 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
155 347
156 # use alignment to adjust x, y 348 # use alignment to adjust x, y
157 349
158 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
159 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
160
161 ($w, $h) = ($w2, $h2);
162 } 352 }
163 353
164 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
165 $self->{x} = $x; 355 $self->{x} = $x;
166 $self->{y} = $y; 356 $self->{y} = $y;
167 $self->update; 357 $self->update;
168 } 358 }
169 359
170 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{w} != $w || $self->{h} != $h) {
171 $self->{w} = $w; 361 return unless $self->{visible};
172 $self->{h} = $h;
173 362
174 $self->size_allocate ($w, $h); 363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
175 $self->update;
176 } 364 }
177} 365}
178 366
179sub size_allocate { 367sub size_allocate {
180 # nothing to be done 368 # nothing to be done
181} 369}
182 370
183# return top left coordinates 371sub children {
184sub _topleft { 372}
373
374sub set_max_size {
185 my ($self, $x, $y) = @_; 375 my ($self, $w, $h) = @_;
186 376
187 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 377 delete $self->{max_w}; $self->{max_w} = $w if $w;
378 delete $self->{max_h}; $self->{max_h} = $h if $h;
379}
380
381sub set_tooltip {
382 my ($self, $tooltip) = @_;
383
384 $tooltip =~ s/^\s+//;
385 $tooltip =~ s/\s+$//;
386
387 return if $self->{tooltip} eq $tooltip;
388
389 $self->{tooltip} = $tooltip;
390
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip;
394 }
188} 395}
189 396
190# translate global coordinates to local coordinate system 397# translate global coordinates to local coordinate system
191sub coord2local { 398sub coord2local {
192 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
193 400
194 my ($X, $Y) = $self->_topleft; 401 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
195 ($x - $X, $y - $Y)
196} 402}
197 403
198# translate local coordinates to global coordinate system 404# translate local coordinates to global coordinate system
199sub coord2global { 405sub coord2global {
200 my ($self, $x, $y) = @_; 406 my ($self, $x, $y) = @_;
201 407
202 my ($X, $Y) = $self->_topleft; 408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
203 ($x + $X, $y + $Y)
204} 409}
205 410
206sub focus_in { 411sub focus_in {
207 my ($self) = @_; 412 my ($self) = @_;
208 413
209 return if $FOCUS == $self; 414 return if $FOCUS == $self;
210 return unless $self->{can_focus}; 415 return unless $self->{can_focus};
211 416
212 my $focus = $FOCUS; $FOCUS = $self; 417 my $focus = $FOCUS; $FOCUS = $self;
213 418
214 $self->emit (focus_in => $focus); 419 $self->_emit (focus_in => $focus);
215 420
216 $focus->update if $focus; 421 $focus->update if $focus;
217 $FOCUS->update; 422 $FOCUS->update;
218} 423}
219 424
… …
222 427
223 return unless $FOCUS == $self; 428 return unless $FOCUS == $self;
224 429
225 my $focus = $FOCUS; undef $FOCUS; 430 my $focus = $FOCUS; undef $FOCUS;
226 431
227 $self->emit (focus_out => $focus); 432 $self->_emit (focus_out => $focus);
228 433
229 $focus->update if $focus; #? 434 $focus->update if $focus; #?
435
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
437 unless $FOCUS;
230} 438}
231 439
232sub mouse_motion { } 440sub mouse_motion { }
233sub button_up { } 441sub button_up { }
234sub key_down { } 442sub key_down { }
235sub key_up { } 443sub key_up { }
236 444
237sub button_down { 445sub button_down {
238 my ($self, $ev, $x, $y) = @_; 446 my ($self, $ev, $x, $y) = @_;
239 447
240 $self->focus_in; 448 $self->focus_in;
… …
243sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
244sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
245sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
246sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
247sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456
457sub find_widget {
458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self};
504
505 $self->{root}{realloc}{$self} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 }
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
518
519sub reconfigure {
520 my ($self) = @_;
521
522 $self->realloc;
523 $self->update;
524}
248 525
249sub draw { 526sub draw {
250 my ($self) = @_; 527 my ($self) = @_;
251 528
252 return unless $self->{h} && $self->{w}; 529 return unless $self->{h} && $self->{w};
… …
268 glVertex $x + $self->{w}, $y + $self->{h}; 545 glVertex $x + $self->{w}, $y + $self->{h};
269 glVertex $x , $y + $self->{h}; 546 glVertex $x , $y + $self->{h};
270 glEnd; 547 glEnd;
271 glDisable GL_BLEND; 548 glDisable GL_BLEND;
272 } 549 }
550
551 if ($ENV{CFPLUS_DEBUG}) {
552 glPushMatrix;
553 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
555 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1;
560 glEnd;
561 glPopMatrix;
562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563 }
273} 564}
274 565
275sub _draw { 566sub _draw {
276 my ($self) = @_; 567 my ($self) = @_;
277 568
278 warn "no draw defined for $self\n"; 569 warn "no draw defined for $self\n";
279} 570}
280 571
281sub find_widget {
282 my ($self, $x, $y) = @_;
283
284 return () unless $self->{can_events};
285
286 return $self
287 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
288 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
289
290 ()
291}
292
293sub set_parent {
294 my ($self, $parent) = @_;
295
296 Scalar::Util::weaken ($self->{parent} = $parent);
297}
298
299sub check_size {
300 my ($self) = @_;
301
302 return unless $self->{parent};
303
304 my ($w, $h) = $self->size_request;
305
306 if ($w != $self->{req_w} || $h != $self->{req_h}) {
307 $self->{req_w} = $w;
308 $self->{req_h} = $h;
309
310 $self->{parent}->check_size;
311 }
312}
313
314sub update {
315 my ($self) = @_;
316
317 $self->{parent}->update
318 if $self->{parent};
319}
320
321sub connect {
322 my ($self, $signal, $cb) = @_;
323
324 push @{ $self->{signal_cb}{$signal} }, $cb;
325}
326
327sub emit {
328 my ($self, $signal, @args) = @_;
329
330 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
331 $cb->($self, @args);
332 }
333}
334
335sub DESTROY { 572sub DESTROY {
336 my ($self) = @_; 573 my ($self) = @_;
337 574
575 delete $WIDGET{$self+0};
338 #$self->deactivate; 576 #$self->deactivate;
339} 577}
340 578
341############################################################################# 579#############################################################################
342 580
… …
351 my $class = shift; 589 my $class = shift;
352 590
353 # range [value, low, high, page] 591 # range [value, low, high, page]
354 592
355 $class->SUPER::new ( 593 $class->SUPER::new (
356 bg => [0, 0, 0, 0.2], 594 #bg => [0, 0, 0, 0.2],
357 active_bg => [1, 1, 1, 0.5], 595 #active_bg => [1, 1, 1, 0.5],
358 @_ 596 @_
359 ) 597 )
360} 598}
361 599
362sub _draw { 600sub _draw {
363 my ($self) = @_; 601 my ($self) = @_;
364 602
603 my $color = $FOCUS == $self && $self->{active_bg}
604 ? $self->{active_bg}
605 : $self->{bg};
606
607 if ($color && (@$color < 4 || $color->[3])) {
365 my ($w, $h) = @$self{qw(w h)}; 608 my ($w, $h) = @$self{qw(w h)};
366 609
367 glEnable GL_BLEND; 610 glEnable GL_BLEND;
368 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
369 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 612 glColor @$color;
370 613
371 glBegin GL_QUADS; 614 glBegin GL_QUADS;
372 glVertex 0 , 0; 615 glVertex 0 , 0;
373 glVertex 0 , $h; 616 glVertex 0 , $h;
374 glVertex $w, $h; 617 glVertex $w, $h;
375 glVertex $w, 0; 618 glVertex $w, 0;
376 glEnd; 619 glEnd;
377 620
378 glDisable GL_BLEND; 621 glDisable GL_BLEND;
622 }
379} 623}
380 624
381############################################################################# 625#############################################################################
382 626
383package CFClient::UI::Empty; 627package CFClient::UI::Empty;
… …
388 my ($class, %arg) = @_; 632 my ($class, %arg) = @_;
389 $class->SUPER::new (can_events => 0, %arg); 633 $class->SUPER::new (can_events => 0, %arg);
390} 634}
391 635
392sub size_request { 636sub size_request {
393 (0, 0) 637 my ($self) = @_;
638
639 ($self->{w} + 0, $self->{h} + 0)
394} 640}
395 641
396sub draw { } 642sub draw { }
397 643
398############################################################################# 644#############################################################################
… …
404sub new { 650sub new {
405 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
406 652
407 my $children = delete $arg{children} || []; 653 my $children = delete $arg{children} || [];
408 654
409 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 655 my $self = $class->SUPER::new (
656 children => [],
657 can_events => 0,
658 %arg,
659 );
410 $self->add ($_) for @$children; 660 $self->add ($_) for @$children;
411 661
412 $self 662 $self
413} 663}
414 664
415sub add { 665sub add {
416 my ($self, $child) = @_; 666 my ($self, @widgets) = @_;
417 667
418 $child->set_parent ($self); 668 $_->set_parent ($self)
669 for @widgets;
419 670
420 use sort 'stable'; 671 use sort 'stable';
421 672
422 $self->{children} = [ 673 $self->{children} = [
423 sort { $a->{z} <=> $b->{z} } 674 sort { $a->{z} <=> $b->{z} }
424 @{$self->{children}}, $child 675 @{$self->{children}}, @widgets
425 ]; 676 ];
426 677
427 $child->check_size; 678 $self->realloc;
679}
680
681sub children {
682 @{ $_[0]{children} }
428} 683}
429 684
430sub remove { 685sub remove {
431 my ($self, $child) = @_; 686 my ($self, $child) = @_;
432 687
433 delete $child->{parent}; 688 delete $child->{parent};
689 $child->hide;
434 690
435 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 691 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
436 692
437 $self->check_size; 693 $self->realloc;
694}
695
696sub clear {
697 my ($self) = @_;
698
699 my $children = delete $self->{children};
700 $self->{children} = [];
701
702 for (@$children) {
703 delete $_->{parent};
704 $_->hide;
705 }
706
707 $self->realloc;
438} 708}
439 709
440sub find_widget { 710sub find_widget {
441 my ($self, $x, $y) = @_; 711 my ($self, $x, $y) = @_;
442 712
… …
495sub size_request { 765sub size_request {
496 $_[0]{children}[0]->size_request 766 $_[0]{children}[0]->size_request
497} 767}
498 768
499sub size_allocate { 769sub size_allocate {
500 my ($self, $w, $h) = @_; 770 my ($self, $w, $h, $changed) = @_;
501 771
502 $self->{children}[0]->configure (0, 0, $w, $h); 772 $self->{children}[0]->configure (0, 0, $w, $h);
503} 773}
504 774
505############################################################################# 775#############################################################################
… …
517} 787}
518 788
519sub update { 789sub update {
520 my ($self) = @_; 790 my ($self) = @_;
521 791
522 # we want to do this delayed... 792 $ROOT->on_post_alloc ($self => sub { $self->render_child });
523 $self->render_chld;
524 $self->SUPER::update; 793 $self->SUPER::update;
525} 794}
526 795
796sub size_allocate {
797 my ($self, $w, $h, $changed) = @_;
798
799 $self->SUPER::size_allocate ($w, $h, $changed);
800 $self->update
801 if $changed;
802}
803
804sub _render {
805 $_[0]{children}[0]->draw;
806}
807
527sub render_chld { 808sub render_child {
528 my ($self) = @_; 809 my ($self) = @_;
529 810
530 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
531 glClearColor 0, 0, 0, 1; 812 glClearColor 0, 0, 0, 0;
532 glClear GL_COLOR_BUFFER_BIT; 813 glClear GL_COLOR_BUFFER_BIT;
533 $self->child->draw; 814
815 $self->_render;
534 }; 816 };
535}
536
537sub size_allocate {
538 my ($self, $w, $h) = @_;
539
540 $self->child->configure (0, 0, $w, $h);
541
542 $self->render_chld;
543} 817}
544 818
545sub _draw { 819sub _draw {
546 my ($self) = @_; 820 my ($self) = @_;
547 821
548 my ($w, $h) = ($self->w, $self->h); 822 my ($w, $h) = ($self->w, $self->h);
549 823
550 my $tex = $self->{texture} 824 my $tex = $self->{texture}
551 or return; 825 or return;
552 826
553 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
555 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1;
557 830
558 $tex->draw_quad (0, 0, $w, $h); 831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
559 832
560 glDisable GL_BLEND;
561 glDisable GL_TEXTURE_2D; 833 glDisable GL_TEXTURE_2D;
562} 834}
563 835
564############################################################################# 836#############################################################################
565 837
566package CFClient::UI::ViewPort; 838package CFClient::UI::ViewPort;
567 839
568our @ISA = CFClient::UI::Window::; 840our @ISA = CFClient::UI::Window::;
569
570sub new { die }
571
572sub size_request {
573 my ($self) = @_;
574
575 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
576 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
577
578 @$self{qw(child_w child_h)}
579}
580
581sub _draw {
582 my ($self) = @_;
583
584 $self->{children}[1]->draw;
585}
586
587
588#############################################################################
589
590package CFClient::UI::Frame;
591
592our @ISA = CFClient::UI::Bin::;
593
594use CFClient::OpenGL;
595 841
596sub new { 842sub new {
597 my $class = shift; 843 my $class = shift;
598 844
599 my $self = $class->SUPER::new ( 845 $class->SUPER::new (
600 bg => [1, 1, 1, 1], 846 scroll_x => 0,
601 border_bg => [1, 1, 1, 1], 847 scroll_y => 1,
602 border => 0.8,
603 @_ 848 @_,
604 ); 849 )
605
606 $self
607}
608
609sub set_size {
610 my ($self, $w, $h) = @_;
611 $self->{req_w} = $w;
612 $self->{req_h} = $h;
613 $self->check_size;
614} 850}
615 851
616sub size_request { 852sub size_request {
617 my ($self) = @_; 853 my ($self) = @_;
618 ($self->{req_w}, $self->{req_h}) 854
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
856
857 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y};
859
860 ($w, $h)
619} 861}
620 862
621sub size_allocate { 863sub size_allocate {
622 my ($self, $w, $h) = @_; 864 my ($self, $w, $h, $changed) = @_;
623 $self->{w} = $w; 865
624 $self->{h} = $h; 866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
868
625 $self->child->configure (0, 0, $w, $h); 869 $self->child->configure (0, 0, $w, $h);
870 $self->update;
626} 871}
627 872
628sub _draw { 873sub set_offset {
629 my ($self) = @_; 874 my ($self, $x, $y) = @_;
630 875
631 my ($w, $h) = ($self->{w}, $self->{h}); 876 $self->{view_x} = int $x;
877 $self->{view_y} = int $y;
632 878
633 glEnable GL_BLEND; 879 $self->update;
634 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 880}
635 glEnable GL_TEXTURE_2D;
636 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
637 881
638# glBegin GL_QUADS; 882# hmm, this does not work for topleft of $self... but we should not ask for that
639# glColor 0, 0, 0, 0; 883sub coord2local {
640# glVertex 0 , 0; 884 my ($self, $x, $y) = @_;
641# glVertex 0 , $h;
642# glVertex $w, $h;
643# glVertex $w, 0;
644# glEnd;
645 885
886 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
887}
646 888
647 $self->child->draw; 889sub coord2global {
648 glDisable GL_BLEND; 890 my ($self, $x, $y) = @_;
649 glDisable GL_TEXTURE_2D; 891
892 $x = List::Util::min $self->{w}, $x - $self->{view_x};
893 $y = List::Util::min $self->{h}, $y - $self->{view_y};
894
895 $self->SUPER::coord2global ($x, $y)
896}
897
898sub find_widget {
899 my ($self, $x, $y) = @_;
900
901 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
902 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
903 ) {
904 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
905 } else {
906 $self->CFClient::UI::Base::find_widget ($x, $y)
907 }
908}
909
910sub _render {
911 my ($self) = @_;
912
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914
915 $self->SUPER::_render;
650} 916}
651 917
652############################################################################# 918#############################################################################
653 919
654package CFClient::UI::FancyFrame; 920package CFClient::UI::ScrolledWindow;
655 921
656our @ISA = CFClient::UI::Bin::; 922our @ISA = CFClient::UI::HBox::;
657
658use CFClient::OpenGL;
659
660my @tex =
661 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
662 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
663 923
664sub new { 924sub new {
665 my $class = shift; 925 my $class = shift;
666 926
667 # TODO: user_x, user_y, overwrite moveto? 927 my $self;
928
929 my $slider = new CFClient::UI::Slider
930 vertical => 1,
931 range => [0, 0, 1, 0.01], # HACK fix
932 on_changed => sub {
933 $self->{vp}->set_offset (0, $_[1]);
934 },
935 ;
936
937 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1),
939 slider => $slider,
940 @_,
941 );
942
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider});
946
947 $self
948}
949
950sub update {
951 my ($self) = @_;
952
953 $self->SUPER::update;
954
955 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
960sub size_allocate {
961 my ($self, $w, $h, $changed) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967}
968
969#TODO# update range on size_allocate depending on child
970# update viewport offset on scroll
971
972#############################################################################
973
974package CFClient::UI::Frame;
975
976our @ISA = CFClient::UI::Bin::;
977
978use CFClient::OpenGL;
979
980sub new {
981 my $class = shift;
982
983 $class->SUPER::new (
984 bg => undef,
985 @_,
986 )
987}
988
989sub _draw {
990 my ($self) = @_;
991
992 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)};
994
995 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} };
998
999 glBegin GL_QUADS;
1000 glVertex 0 , 0;
1001 glVertex 0 , $h;
1002 glVertex $w, $h;
1003 glVertex $w, 0;
1004 glEnd;
1005
1006 glDisable GL_BLEND;
1007 }
1008
1009 $self->SUPER::_draw;
1010}
1011
1012#############################################################################
1013
1014package CFClient::UI::FancyFrame;
1015
1016our @ISA = CFClient::UI::Bin::;
1017
1018use CFClient::OpenGL;
1019
1020my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1;
1023
1024my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027
1028sub new {
1029 my $class = shift;
668 1030
669 my $self = $class->SUPER::new ( 1031 my $self = $class->SUPER::new (
670 bg => [1, 1, 1, 1], 1032 bg => [1, 1, 1, 1],
671 border_bg => [1, 1, 1, 1], 1033 border_bg => [1, 1, 1, 1],
672 border => 0.8, 1034 border => 0.6,
673 can_events => 1, 1035 can_events => 1,
1036 min_w => 16,
1037 min_h => 16,
674 @_ 1038 @_
675 ); 1039 );
676 1040
677 $self->{title} &&= new CFClient::UI::Label 1041 $self->{title} &&= new CFClient::UI::Label
678 align => 0, 1042 align => 0,
679 valign => 1, 1043 valign => 1,
680 text => $self->{title}, 1044 text => $self->{title},
681 fontsize => 1; 1045 fontsize => $self->{border};
682 1046
683 $self 1047 $self
684} 1048}
685 1049
686sub border { 1050sub border {
687 int $_[0]{border} * $::FONTSIZE 1051 int $_[0]{border} * $::FONTSIZE
688} 1052}
689 1053
690sub size_request { 1054sub size_request {
691 my ($self) = @_; 1055 my ($self) = @_;
692
693 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
694 1056
695 my ($w, $h) = $self->SUPER::size_request; 1057 my ($w, $h) = $self->SUPER::size_request;
696 1058
697 ( 1059 (
698 $w + $self->border * 2, 1060 $w + $self->border * 2,
699 $h + $self->border * 2, 1061 $h + $self->border * 2,
700 ) 1062 )
701} 1063}
702 1064
703sub size_allocate { 1065sub size_allocate {
704 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h, $changed) = @_;
1067
1068 return unless $changed;
705 1069
706 $h -= List::Util::max 0, $self->border * 2; 1070 $h -= List::Util::max 0, $self->border * 2;
707 $w -= List::Util::max 0, $self->border * 2; 1071 $w -= List::Util::max 0, $self->border * 2;
708 1072
709 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
710 if $self->{title}; 1074 if $self->{title};
711 1075
712 $self->child->configure ($self->border, $self->border, $w, $h); 1076 $self->child->configure ($self->border, $self->border, $w, $h);
713} 1077}
714 1078
715sub button_down { 1079sub button_down {
716 my ($self, $ev, $x, $y) = @_; 1080 my ($self, $ev, $x, $y) = @_;
717 1081
1082 my ($w, $h) = @$self{qw(w h)};
718 my $border = $self->border; 1083 my $border = $self->border;
719 1084
720 if ($x < $self->{w} && $x >= $self->{w} - $border 1085 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
721 && $y < $self->{h} && $y >= $self->{h} - $border) { 1086 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
722 1087
1088 if ($lr & $td) {
1089 my ($wx, $wy) = ($self->{x}, $self->{y});
723 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1090 my ($ox, $oy) = ($ev->{x}, $ev->{y});
724 my ($bw, $bh) = ($self->{w}, $self->{h}); 1091 my ($bw, $bh) = ($self->{w}, $self->{h});
725 1092
1093 my $mx = $x < $border;
1094 my $my = $y < $border;
1095
726 $self->{motion} = sub { 1096 $self->{motion} = sub {
727 my ($ev, $x, $y) = @_; 1097 my ($ev, $x, $y) = @_;
728 1098
729 ($x, $y) = ($ev->{x}, $ev->{y}); 1099 my $dx = $ev->{x} - $ox;
1100 my $dy = $ev->{y} - $oy;
730 1101
731 $self->{user_w} = $bw + $x - $ox; 1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
732 $self->{user_h} = $bh + $y - $oy; 1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
733 $self->check_size; 1104
1105 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
734 }; 1107 };
735 1108
736 } elsif ($x >= 0 && $x < $self->{w} 1109 } elsif ($lr ^ $td) {
737 && $y >= 0 && $y < $border) {
738
739 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1110 my ($ox, $oy) = ($ev->{x}, $ev->{y});
740 my ($bx, $by) = ($self->{x}, $self->{y}); 1111 my ($bx, $by) = ($self->{x}, $self->{y});
741 1112
742 $self->{motion} = sub { 1113 $self->{motion} = sub {
743 my ($ev, $x, $y) = @_; 1114 my ($ev, $x, $y) = @_;
744 1115
745 ($x, $y) = ($ev->{x}, $ev->{y}); 1116 ($x, $y) = ($ev->{x}, $ev->{y});
746 1117
747 $self->move ($bx + $x - $ox, $by + $y - $oy); 1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
748 $self->update;
749 }; 1119 };
750 } 1120 }
751} 1121}
752 1122
753sub button_up { 1123sub button_up {
… …
766 my ($self) = @_; 1136 my ($self) = @_;
767 1137
768 my ($w, $h ) = ($self->{w}, $self->{h}); 1138 my ($w, $h ) = ($self->{w}, $self->{h});
769 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
770 1140
771 glEnable GL_BLEND;
772 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
773 glEnable GL_TEXTURE_2D; 1141 glEnable GL_TEXTURE_2D;
774 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
775 1143
776 my $border = $self->border; 1144 my $border = $self->border;
777 1145
778 glColor @{ $self->{border_bg} }; 1146 glColor @{ $self->{border_bg} };
779 $tex[1]->draw_quad (0, 0, $w, $border); 1147 $border[0]->draw_quad_alpha (0, 0, $w, $border);
780 $tex[3]->draw_quad (0, $border, $border, $ch); 1148 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
781 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1149 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
782 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1150 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
783 1151
784 my $bg = $tex[0]; 1152 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1153 glColor @{ $self->{bg} };
785 1154
786 # TODO: repeat texture not scale 1155 # TODO: repeat texture not scale
787 my $rep_x = $cw / $bg->{w}; 1156 # solve this better(?)
788 my $rep_y = $ch / $bg->{h}; 1157 $bg->{s} = $cw / $bg->{w};
789 1158 $bg->{t} = $ch / $bg->{h};
790 glColor @{ $self->{bg} };
791
792 $bg->{s} = $rep_x;
793 $bg->{t} = $rep_y;
794 $bg->{wrap_mode} = 1;
795 $bg->draw_quad ($border, $border, $cw, $ch); 1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 }
796 1161
797 glDisable GL_TEXTURE_2D; 1162 glDisable GL_TEXTURE_2D;
798 glDisable GL_BLEND;
799 1163
800 $self->{title}->draw if $self->{title}; 1164 $self->{title}->draw if $self->{title};
1165
801 $self->child->draw; 1166 $self->child->draw;
802} 1167}
803 1168
804############################################################################# 1169#############################################################################
805 1170
… …
814sub new { 1179sub new {
815 my $class = shift; 1180 my $class = shift;
816 1181
817 $class->SUPER::new ( 1182 $class->SUPER::new (
818 col_expand => [], 1183 col_expand => [],
819 @_ 1184 @_,
820 ) 1185 )
1186}
1187
1188sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} }
821} 1190}
822 1191
823sub add { 1192sub add {
824 my ($self, $x, $y, $child) = @_; 1193 my ($self, $x, $y, $child) = @_;
825 1194
826 $child->set_parent ($self); 1195 $child->set_parent ($self);
827 $self->{children}[$y][$x] = $child; 1196 $self->{children}[$y][$x] = $child;
828 1197
829 $child->check_size; 1198 $self->realloc;
830} 1199}
831 1200
832# TODO: move to container class maybe? send childs a signal on removal? 1201# TODO: move to container class maybe? send children a signal on removal?
833sub clear { 1202sub clear {
834 my ($self) = @_; 1203 my ($self) = @_;
835 1204
1205 my @children = $self->children;
836 delete $self->{children}; 1206 delete $self->{children};
837 $self->update; 1207
1208 for (@children) {
1209 delete $_->{parent};
1210 $_->hide;
1211 }
1212
1213 $self->realloc;
838} 1214}
839 1215
840sub get_wh { 1216sub get_wh {
841 my ($self) = @_; 1217 my ($self) = @_;
842 1218
… …
869 (sum @$hs), 1245 (sum @$hs),
870 ) 1246 )
871} 1247}
872 1248
873sub size_allocate { 1249sub size_allocate {
874 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h, $changed) = @_;
875 1251
876 my ($ws, $hs) = $self->get_wh; 1252 my ($ws, $hs) = $self->get_wh;
877 1253
878 my $req_w = sum @$ws; 1254 my $req_w = (sum @$ws) || 1;
879 my $req_h = sum @$hs; 1255 my $req_h = (sum @$hs) || 1;
880 1256
881 # TODO: nicer code && do row_expand 1257 # TODO: nicer code && do row_expand
882 my @col_expand = @{$self->{col_expand}}; 1258 my @col_expand = @{$self->{col_expand}};
883 @col_expand = (1) x @$ws unless @col_expand; 1259 @col_expand = (1) x @$ws unless @col_expand;
884 my $col_expand = (sum @col_expand) || 1; 1260 my $col_expand = (sum @col_expand) || 1;
… …
938 } 1314 }
939} 1315}
940 1316
941############################################################################# 1317#############################################################################
942 1318
1319package CFClient::UI::Box;
1320
1321our @ISA = CFClient::UI::Container::;
1322
1323sub size_request {
1324 my ($self) = @_;
1325
1326 $self->{vertical}
1327 ? (
1328 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1330 )
1331 : (
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 )
1335}
1336
1337sub size_allocate {
1338 my ($self, $w, $h, $changed) = @_;
1339
1340 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children};
1342
1343 my @req;
1344
1345 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children;
1347 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1349 my $req = List::Util::sum @req;
1350
1351 if ($req > $space) {
1352 # ah well, not enough space
1353 $_ *= $space / $req for @req;
1354 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1356
1357 $space = ($space - $req) / $expand; # remaining space to give away
1358
1359 $req[$_] += $space * $children->[$_]{expand}
1360 for 0 .. $#$children;
1361 }
1362 }
1363
1364 CFClient::UI::harmonize \@req;
1365
1366 my $pos = 0;
1367 for (0 .. $#$children) {
1368 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370
1371 $pos += $alloc;
1372 }
1373
1374 1
1375}
1376
1377#############################################################################
1378
943package CFClient::UI::HBox; 1379package CFClient::UI::HBox;
944 1380
945# TODO: wrap into common Box base class
946
947our @ISA = CFClient::UI::Container::; 1381our @ISA = CFClient::UI::Box::;
948 1382
949sub size_request { 1383sub new {
950 my ($self) = @_; 1384 my $class = shift;
951 1385
952 my @alloc = map [$_->size_request], @{$self->{children}}; 1386 $class->SUPER::new (
953 1387 vertical => 0,
954 ( 1388 @_,
955 (List::Util::sum map $_->[0], @alloc),
956 (List::Util::max map $_->[1], @alloc),
957 ) 1389 )
958} 1390}
959 1391
960sub size_allocate {
961 my ($self, $w, $h) = @_;
962
963 ($h, $w) = ($w, $h);
964
965 my $children = $self->{children};
966
967 my @h = map $_->{req_w}, @$children;
968
969 my $req_h = List::Util::sum @h;
970
971 if ($req_h > $h) {
972 # ah well, not enough space
973 $_ *= $h / $req_h for @h;
974 } else {
975 my $exp = List::Util::sum map $_->{expand}, @$children;
976 $exp ||= 1;
977
978 for (0 .. $#$children) {
979 my $child = $children->[$_];
980
981 my $alloc_h = $h[$_];
982 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
983 $h[$_] = $alloc_h;
984 }
985 }
986
987 CFClient::UI::harmonize \@h;
988
989 my $y = 0;
990 for (0 .. $#$children) {
991 my $child = $children->[$_];
992 my $h = $h[$_];
993 $child->configure ($y, 0, $h, $w);
994
995 $y += $h;
996 }
997
998 1
999}
1000
1001############################################################################# 1392#############################################################################
1002 1393
1003package CFClient::UI::VBox; 1394package CFClient::UI::VBox;
1004 1395
1005# TODO: wrap into common Box base class
1006
1007our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Box::;
1008 1397
1009sub size_request { 1398sub new {
1010 my ($self) = @_; 1399 my $class = shift;
1011 1400
1012 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $class->SUPER::new (
1013 1402 vertical => 1,
1014 ( 1403 @_,
1015 (List::Util::max map $_->[0], @alloc),
1016 (List::Util::sum map $_->[1], @alloc),
1017 ) 1404 )
1018} 1405}
1019 1406
1020sub size_allocate {
1021 my ($self, $w, $h) = @_;
1022
1023 my $children = $self->{children};
1024
1025 my @h = map $_->{req_h}, @$children;
1026
1027 my $req_h = List::Util::sum @h;
1028
1029 if ($req_h > $h) {
1030 # ah well, not enough space
1031 $_ *= $h / $req_h for @h;
1032 } else {
1033 my $exp = List::Util::sum map $_->{expand}, @$children;
1034 $exp ||= 1;
1035
1036 for (0 .. $#$children) {
1037 my $child = $children->[$_];
1038
1039 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1040 }
1041 }
1042
1043 CFClient::UI::harmonize \@h;
1044
1045 my $y = 0;
1046 for (0 .. $#$children) {
1047 my $child = $children->[$_];
1048 my $h = $h[$_];
1049 $child->configure (0, $y, $w, $h);
1050
1051 $y += $h;
1052 }
1053
1054 1
1055}
1056
1057############################################################################# 1407#############################################################################
1058 1408
1059package CFClient::UI::Label; 1409package CFClient::UI::Label;
1060 1410
1061our @ISA = CFClient::UI::Base::; 1411our @ISA = CFClient::UI::DrawBG::;
1062 1412
1063use CFClient::OpenGL; 1413use CFClient::OpenGL;
1064 1414
1065sub new { 1415sub new {
1066 my ($class, %arg) = @_; 1416 my ($class, %arg) = @_;
1067 1417
1068 my $self = $class->SUPER::new ( 1418 my $self = $class->SUPER::new (
1069 fg => [1, 1, 1], 1419 fg => [1, 1, 1],
1420 #bg => none
1421 #active_bg => none
1422 #font => default_font
1423 #text => initial text
1424 #markup => initial narkup
1425 #max_w => maximum pixel width
1426 ellipsise => 3, # end
1427 layout => (new CFClient::Layout),
1070 fontsize => 1, 1428 fontsize => 1,
1071 text => "",
1072 align => -1, 1429 align => -1,
1073 valign => -1, 1430 valign => -1,
1074 padding => 2, 1431 padding_x => 2,
1075 layout => new CFClient::Layout, 1432 padding_y => 2,
1076 can_events => 0, 1433 can_events => 0,
1077 %arg 1434 %arg
1078 ); 1435 );
1079 1436
1080 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
1081 my $layout = new CFClient::Layout; 1438 my $layout = new CFClient::Layout;
1082 $layout->set_text (delete $self->{template}); 1439 $layout->set_text (delete $self->{template});
1083 $self->{template} = $layout; 1440 $self->{template} = $layout;
1084 } 1441 }
1085 1442
1086 $self->set_text (delete $self->{text}) if exists $self->{text}; 1443 if (exists $self->{markup}) {
1087 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1444 $self->set_markup (delete $self->{markup});
1445 } else {
1446 $self->set_text (delete $self->{text});
1447 }
1088 1448
1089 $self 1449 $self
1090} 1450}
1091 1451
1092sub escape_text { 1452sub escape($) {
1093 local $_ = $_[1]; 1453 local $_ = $_[0];
1094 1454
1095 s/&/&amp;/g; 1455 s/&/&amp;/g;
1096 s/>/&gt;/g; 1456 s/>/&gt;/g;
1097 s/</&lt;/g; 1457 s/</&lt;/g;
1098 1458
1099 $_[1] 1459 $_
1460}
1461
1462sub update {
1463 my ($self) = @_;
1464
1465 delete $self->{texture};
1466 $self->SUPER::update;
1100} 1467}
1101 1468
1102sub set_text { 1469sub set_text {
1103 my ($self, $text) = @_; 1470 my ($self, $text) = @_;
1104 1471
1472 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text";
1474
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1105 $self->{layout}->set_text ($text); 1476 $self->{layout}->set_text ($text);
1106 1477
1107 delete $self->{texture}; 1478 $self->realloc;
1108 $self->check_size;
1109 $self->update; 1479 $self->update;
1110} 1480}
1111 1481
1112sub set_markup { 1482sub set_markup {
1113 my ($self, $markup) = @_; 1483 my ($self, $markup) = @_;
1114 1484
1485 return if $self->{text} eq "M$markup";
1486 $self->{text} = "M$markup";
1487
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1115 $self->{layout}->set_markup ($markup); 1491 $self->{layout}->set_markup ($markup);
1116 1492
1117 delete $self->{texture}; 1493 $self->realloc;
1118 $self->check_size;
1119 $self->update; 1494 $self->update;
1120} 1495}
1121 1496
1122sub size_request { 1497sub size_request {
1123 my ($self) = @_; 1498 my ($self) = @_;
1124 1499
1125 $self->{layout}->set_width; 1500 $self->{layout}->set_font ($self->{font}) if $self->{font};
1501 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1126 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1127 1505
1128 my ($w, $h) = $self->{layout}->size; 1506 my ($w, $h) = $self->{layout}->size;
1129 1507
1130 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
1509 $self->{template}->set_font ($self->{font}) if $self->{font};
1131 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1510 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1132 1511
1133 my ($w2, $h2) = $self->{template}->size; 1512 my ($w2, $h2) = $self->{template}->size;
1134 1513
1135 $w = List::Util::max $w, $w2; 1514 $w = List::Util::max $w, $w2;
1136 $h = List::Util::max $h, $h2; 1515 $h = List::Util::max $h, $h2;
1137 } 1516 }
1138 1517
1139 ( 1518 ($w, $h)
1140 $w + $self->{padding} * 2,
1141 $h + $self->{padding} * 2,
1142 )
1143} 1519}
1144 1520
1145sub size_allocate { 1521sub size_allocate {
1146 my ($self, $w, $h) = @_; 1522 my ($self, $w, $h, $changed) = @_;
1147 1523
1148 delete $self->{texture}; 1524 delete $self->{texture}
1525 if $changed;
1149} 1526}
1150 1527
1151sub set_fontsize { 1528sub set_fontsize {
1152 my ($self, $fontsize) = @_; 1529 my ($self, $fontsize) = @_;
1153 1530
1154 $self->{fontsize} = $fontsize; 1531 $self->{fontsize} = $fontsize;
1155 $self->check_size; 1532 delete $self->{texture};
1533
1534 $self->realloc;
1156} 1535}
1157 1536
1158sub _draw { 1537sub _draw {
1159 my ($self) = @_; 1538 my ($self) = @_;
1160 1539
1540 $self->SUPER::_draw; # draw background, if applicable
1541
1161 my $tex = $self->{texture} ||= do { 1542 my $tex = $self->{texture} ||= do {
1543 $self->{layout}->set_foreground (@{$self->{fg}});
1544 $self->{layout}->set_font ($self->{font}) if $self->{font};
1162 $self->{layout}->set_width ($self->{w}); 1545 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1163 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549
1164 new_from_layout CFClient::Texture $self->{layout} 1550 my $tex = new_from_layout CFClient::Texture $self->{layout};
1551
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5);
1555
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1165 }; 1561 };
1166 1562
1167 glEnable GL_BLEND;
1168 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1169 glEnable GL_TEXTURE_2D; 1563 glEnable GL_TEXTURE_2D;
1170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1171 1565
1566 if ($tex->{format} == GL_ALPHA) {
1172 glColor @{$self->{fg}}; 1567 glColor @{$self->{fg}};
1173
1174 $self->{ox} = int (
1175 $self->{align} < 0 ? $self->{padding}
1176 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1177 : ($self->{w} - $tex->{w}) * 0.5
1178 );
1179
1180 $self->{oy} = int (
1181 $self->{valign} < 0 ? $self->{padding}
1182 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1183 : ($self->{h} - $tex->{h}) * 0.5
1184 );
1185
1186 $tex->draw_quad ($self->{ox}, $self->{oy}); 1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569 } else {
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571 }
1187 1572
1188 glDisable GL_TEXTURE_2D; 1573 glDisable GL_TEXTURE_2D;
1189 glDisable GL_BLEND;
1190} 1574}
1191 1575
1192############################################################################# 1576#############################################################################
1193 1577
1194package CFClient::UI::EntryBase; 1578package CFClient::UI::EntryBase;
… …
1199 1583
1200sub new { 1584sub new {
1201 my $class = shift; 1585 my $class = shift;
1202 1586
1203 $class->SUPER::new ( 1587 $class->SUPER::new (
1204 fg => [1, 1, 1], 1588 fg => [1, 1, 1],
1205 bg => [0, 0, 0, 0.2], 1589 bg => [0, 0, 0, 0.2],
1206 active_bg => [1, 1, 1, 0.5], 1590 active_bg => [1, 1, 1, 0.5],
1207 active_fg => [0, 0, 0], 1591 active_fg => [0, 0, 0],
1208 can_hover => 1, 1592 can_hover => 1,
1209 can_focus => 1, 1593 can_focus => 1,
1210 valign => 0, 1594 valign => 0,
1211 can_events => 1, 1595 can_events => 1,
1596 #text => ...
1212 @_ 1597 @_
1213 ) 1598 )
1214} 1599}
1215 1600
1216sub _set_text { 1601sub _set_text {
… …
1226 $self->{text} = $text; 1611 $self->{text} = $text;
1227 1612
1228 $text =~ s/./*/g if $self->{hidden}; 1613 $text =~ s/./*/g if $self->{hidden};
1229 $self->{layout}->set_text ("$text "); 1614 $self->{layout}->set_text ("$text ");
1230 1615
1231 $self->emit (changed => $self->{text}); 1616 $self->_emit (changed => $self->{text});
1617}
1618
1619sub set_text {
1620 my ($self, $text) = @_;
1621
1622 $self->{cursor} = length $text;
1623 $self->_set_text ($text);
1624
1625 $self->realloc;
1232} 1626}
1233 1627
1234sub get_text { 1628sub get_text {
1235 $_[0]{text} 1629 $_[0]{text}
1236} 1630}
… …
1239 my ($self) = @_; 1633 my ($self) = @_;
1240 1634
1241 my ($w, $h) = $self->SUPER::size_request; 1635 my ($w, $h) = $self->SUPER::size_request;
1242 1636
1243 ($w + 1, $h) # add 1 for cursor 1637 ($w + 1, $h) # add 1 for cursor
1244}
1245
1246sub size_allocate {
1247 my ($self, $w, $h) = @_;
1248
1249 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1250}
1251
1252sub set_text {
1253 my ($self, $text) = @_;
1254
1255 $self->{cursor} = length $text;
1256 $self->_set_text ($text);
1257 $self->update;
1258} 1638}
1259 1639
1260sub key_down { 1640sub key_down {
1261 my ($self, $ev) = @_; 1641 my ($self, $ev) = @_;
1262 1642
… …
1264 my $sym = $ev->{sym}; 1644 my $sym = $ev->{sym};
1265 my $uni = $ev->{unicode}; 1645 my $uni = $ev->{unicode};
1266 1646
1267 my $text = $self->get_text; 1647 my $text = $self->get_text;
1268 1648
1269 if ($sym == 8) { 1649 if ($uni == 8) {
1270 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1650 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1271 } elsif ($sym == 127) { 1651 } elsif ($uni == 127) {
1272 substr $text, $self->{cursor}, 1, ""; 1652 substr $text, $self->{cursor}, 1, "";
1273 } elsif ($sym == CFClient::SDLK_LEFT) { 1653 } elsif ($sym == CFClient::SDLK_LEFT) {
1274 --$self->{cursor} if $self->{cursor}; 1654 --$self->{cursor} if $self->{cursor};
1275 } elsif ($sym == CFClient::SDLK_RIGHT) { 1655 } elsif ($sym == CFClient::SDLK_RIGHT) {
1276 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1656 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1277 } elsif ($sym == CFClient::SDLK_HOME) { 1657 } elsif ($sym == CFClient::SDLK_HOME) {
1278 $self->{cursor} = 0; 1658 $self->{cursor} = 0;
1279 } elsif ($sym == CFClient::SDLK_END) { 1659 } elsif ($sym == CFClient::SDLK_END) {
1280 $self->{cursor} = length $text; 1660 $self->{cursor} = length $text;
1281 } elsif ($sym == 27) { 1661 } elsif ($uni == 27) {
1282 $self->emit ('escape'); 1662 $self->_emit ('escape');
1283 } elsif ($uni) { 1663 } elsif ($uni) {
1284 substr $text, $self->{cursor}++, 0, chr $uni; 1664 substr $text, $self->{cursor}++, 0, chr $uni;
1285 } 1665 }
1286 1666
1287 $self->_set_text ($text); 1667 $self->_set_text ($text);
1288 $self->update; 1668
1669 $self->realloc;
1289} 1670}
1290 1671
1291sub focus_in { 1672sub focus_in {
1292 my ($self) = @_; 1673 my ($self) = @_;
1293 1674
… …
1369 my ($self, $ev) = @_; 1750 my ($self, $ev) = @_;
1370 1751
1371 my $sym = $ev->{sym}; 1752 my $sym = $ev->{sym};
1372 1753
1373 if ($sym == 13) { 1754 if ($sym == 13) {
1755 unshift @{$self->{history}},
1756 my $txt = $self->get_text;
1757 $self->{history_pointer} = -1;
1758 $self->{history_saveback} = '';
1374 $self->emit (activate => $self->get_text); 1759 $self->_emit (activate => $txt);
1375 $self->update; 1760 $self->update;
1761
1762 } elsif ($sym == CFClient::SDLK_UP) {
1763 if ($self->{history_pointer} < 0) {
1764 $self->{history_saveback} = $self->get_text;
1765 }
1766 if (@{$self->{history} || []} > 0) {
1767 $self->{history_pointer}++;
1768 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1769 $self->{history_pointer} = @{$self->{history} || []} - 1;
1770 }
1771 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1772 }
1773
1774 } elsif ($sym == CFClient::SDLK_DOWN) {
1775 $self->{history_pointer}--;
1776 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1777
1778 if ($self->{history_pointer} >= 0) {
1779 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1780 } else {
1781 $self->set_text ($self->{history_saveback});
1782 }
1376 1783
1377 } else { 1784 } else {
1378 $self->SUPER::key_down ($ev); 1785 $self->SUPER::key_down ($ev);
1379 } 1786 }
1380 1787
… …
1394 1801
1395sub new { 1802sub new {
1396 my $class = shift; 1803 my $class = shift;
1397 1804
1398 $class->SUPER::new ( 1805 $class->SUPER::new (
1399 padding => 4, 1806 padding_x => 4,
1807 padding_y => 4,
1400 fg => [1, 1, 1], 1808 fg => [1, 1, 1],
1401 bg => [1, 1, 1, 0.2],
1402 active_fg => [0, 0, 1], 1809 active_fg => [0, 0, 1],
1403 can_hover => 1, 1810 can_hover => 1,
1404 align => 0, 1811 align => 0,
1405 valign => 0, 1812 valign => 0,
1406 can_events => 1, 1813 can_events => 1,
1407 @_ 1814 @_
1408 ) 1815 )
1409} 1816}
1410 1817
1818sub activate { }
1819
1411sub button_up { 1820sub button_up {
1412 my ($self, $ev, $x, $y) = @_; 1821 my ($self, $ev, $x, $y) = @_;
1413 1822
1823 $self->emit ("activate")
1414 if ($x >= 0 && $x < $self->{w} 1824 if $x >= 0 && $x < $self->{w}
1415 && $y >= 0 && $y < $self->{h}) { 1825 && $y >= 0 && $y < $self->{h};
1416 $self->emit ("activate");
1417 }
1418} 1826}
1419 1827
1420sub _draw { 1828sub _draw {
1421 my ($self) = @_; 1829 my ($self) = @_;
1422 1830
… …
1424 1832
1425 if ($GRAB == $self) { 1833 if ($GRAB == $self) {
1426 $self->{fg} = $self->{active_fg}; 1834 $self->{fg} = $self->{active_fg};
1427 } 1835 }
1428 1836
1429 glEnable GL_BLEND;
1430 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1431 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1433 glColor 0, 0, 0, 1; 1839 glColor 0, 0, 0, 1;
1434 1840
1435 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1436 1842
1437 glDisable GL_TEXTURE_2D; 1843 glDisable GL_TEXTURE_2D;
1438 glDisable GL_BLEND;
1439 1844
1440 $self->SUPER::_draw; 1845 $self->SUPER::_draw;
1441} 1846}
1442 1847
1443############################################################################# 1848#############################################################################
… …
1454 1859
1455sub new { 1860sub new {
1456 my $class = shift; 1861 my $class = shift;
1457 1862
1458 $class->SUPER::new ( 1863 $class->SUPER::new (
1459 padding => 2, 1864 padding_x => 2,
1865 padding_y => 2,
1460 fg => [1, 1, 1], 1866 fg => [1, 1, 1],
1461 active_fg => [1, 1, 0], 1867 active_fg => [1, 1, 0],
1868 bg => [0, 0, 0, 0.2],
1869 active_bg => [1, 1, 1, 0.5],
1462 state => 0, 1870 state => 0,
1463 can_hover => 1, 1871 can_hover => 1,
1464 @_ 1872 @_
1465 ) 1873 )
1466} 1874}
1467 1875
1468sub size_request { 1876sub size_request {
1469 my ($self) = @_; 1877 my ($self) = @_;
1470 1878
1471 ($self->{padding} * 2 + 6) x 2 1879 (6) x 2
1472} 1880}
1473 1881
1474sub button_down { 1882sub button_down {
1475 my ($self, $ev, $x, $y) = @_; 1883 my ($self, $ev, $x, $y) = @_;
1476 1884
1477 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1478 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1479 $self->{state} = !$self->{state}; 1887 $self->{state} = !$self->{state};
1480 $self->emit (changed => $self->{state}); 1888 $self->_emit (changed => $self->{state});
1481 } 1889 }
1482} 1890}
1483 1891
1484sub _draw { 1892sub _draw {
1485 my ($self) = @_; 1893 my ($self) = @_;
1486 1894
1487 $self->SUPER::_draw; 1895 $self->SUPER::_draw;
1488 1896
1489 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1897 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1490 1898
1491 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1899 my ($w, $h) = @$self{qw(w h)};
1900
1901 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1492 1902
1493 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1903 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1494 1904
1495 glEnable GL_BLEND; 1905 my $tex = $self->{state} ? $tex[1] : $tex[0];
1906
1496 glEnable GL_TEXTURE_2D; 1907 glEnable GL_TEXTURE_2D;
1497 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1498
1499 my $tex = $self->{state} ? $tex[1] : $tex[0];
1500
1501 $tex->draw_quad (0, 0, $s, $s); 1908 $tex->draw_quad_alpha (0, 0, $s, $s);
1502
1503 glDisable GL_TEXTURE_2D; 1909 glDisable GL_TEXTURE_2D;
1504 glDisable GL_BLEND;
1505} 1910}
1506 1911
1507############################################################################# 1912#############################################################################
1508 1913
1509package CFClient::UI::Image; 1914package CFClient::UI::Image;
… …
1552 glTranslate 0, -$self->{w}, 0; 1957 glTranslate 0, -$self->{w}, 0;
1553 1958
1554 ($w, $h) = ($h, $w); 1959 ($w, $h) = ($h, $w);
1555 } 1960 }
1556 1961
1557 glEnable GL_BLEND;
1558 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1559 glEnable GL_TEXTURE_2D; 1962 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561 1964
1562 $tex->draw_quad (0, 0, $w, $h); 1965 $tex->draw_quad_alpha (0, 0, $w, $h);
1563 1966
1564 glDisable GL_BLEND;
1565 glDisable GL_TEXTURE_2D; 1967 glDisable GL_TEXTURE_2D;
1566} 1968}
1567 1969
1568############################################################################# 1970#############################################################################
1569 1971
1570package CFClient::UI::VGauge; 1972package CFClient::UI::VGauge;
1571 1973
1572our @ISA = CFClient::UI::Base::; 1974our @ISA = CFClient::UI::Base::;
1975
1976use List::Util qw(min max);
1573 1977
1574use CFClient::OpenGL; 1978use CFClient::OpenGL;
1575 1979
1576my %tex = ( 1980my %tex = (
1577 food => [ 1981 food => [
1578 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1982 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1579 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1983 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1580 ], 1984 ],
1581 grace => [ 1985 grace => [
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1986 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1583 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1987 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1584 ], 1988 ],
1585 hp => [ 1989 hp => [
1586 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1587 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1991 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1588 ], 1992 ],
1589 mana => [ 1993 mana => [
1590 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1994 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1591 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1995 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1592 ], 1996 ],
1593); 1997);
1594 1998
1595# eg. VGauge->new (gauge => 'food'), default gauge: food 1999# eg. VGauge->new (gauge => 'food'), default gauge: food
1596sub new { 2000sub new {
… …
1615} 2019}
1616 2020
1617sub set_max { 2021sub set_max {
1618 my ($self, $max) = @_; 2022 my ($self, $max) = @_;
1619 2023
2024 return if $self->{max_val} == $max;
2025
1620 $self->{max_val} = $max; 2026 $self->{max_val} = $max;
2027 $self->update;
1621} 2028}
1622 2029
1623sub set_value { 2030sub set_value {
1624 my ($self, $val, $max) = @_; 2031 my ($self, $val, $max) = @_;
1625 2032
1626 $self->set_max ($max) 2033 $self->set_max ($max)
1627 if defined $max; 2034 if defined $max;
1628 2035
1629 $max = $self->{max_val}; 2036 return if $self->{val} == $val;
2037
1630 $self->{val} = $val; 2038 $self->{val} = $val;
1631
1632 $self->update; 2039 $self->update;
1633} 2040}
1634 2041
1635sub _draw { 2042sub _draw {
1636 my ($self) = @_; 2043 my ($self) = @_;
1637 2044
1638 my $tex = $tex{$self->{type}}; 2045 my $tex = $tex{$self->{type}};
2046 my ($t1, $t2, $t3) = @$tex;
1639 2047
1640 my ($w, $h) = ($self->{w}, $self->{h}); 2048 my ($w, $h) = ($self->{w}, $self->{h});
1641 2049
1642 if ($self->{vertical}) { 2050 if ($self->{vertical}) {
1643 glRotate 90, 0, 0, 1; 2051 glRotate 90, 0, 0, 1;
… …
1645 2053
1646 ($w, $h) = ($h, $w); 2054 ($w, $h) = ($h, $w);
1647 } 2055 }
1648 2056
1649 my $ycut = $self->{val} / ($self->{max_val} || 1); 2057 my $ycut = $self->{val} / ($self->{max_val} || 1);
1650 $ycut = 1 if $self->{val} > $self->{max_val};
1651 2058
1652 my $t1 = $tex->[0]; 2059 my $ycut1 = max 0, min 1, $ycut;
1653 my $t2 = $tex->[1]; 2060 my $ycut2 = max 0, min 1, $ycut - 1;
2061
2062 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2);
1654 2064
1655 glEnable GL_BLEND; 2065 glEnable GL_BLEND;
1656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1657 glEnable GL_TEXTURE_2D; 2067 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 2069
1660 my $h1 = $self->{h} - $ycut * $self->{h};
1661 my $h2 = $ycut * $self->{h};
1662
1663 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2070 glBindTexture GL_TEXTURE_2D, $t1->{name};
1664 glBegin GL_QUADS; 2071 glBegin GL_QUADS;
1665 glTexCoord 0 , 0; glVertex 0 , 0; 2072 glTexCoord 0 , 0; glVertex 0 , 0;
1666 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2073 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1667 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2074 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1668 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2075 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1669 glEnd; 2076 glEnd;
1670 2077
2078 my $ycut1 = List::Util::min 1, $ycut;
1671 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2079 glBindTexture GL_TEXTURE_2D, $t2->{name};
1672 glBegin GL_QUADS; 2080 glBegin GL_QUADS;
1673 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2081 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1674 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2082 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1675 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2083 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1676 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2084 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1677 glEnd; 2085 glEnd;
2086
2087 if ($t3) {
2088 glBindTexture GL_TEXTURE_2D, $t3->{name};
2089 glBegin GL_QUADS;
2090 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2091 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2092 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2093 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2094 glEnd;
2095 }
1678 2096
1679 glDisable GL_BLEND; 2097 glDisable GL_BLEND;
1680 glDisable GL_TEXTURE_2D; 2098 glDisable GL_TEXTURE_2D;
1681} 2099}
1682 2100
… …
1685package CFClient::UI::Gauge; 2103package CFClient::UI::Gauge;
1686 2104
1687our @ISA = CFClient::UI::VBox::; 2105our @ISA = CFClient::UI::VBox::;
1688 2106
1689sub new { 2107sub new {
1690 my ($class, %arg) = shift; 2108 my ($class, %arg) = @_;
1691 2109
1692 my $self = $class->SUPER::new ( 2110 my $self = $class->SUPER::new (
1693 @_, 2111 tooltip => $arg{type},
2112 can_hover => 1,
2113 can_events => 1,
2114 %arg,
1694 ); 2115 );
1695 2116
1696 $self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 2117 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
2118 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1697 $self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"; 2119 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1698 $self->add ($self->{value});
1699 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1);
1700 $self->add ($self->{max});
1701 2120
1702 $self 2121 $self
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707 (($self->{max}->size_request)[0], 0)
1708} 2122}
1709 2123
1710sub set_fontsize { 2124sub set_fontsize {
1711 my ($self, $fsize) = @_; 2125 my ($self, $fsize) = @_;
1712 2126
1713 $self->{value}->set_fontsize ($fsize); 2127 $self->{value}->set_fontsize ($fsize);
1714 $self->{max} ->set_fontsize ($fsize); 2128 $self->{max} ->set_fontsize ($fsize);
1715} 2129}
1716 2130
2131sub set_max {
2132 my ($self, $max) = @_;
2133
2134 $self->{gauge}->set_max ($max);
2135 $self->{max}->set_text ($max);
2136}
2137
1717sub set_value { 2138sub set_value {
1718 my ($self, $val, $max) = @_; 2139 my ($self, $val, $max) = @_;
1719 2140
1720 $self->set_max ($max) 2141 $self->set_max ($max)
1721 if defined $max; 2142 if defined $max;
1722 2143
1723 $self->{gauge}->set_value ($val, $max); 2144 $self->{gauge}->set_value ($val, $max);
1724 $self->{value}->set_text ($val); 2145 $self->{value}->set_text ($val);
1725}
1726
1727sub set_max {
1728 my ($self, $max) = @_;
1729
1730 $self->{gauge}->set_max ($max);
1731 $self->{max}->set_text ($max);
1732} 2146}
1733 2147
1734############################################################################# 2148#############################################################################
1735 2149
1736package CFClient::UI::Slider; 2150package CFClient::UI::Slider;
… …
1746 qw(s1_slider.png s1_slider_bg.png); 2160 qw(s1_slider.png s1_slider_bg.png);
1747 2161
1748sub new { 2162sub new {
1749 my $class = shift; 2163 my $class = shift;
1750 2164
1751 # range [value, low, high, page] 2165 # range [value, low, high, page, unit]
1752 2166
1753 # TODO: 0-width page 2167 # TODO: 0-width page
1754 # TODO: req_w/h are wrong with vertical 2168 # TODO: req_w/h are wrong with vertical
1755 # TODO: calculations are off 2169 # TODO: calculations are off
1756 my $self = $class->SUPER::new ( 2170 my $self = $class->SUPER::new (
1757 fg => [1, 1, 1], 2171 fg => [1, 1, 1],
1758 active_fg => [0, 0, 0], 2172 active_fg => [0, 0, 0],
2173 bg => [0, 0, 0, 0.2],
2174 active_bg => [1, 1, 1, 0.5],
1759 range => [0, 0, 100, 10], 2175 range => [0, 0, 100, 10, 0],
1760 req_w => 20, 2176 min_w => $::WIDTH / 80,
1761 req_h => 20, 2177 min_h => $::WIDTH / 80,
1762 vertical => 0, 2178 vertical => 0,
1763 can_hover => 1, 2179 can_hover => 1,
1764 inner_pad => 5, 2180 inner_pad => 0.02,
1765 @_ 2181 @_
1766 ); 2182 );
1767 2183
2184 $self->set_value ($self->{range}[0]);
2185 $self->update;
2186
1768 $self 2187 $self
1769} 2188}
1770 2189
2190sub changed { }
2191
2192sub set_range {
2193 my ($self, $range) = @_;
2194
2195 ($range, $self->{range}) = ($self->{range}, $range);
2196
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}";
2199}
2200
2201sub set_value {
2202 my ($self, $value) = @_;
2203
2204 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2205
2206 $hi = $lo + 1 if $hi <= $lo;
2207
2208 $page = $hi - $lo if $page > $hi - $lo;
2209
2210 $value = $lo if $value < $lo;
2211 $value = $hi - $page if $value > $hi - $page;
2212
2213 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2214 if $unit;
2215
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217
2218 if ($value != $old_value) {
2219 $self->_emit (changed => $value);
2220 $self->update;
2221 }
2222}
2223
1771sub size_request { 2224sub size_request {
1772 my ($self) = @_; 2225 my ($self) = @_;
1773 2226
1774 my $w = $self->{req_w}; 2227 ($self->{req_w}, $self->{req_h})
1775 my $h = $self->{req_h};
1776
1777 $self->{vertical} ? ($h, $w) : ($w, $h)
1778} 2228}
1779 2229
1780sub button_down { 2230sub button_down {
1781 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
1782 2232
1783 $self->SUPER::button_down ($ev, $x, $y); 2233 $self->SUPER::button_down ($ev, $x, $y);
2234
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236
1784 $self->mouse_motion ($ev, $x, $y); 2237 $self->mouse_motion ($ev, $x, $y);
1785} 2238}
1786 2239
1787sub mouse_motion { 2240sub mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
1789 2242
1790 if ($GRAB == $self) { 2243 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245
2246 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2251 }
2252}
2253
2254sub update {
2255 my ($self) = @_;
2256
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2258 $self->set_value ($self->{range}[0]);
2259
1791 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2260 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100;
1792 2262
1793 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2263 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1794 2264
1795 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2265 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1796 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2266 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1797 2267
1798 $x -= $inner_pad_px; # substract the padding 2268 $value = ($value - $lo) / $range;
1799 $x = $x * ($hi - $lo) / $inner_w + $lo; 2269 $value = $value * $self->{scale} + $self->{offset};
1800 $x = $lo if $x < $lo;
1801 $x = $hi - $page if $x > $hi - $page;
1802 $self->{range}[0] = $x;
1803 2270
1804 $self->emit (changed => $x); 2271 $self->{knob_x} = $value - $knob_w * 0.5;
1805 $self->update; 2272 $self->{knob_w} = $knob_w;
1806 } 2273 });
1807}
1808 2274
1809# the inner_* stuff is for generating a padding for the slider handle, 2275 $self->SUPER::update;
1810# so that the handle doesn't leave the texture. This calculation isn't 100%
1811# correct propably, but it does the job for now
1812sub _calc_inner_pad_px {
1813 my ($self, $w) = @_;
1814 ($w / 100) * $self->{inner_pad} # % to pixels
1815} 2276}
1816 2277
1817sub _draw { 2278sub _draw {
1818 my ($self) = @_; 2279 my ($self) = @_;
1819 2280
1820 $self->SUPER::_draw (); 2281 $self->SUPER::_draw ();
1821 2282
1822 my ($w, $h) = @$self{qw(w h)}; 2283 glScale $self->{w}, $self->{h};
1823 2284
1824 if ($self->{vertical}) { 2285 if ($self->{vertical}) {
1825 # draw a vertical slider like a rotated horizontal slider 2286 # draw a vertical slider like a rotated horizontal slider
1826 2287
2288 glTranslate 1, 0, 0;
1827 glRotate 90, 0, 0, 1; 2289 glRotate 90, 0, 0, 1;
1828 glTranslate 0, -$self->{w}, 0;
1829
1830 ($w, $h) = ($h, $w);
1831 } 2290 }
1832 2291
1833 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2292 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1834 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2293 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1835 2294
1836 my ($value, $lo, $hi, $page) = @{$self->{range}};
1837
1838 $hi = $value + 1 if $lo == $hi;
1839
1840 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1841 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1842
1843 $page = int $page * $inner_w / ($hi - $lo);
1844 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1845
1846 $w -= $page;
1847 $page &= ~1;
1848 glTranslate $page * 0.5, 0, 0;
1849 $page ||= 2;
1850
1851 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1852 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1853
1854 glEnable GL_BLEND;
1855 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1856 glEnable GL_TEXTURE_2D; 2295 glEnable GL_TEXTURE_2D;
1857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1858 2297
1859 # draw background 2298 # draw background
1860 $tex[1]->draw_quad (0, 0, $w, $h); 2299 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1861 2300
1862 # draw handle 2301 # draw handle
1863 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2302 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1864 2303
1865 glDisable GL_BLEND;
1866 glDisable GL_TEXTURE_2D; 2304 glDisable GL_TEXTURE_2D;
1867} 2305}
2306
2307#############################################################################
2308
2309package CFClient::UI::ValSlider;
2310
2311our @ISA = CFClient::UI::HBox::;
2312
2313sub new {
2314 my ($class, %arg) = @_;
2315
2316 my $range = delete $arg{range};
2317
2318 my $self = $class->SUPER::new (
2319 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2320 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2321 to_value => sub { shift },
2322 from_value => sub { shift },
2323 %arg,
2324 );
2325
2326 $self->{slider}->connect (changed => sub {
2327 my ($self, $value) = @_;
2328 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2329 $self->{parent}->emit (changed => $value);
2330 });
2331
2332# $self->{entry}->connect (changed => sub {
2333# my ($self, $value) = @_;
2334# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2335# $self->{parent}->emit (changed => $value);
2336# });
2337
2338 $self->add ($self->{slider}, $self->{entry});
2339
2340 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2341
2342 $self
2343}
2344
2345sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) }
1868 2347
1869############################################################################# 2348#############################################################################
1870 2349
1871package CFClient::UI::TextView; 2350package CFClient::UI::TextView;
1872 2351
… …
1876 2355
1877sub new { 2356sub new {
1878 my $class = shift; 2357 my $class = shift;
1879 2358
1880 my $self = $class->SUPER::new ( 2359 my $self = $class->SUPER::new (
1881 fontsize => 1, 2360 fontsize => 1,
2361 can_events => 0,
2362 #font => default_font
1882 @_, 2363 @_,
1883 2364
1884 layout => (new CFClient::Layout), 2365 layout => (new CFClient::Layout 1),
1885 par => [], 2366 par => [],
1886 height => 0, 2367 height => 0,
1887 children => [ 2368 children => [
1888 (new CFClient::UI::Empty expand => 1), 2369 (new CFClient::UI::Empty expand => 1),
1889 (new CFClient::UI::Slider vertical => 1), 2370 (new CFClient::UI::Slider vertical => 1),
1890 ], 2371 ],
1891 ); 2372 );
1892 2373
1893 $self->{children}[1]->connect (changed => sub { 2374 $self->{children}[1]->connect (changed => sub { $self->update });
1894 $self->update;
1895 });
1896 2375
1897 $self 2376 $self
1898} 2377}
1899 2378
1900sub set_fontsize { 2379sub set_fontsize {
… …
1902 2381
1903 $self->{fontsize} = $fontsize; 2382 $self->{fontsize} = $fontsize;
1904 $self->reflow; 2383 $self->reflow;
1905} 2384}
1906 2385
2386sub size_allocate {
2387 my ($self, $w, $h, $changed) = @_;
2388
2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2392
2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w});
2396
2397 $self->reflow;
2398}
2399
1907sub text_height { 2400sub text_size {
1908 my ($self, $text) = @_; 2401 my ($self, $text, $indent) = @_;
1909 2402
1910 my $layout = $self->{layout}; 2403 my $layout = $self->{layout};
1911 2404
1912 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1913 $layout->set_width ($self->{w}); 2406 $layout->set_width ($self->{children}[0]{w} - $indent);
1914 $layout->set_text ($text); 2407 $layout->set_markup ($text);
1915 2408
1916 ($layout->size)[1] 2409 $layout->size
1917} 2410}
1918 2411
1919sub reflow { 2412sub reflow {
1920 my ($self) = @_; 2413 my ($self) = @_;
1921 2414
1922 $self->{need_reflow}++; 2415 $self->{need_reflow}++;
1923 $self->update; 2416 $self->update;
1924} 2417}
1925 2418
1926sub size_allocate { 2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
1927 my ($self, $w, $h) = @_; 2427 my ($self) = @_;
1928 2428
1929 $self->SUPER::size_allocate ($w, $h); 2429 $self->{par} = [];
1930 2430 $self->{height} = 0;
1931 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1932 $self->{layout}->set_width ($self->{children}[0]{w});
1933
1934 $self->reflow;
1935} 2432}
1936 2433
1937sub add_paragraph { 2434sub add_paragraph {
1938 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
1939 2436
1940 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
1941 2438 my ($w, $h) = $self->text_size ($line);
1942 my $height = $self->text_height ($text);
1943
1944 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
1945 2442
1946 push @{$self->{par}}, [$height, $color, $text];
1947
1948 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1949 $self->{children}[1]->update;
1950} 2444}
1951 2445
1952sub update { 2446sub update {
1953 my ($self) = @_; 2447 my ($self) = @_;
1954 2448
… …
1956 2450
1957 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
1958 2452
1959 delete $self->{texture}; 2453 delete $self->{texture};
1960 2454
1961 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
1962 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
1963 my $height = 0; 2459 my $height = 0;
1964 2460
1965 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
1966 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
1967 2476
1968 $self->{height} = $height; 2477 $self->{height} = $height;
1969 2478
1970 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1971 2480
1972 delete $self->{texture}; 2481 delete $self->{texture};
1973 } 2482 }
1974 2483
1975 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1976 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
1977 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
1978 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
1979 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983
1984 my $top = int $self->{children}[1]{range}[0];
1985
1986 my $y0 = $top;
1987 my $y1 = $top + $self->{h};
1988
1989 my $y = 0;
1990
1991 my $layout = $self->{layout};
1992 2502
1993 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
1994 my $h = $par->[0]; 2504 my $h = $par->[1];
1995 2505
1996 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
1997 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
1998 2510
1999 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2000 my ($W, $H) = $layout->size; 2512
2001 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2002 } 2515 }
2003 2516
2004 $y += $h; 2517 $y += $h;
2005 } 2518 }
2006 2519
2007 glDisable GL_TEXTURE_2D;
2008 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
2009 }; 2521 };
2010 }); 2522 });
2011} 2523}
2012 2524
2013sub _draw { 2525sub _draw {
2014 my ($self) = @_; 2526 my ($self) = @_;
2015 2527
2016 if ($self->{texture}) {
2017 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
2018 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1;
2019 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2020 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
2021 }
2022 2533
2023 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
2024 2535
2025} 2536}
2026 2537
… …
2074 2585
2075sub new { 2586sub new {
2076 my $class = shift; 2587 my $class = shift;
2077 2588
2078 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2079 state => 0, 2590 state => 0,
2080 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2081 can_events => 1,
2082 @_ 2592 @_
2083 ); 2593 );
2084 2594
2085 if ($self->{state}) {
2086 $self->{state} = 0;
2087 $self->toggle_flopper;
2088 }
2089
2090 $self 2595 $self
2091} 2596}
2092 2597
2093sub toggle_flopper { 2598sub toggle_flopper {
2094 my ($self) = @_; 2599 my ($self) = @_;
2095 2600
2096 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2097 if ($self->{state} = !$self->{state}) { 2602}
2098 $CFClient::UI::ROOT->add ($self->{other}); 2603
2099 $self->{other}->move ($self->coord2global (0, $self->{h})); 2604#############################################################################
2605
2606package CFClient::UI::Tooltip;
2607
2608our @ISA = CFClient::UI::Bin::;
2609
2610use CFClient::OpenGL;
2611
2612sub new {
2613 my $class = shift;
2614
2615 $class->SUPER::new (
2616 @_,
2617 can_events => 0,
2618 )
2619}
2620
2621sub set_tooltip_from {
2622 my ($self, $widget) = @_;
2623
2624 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip},
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8,
2628 fg => [0, 0, 0, 1],
2629 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP),
2631 );
2632}
2633
2634sub size_request {
2635 my ($self) = @_;
2636
2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638
2639 ($w + 4, $h + 4)
2640}
2641
2642sub size_allocate {
2643 my ($self, $w, $h, $changed) = @_;
2644
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2648}
2649
2650sub visibility_change {
2651 my ($self, $visible) = @_;
2652
2653 return unless $visible;
2654
2655 $self->{root}->on_post_alloc ("move_$self" => sub {
2656 my $widget = $self->{owner}
2657 or return;
2658
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH;
2663
2664 $self->move_abs ($x, $y);
2665 });
2666}
2667
2668sub _draw {
2669 my ($self) = @_;
2670
2671 glTranslate 0.375, 0.375;
2672
2673 my ($w, $h) = @$self{qw(w h)};
2674
2675 glColor 1, 0.8, 0.4;
2676 glBegin GL_QUADS;
2677 glVertex 0 , 0;
2678 glVertex 0 , $h;
2679 glVertex $w, $h;
2680 glVertex $w, 0;
2681 glEnd;
2682
2683 glColor 0, 0, 0;
2684 glBegin GL_LINE_LOOP;
2685 glVertex 0 , 0;
2686 glVertex 0 , $h;
2687 glVertex $w, $h;
2688 glVertex $w, 0;
2689 glEnd;
2690
2691 glTranslate 2 - 0.375, 2 - 0.375;
2692
2693 $self->SUPER::_draw;
2694}
2695
2696#############################################################################
2697
2698package CFClient::UI::Face;
2699
2700our @ISA = CFClient::UI::Base::;
2701
2702use CFClient::OpenGL;
2703
2704sub new {
2705 my $class = shift;
2706
2707 my $self = $class->SUPER::new (
2708 aspect => 1,
2709 can_events => 0,
2710 @_,
2711 );
2712
2713 if ($self->{anim} && $self->{animspeed}) {
2714 Scalar::Util::weaken (my $widget = $self);
2715
2716 $self->{timer} = Event->timer (
2717 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2718 hard => 1,
2719 interval => $self->{animspeed},
2720 cb => sub {
2721 ++$widget->{frame};
2722 $widget->update;
2723 },
2724 );
2725 }
2726
2727 $self
2728}
2729
2730sub size_request {
2731 (32, 8)
2732}
2733
2734sub update {
2735 my ($self) = @_;
2736
2737 return unless $self->{visible};
2738
2739 $self->SUPER::update;
2740}
2741
2742sub _draw {
2743 my ($self) = @_;
2744
2745 return unless $::CONN;
2746
2747 my $face;
2748
2749 if ($self->{frame}) {
2750 my $anim = $::CONN->{anim}[$self->{anim}];
2751
2752 $face = $anim->[ $self->{frame} % @$anim ]
2753 if $anim && @$anim;
2754 }
2755
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757
2758 if ($tex) {
2759 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D;
2764 }
2765}
2766
2767sub DESTROY {
2768 my ($self) = @_;
2769
2770 $self->{timer}->cancel
2771 if $self->{timer};
2772
2773 $self->SUPER::DESTROY;
2774}
2775
2776#############################################################################
2777
2778package CFClient::UI::Inventory;
2779
2780our @ISA = CFClient::UI::ScrolledWindow::;
2781
2782sub new {
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2815 }
2816}
2817
2818#############################################################################
2819
2820package CFClient::UI::Menu;
2821
2822our @ISA = CFClient::UI::FancyFrame::;
2823
2824use CFClient::OpenGL;
2825
2826sub new {
2827 my $class = shift;
2828
2829 my $self = $class->SUPER::new (
2830 items => [],
2831 z => 100,
2832 @_,
2833 );
2834
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2836
2837 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item;
2839
2840 # handle various types of items, only text for now
2841 if (!ref $widget) {
2842 $widget = new CFClient::UI::Label
2843 can_hover => 1,
2844 can_events => 1,
2845 text => $widget;
2846 }
2847
2848 $self->{item}{$widget} = $item;
2849
2850 $self->{vbox}->add ($widget);
2851 }
2852
2853 $self
2854}
2855
2856# popup given the event (must be a mouse button down event currently)
2857sub popup {
2858 my ($self, $ev) = @_;
2859
2860 $self->_emit ("popdown");
2861
2862 # maybe save $GRAB? must be careful about events...
2863 $GRAB = $self;
2864 $self->{button} = $ev->{button};
2865
2866 $self->show;
2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868}
2869
2870sub mouse_motion {
2871 my ($self, $ev, $x, $y) = @_;
2872
2873 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER};
2876}
2877
2878sub button_up {
2879 my ($self, $ev, $x, $y) = @_;
2880
2881 if ($ev->{button} == $self->{button}) {
2882 undef $GRAB;
2883 $self->hide;
2884
2100 $self->emit ("open"); 2885 $self->_emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover};
2887 }
2888}
2889
2890#############################################################################
2891
2892package CFClient::UI::Statusbox;
2893
2894our @ISA = CFClient::UI::VBox::;
2895
2896sub new {
2897 my $class = shift;
2898
2899 $class->SUPER::new (
2900 fontsize => 0.8,
2901 @_,
2902 )
2903}
2904
2905sub reorder {
2906 my ($self) = @_;
2907 my $NOW = time;
2908
2909 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 }
2912
2913 my @widgets;
2914
2915 my @items = sort {
2916 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} };
2919
2920 my $count = 10 + 1;
2921 for my $item (@items) {
2922 last unless --$count;
2923
2924 push @widgets, $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text};
2929
2930 for ($short) {
2931 s/^\s+//;
2932 s/\s+/ /g;
2933 }
2934
2935 new CFClient::UI::Label
2936 markup => $short,
2937 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg},
2943 can_events => 1,
2944 can_hover => 1
2945 };
2946 }
2947
2948 $self->clear;
2949 $self->SUPER::add (reverse @widgets);
2950}
2951
2952sub add {
2953 my ($self, $text, %arg) = @_;
2954
2955 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//;
2957
2958 return unless $text;
2959
2960 my $timeout = time + ((delete $arg{timeout}) || 60);
2961
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963
2964 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) {
2966 $item->{count}++;
2967 } else {
2968 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text;
2970 }
2971 $item->{id} = ++$self->{id};
2972 $item->{timeout} = $timeout;
2973 delete $item->{label};
2101 } else { 2974 } else {
2102 $CFClient::UI::ROOT->remove ($self->{other}); 2975 $self->{item}{$group} = {
2103 $self->emit ("close"); 2976 id => ++$self->{id},
2977 text => $text,
2978 timeout => $timeout,
2979 tooltip => $text,
2980 fg => [0.8, 0.8, 0.8, 0.8],
2981 pri => 0,
2982 count => 1,
2983 %arg,
2984 };
2104 } 2985 }
2105 2986
2106 $self->emit (changed => $self->{state}); 2987 $self->reorder;
2988}
2989
2990sub reconfigure {
2991 my ($self) = @_;
2992
2993 delete $_->{label}
2994 for values %{ $self->{item} || {} };
2995
2996 $self->reorder;
2997 $self->SUPER::reconfigure;
2107} 2998}
2108 2999
2109############################################################################# 3000#############################################################################
2110 3001
2111package CFClient::UI::Root; 3002package CFClient::UI::Root;
2112 3003
2113our @ISA = CFClient::UI::Container::; 3004our @ISA = CFClient::UI::Container::;
2114 3005
2115use CFClient::OpenGL; 3006use CFClient::OpenGL;
2116 3007
2117sub check_size { 3008sub new {
2118 my ($self) = @_; 3009 my $class = shift;
2119 3010
2120 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3011 my $self = $class->SUPER::new (
2121} 3012 visible => 1,
3013 @_,
3014 );
2122 3015
2123sub size_request { 3016 Scalar::Util::weaken ($self->{root} = $self);
2124 ($::WIDTH, $::HEIGHT) 3017
3018 $self
2125} 3019}
2126 3020
2127sub configure { 3021sub configure {
2128 my ($self, $x, $y, $w, $h) = @_; 3022 my ($self, $x, $y, $w, $h) = @_;
2129 3023
2130 $self->SUPER::configure ($x, $y, $w, $h); 3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
2131 3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request {
3038 my ($self) = @_;
3039
3040 ($self->{w}, $self->{h})
3041}
3042
3043sub _to_pixel {
3044 my ($coord, $size, $max) = @_;
3045
3046 $coord =
3047 $coord eq "center" ? ($max - $size) * 0.5
3048 : $coord eq "max" ? $max
3049 : $coord;
3050
3051 $coord = 0 if $coord < 0;
3052 $coord = $max - $size if $coord > $max - $size;
3053
3054 int $coord + 0.5
3055}
3056
3057sub size_allocate {
3058 my ($self, $w, $h, $changed) = @_;
3059
2132 for my $child (@{$self->{children}}) { 3060 for my $child ($self->children) {
2133 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2134 3062
2135 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3063 $X = $child->{force_x} if exists $child->{force_x};
2136 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3064 $Y = $child->{force_y} if exists $child->{force_y};
3065
3066 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h};
3068
2137 $child->configure ($X, $Y, $W,$H); 3069 $child->configure ($X, $Y, $W, $H);
2138 } 3070 }
2139} 3071}
2140 3072
2141sub _topleft { 3073sub coord2local {
2142 my ($self, $x, $y) = @_; 3074 my ($self, $x, $y) = @_;
2143 3075
2144 ($x, $y) 3076 ($x, $y)
2145} 3077}
2146 3078
3079sub coord2global {
3080 my ($self, $x, $y) = @_;
3081
3082 ($x, $y)
3083}
3084
2147sub update { 3085sub update {
2148 my ($self) = @_; 3086 my ($self) = @_;
2149 3087
2150 $self->check_size; 3088 $::WANT_REFRESH++;
2151 ::refresh ();
2152} 3089}
2153 3090
2154sub add { 3091sub add {
2155 my ($self, $child) = @_; 3092 my ($self, @children) = @_;
2156 3093
2157 # integerize window positions 3094 $_->{is_toplevel} = 1
2158 $child->{x} = int $child->{x}; 3095 for @children;
2159 $child->{y} = int $child->{y};
2160 3096
2161 $self->SUPER::add ($child); 3097 $self->SUPER::add (@children);
3098}
3099
3100sub remove {
3101 my ($self, @children) = @_;
3102
3103 $self->SUPER::remove (@children);
3104
3105 delete $self->{is_toplevel}
3106 for @children;
3107
3108 while (@children) {
3109 my $w = pop @children;
3110 push @children, $w->children;
3111 $w->set_invisible;
3112 }
2162} 3113}
2163 3114
2164sub on_refresh { 3115sub on_refresh {
2165 my ($self, $id, $cb) = @_; 3116 my ($self, $id, $cb) = @_;
2166 3117
2167 $self->{refresh_hook}{$id} = $cb; 3118 $self->{refresh_hook}{$id} = $cb;
2168} 3119}
2169 3120
3121sub on_post_alloc {
3122 my ($self, $id, $cb) = @_;
3123
3124 $self->{post_alloc_hook}{$id} = $cb;
3125}
3126
2170sub draw { 3127sub draw {
2171 my ($self) = @_; 3128 my ($self) = @_;
2172 3129
2173 while (my $rcb = delete $self->{refresh_hook}) { 3130 while ($self->{refresh_hook}) {
2174 $_->() for values %$rcb; 3131 $_->()
3132 for values %{delete $self->{refresh_hook}};
3133 }
3134
3135 if ($self->{realloc}) {
3136 my @queue;
3137
3138 while () {
3139 if ($self->{realloc}) {
3140 #TODO use array-of-depth approach
3141
3142 @queue = sort { $a->{visible} <=> $b->{visible} }
3143 @queue, values %{delete $self->{realloc}};
3144 }
3145
3146 my $widget = pop @queue || last;
3147
3148 $widget->{visible} or last; # do not resize invisible widgets
3149
3150 my ($w, $h) = $widget->size_request;
3151
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3154
3155 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h};
3157
3158 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h;
3160
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3162
3163 push @queue, $widget->{parent}
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3165 }
3166 }
3167
3168 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3170 values %$size_alloc;
3171
3172 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last };
3174
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177
3178 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0;
3180
3181 $w = int $w + 0.5;
3182 $h = int $h + 0.5;
3183
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3185
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h, $changed);
3190 }
3191 }
3192
3193 while ($self->{post_alloc_hook}) {
3194 $_->()
3195 for values %{delete $self->{post_alloc_hook}};
2175 } 3196 }
2176 3197
2177 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3198 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2178 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2179 glClear GL_COLOR_BUFFER_BIT; 3200 glClear GL_COLOR_BUFFER_BIT;
2180 3201
2181 glMatrixMode GL_PROJECTION; 3202 glMatrixMode GL_PROJECTION;
2182 glLoadIdentity; 3203 glLoadIdentity;
2183 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2184 glMatrixMode GL_MODELVIEW; 3205 glMatrixMode GL_MODELVIEW;
2185 glLoadIdentity; 3206 glLoadIdentity;
2186 3207
2187 $self->_draw; 3208 $self->_draw;
2188} 3209}
… …
2190############################################################################# 3211#############################################################################
2191 3212
2192package CFClient::UI; 3213package CFClient::UI;
2193 3214
2194$ROOT = new CFClient::UI::Root; 3215$ROOT = new CFClient::UI::Root;
3216$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2195 3217
21961 32181
2197 3219

Diff Legend

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