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

Diff Legend

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