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.149 by root, Sat Apr 22 23:11:32 2006 UTC vs.
Revision 1.252 by root, Sun May 28 23:21:28 2006 UTC

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

Diff Legend

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