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

Diff Legend

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