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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.251 by root, Sun May 28 22:24:24 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 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}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
31 $TOOLTIP->set_tooltip_from ($widget); 51 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 52 $TOOLTIP->show;
33 53
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35 55
36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 } 57 if $x + $TOOLTIP->{w} > $::WIDTH;
39 58
40 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update; 60 $TOOLTIP->realloc;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
… …
51 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
52} 70}
53 71
54# class methods for events 72# class methods for events
55sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
57 if $FOCUS; 75 if $FOCUS;
58} 76}
59 77
60sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
61 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS; 80 if $FOCUS;
63} 81}
64 82
65sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
66 my ($ev) = @_; 84 my ($ev) = @_;
… …
75 check_tooltip; 93 check_tooltip;
76 } 94 }
77 95
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 97
80 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
82 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83 }
84} 100}
85 101
86sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
87 my ($ev) = @_; 103 my ($ev) = @_;
88 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
89 105
90 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91 107
92 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93 109
94 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
96 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97 }
98 112
99 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
100 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
101 $grab->update if $grab; 115 $grab->update if $grab;
102 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
118 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
119 133
120 check_tooltip; 134 check_tooltip;
121 } 135 }
122 136
123 if ($HOVER) {
124 ($x, $y) = $HOVER->coord2local ($x, $y);
125 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126 } 138 if $HOVER;
127} 139}
128 140
129# convert position array to integers 141# convert position array to integers
130sub harmonize { 142sub harmonize {
131 my ($vals) = @_; 143 my ($vals) = @_;
… …
137 $rem += $_ - $i; 149 $rem += $_ - $i;
138 $_ = $i; 150 $_ = $i;
139 } 151 }
140} 152}
141 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
142# call when resolution changes etc. 170# call when resolution changes etc.
143sub rescale_widgets { 171sub rescale_widgets {
144 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
145 173
146 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
147 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
148 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 176 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 177 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 178 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 179 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 180 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 181 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156 } 182 }
157
158 $widget->reconfigure;
159 } 183 }
184
185 reconfigure_widgets;
160} 186}
161 187
162############################################################################# 188#############################################################################
163 189
164package CFClient::UI::Base; 190package CFClient::UI::Base;
… …
177 can_events => 1, 203 can_events => 1,
178 @_ 204 @_
179 }, $class; 205 }, $class;
180 206
181 for (keys %$self) { 207 for (keys %$self) {
182 if (/^connect_(.*)$/) { 208 if (/^on_(.*)$/) {
183 $self->connect ($1 => delete $self->{$_}); 209 $self->connect ($1 => delete $self->{$_});
184 } 210 }
185 } 211 }
186 212
187 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 213 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
188 214
215 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216 $self->{req_x} = $layout->{x} * $::WIDTH;
217 $self->{req_y} = $layout->{y} * $::HEIGHT;
218 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
219 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
220 }
221
189 $self 222 $self
190} 223}
191 224
192sub destroy { 225sub destroy {
193 my ($self) = @_; 226 my ($self) = @_;
… …
202 return if $self->{parent}; 235 return if $self->{parent};
203 236
204 $CFClient::UI::ROOT->add ($self); 237 $CFClient::UI::ROOT->add ($self);
205} 238}
206 239
207sub hide { 240sub center {
208 my ($self) = @_; 241 my ($self) = @_;
242
243 $CFClient::UI::ROOT->on_post_alloc (
244 "center_$self" => sub {
245 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246 },
247 );
248
249 $self->update;
250}
251
252sub set_visible {
253 my ($self) = @_;
254
255 return if $self->{visible};
256
257 $self->{root} = $self->{parent}{root};
258 $self->{visible} = $self->{parent}{visible} + 1;
259
260 $self->emit (visibility_change => 1);
261
262 $self->realloc unless exists $self->{req_w};
263
264 $_->set_visible for $self->children;
265}
266
267sub set_invisible {
268 my ($self) = @_;
269
270 return unless $self->{visible};
271
272 $_->set_invisible for $self->children;
273
274 delete $self->{root};
275 delete $self->{visible};
209 276
210 undef $GRAB if $GRAB == $self; 277 undef $GRAB if $GRAB == $self;
211 undef $HOVER if $HOVER == $self; 278 undef $HOVER if $HOVER == $self;
279
280 CFClient::UI::check_tooltip
281 if $TOOLTIP->{owner} == $self;
282
283 $self->focus_out;
284
285 $self->emit (visibility_change => 0);
286}
287
288sub set_visibility {
289 my ($self, $visible) = @_;
290
291 return if $self->{visible} == $visible;
292
293 $visible ? $self->hide
294 : $self->show;
295}
296
297sub toggle_visibility {
298 my ($self) = @_;
299
300 $self->{visible}
301 ? $self->hide
302 : $self->show;
303}
304
305sub hide {
306 my ($self) = @_;
307
308 $self->set_invisible;
212 309
213 $self->{parent}->remove ($self) 310 $self->{parent}->remove ($self)
214 if $self->{parent}; 311 if $self->{parent};
215} 312}
216 313
… …
225} 322}
226 323
227sub set_size { 324sub set_size {
228 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
229 326
230 $self->{user_w} = $w; 327 $self->{def_w} = $w;
231 $self->{user_h} = $h; 328 $self->{def_h} = $h;
232 329
233 $self->check_size; 330 $self->realloc;
234} 331}
235 332
236sub size_request { 333sub size_request {
237 require Carp; 334 require Carp;
238 Carp::confess "size_request is abstract"; 335 Carp::confess "size_request is abstract";
… …
258 $self->{y} = $y; 355 $self->{y} = $y;
259 $self->update; 356 $self->update;
260 } 357 }
261 358
262 if ($self->{w} != $w || $self->{h} != $h) { 359 if ($self->{w} != $w || $self->{h} != $h) {
360 return unless $self->{visible};
361
263 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
264 } 363 }
265} 364}
266 365
267sub size_allocate { 366sub size_allocate {
268 # nothing to be done 367 # nothing to be done
269} 368}
270 369
271sub reconfigure {
272 my ($self) = @_;
273
274 $self->check_size (1);
275 $self->update;
276}
277
278sub children { 370sub children {
279} 371}
280 372
281sub set_max_size { 373sub set_max_size {
282 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
283 375
284 delete $self->{max_w}; $self->{max_w} = $w if $w; 376 delete $self->{max_w}; $self->{max_w} = $w if $w;
285 delete $self->{max_h}; $self->{max_h} = $h if $h; 377 delete $self->{max_h}; $self->{max_h} = $h if $h;
378}
379
380sub set_tooltip {
381 my ($self, $tooltip) = @_;
382
383 $tooltip =~ s/^\s+//;
384 $tooltip =~ s/\s+$//;
385
386 return if $self->{tooltip} eq $tooltip;
387
388 $self->{tooltip} = $tooltip;
389
390 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
391 delete $CFClient::UI::TOOLTIP->{owner};
392 CFClient::UI::check_tooltip;
393 }
286} 394}
287 395
288# translate global coordinates to local coordinate system 396# translate global coordinates to local coordinate system
289sub coord2local { 397sub coord2local {
290 my ($self, $x, $y) = @_; 398 my ($self, $x, $y) = @_;
… …
305 return if $FOCUS == $self; 413 return if $FOCUS == $self;
306 return unless $self->{can_focus}; 414 return unless $self->{can_focus};
307 415
308 my $focus = $FOCUS; $FOCUS = $self; 416 my $focus = $FOCUS; $FOCUS = $self;
309 417
310 $self->emit (focus_in => $focus); 418 $self->_emit (focus_in => $focus);
311 419
312 $focus->update if $focus; 420 $focus->update if $focus;
313 $FOCUS->update; 421 $FOCUS->update;
314} 422}
315 423
… …
318 426
319 return unless $FOCUS == $self; 427 return unless $FOCUS == $self;
320 428
321 my $focus = $FOCUS; undef $FOCUS; 429 my $focus = $FOCUS; undef $FOCUS;
322 430
323 $self->emit (focus_out => $focus); 431 $self->_emit (focus_out => $focus);
324 432
325 $focus->update if $focus; #? 433 $focus->update if $focus; #?
434
435 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
436 unless $FOCUS;
326} 437}
327 438
328sub mouse_motion { } 439sub mouse_motion { }
329sub button_up { } 440sub button_up { }
330sub key_down { } 441sub key_down { }
331sub key_up { } 442sub key_up { }
332 443
333sub button_down { 444sub button_down {
334 my ($self, $ev, $x, $y) = @_; 445 my ($self, $ev, $x, $y) = @_;
335 446
336 $self->focus_in; 447 $self->focus_in;
… …
339sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
340sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
341sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
342sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
343sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 454sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455
456sub find_widget {
457 my ($self, $x, $y) = @_;
458
459 return () unless $self->{can_events};
460
461 return $self
462 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
463 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
464
465 ()
466}
467
468sub set_parent {
469 my ($self, $parent) = @_;
470
471 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476}
477
478sub connect {
479 my ($self, $signal, $cb) = @_;
480
481 push @{ $self->{signal_cb}{$signal} }, $cb;
482}
483
484sub _emit {
485 my ($self, $signal, @args) = @_;
486
487 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
488}
489
490sub emit {
491 my ($self, $signal, @args) = @_;
492
493 $self->_emit ($signal, @args)
494 || $self->$signal (@args);
495}
496
497sub visibility_change {
498 #my ($self, $visible) = @_;
499}
500
501sub realloc {
502 my ($self) = @_;
503
504 return unless $self->{visible};
505
506 return if $self->{root}{realloc}{$self};
507
508 $self->{root}{realloc}{$self} = $self;
509 $self->{root}->update;
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
344 518
345sub draw { 519sub draw {
346 my ($self) = @_; 520 my ($self) = @_;
347 521
348 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
370 if ($ENV{PCLIENT_DEBUG}) { 544 if ($ENV{PCLIENT_DEBUG}) {
371 glPushMatrix; 545 glPushMatrix;
372 glColor 1, 1, 0, 1; 546 glColor 1, 1, 0, 1;
373 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374 glBegin GL_LINE_LOOP; 548 glBegin GL_LINE_LOOP;
375 glVertex 0 , 0; 549 glVertex 0 , 0;
376 glVertex $self->{w}, 0; 550 glVertex $self->{w} - 1, 0;
377 glVertex $self->{w}, $self->{h}; 551 glVertex $self->{w} - 1, $self->{h} - 1;
378 glVertex 0 , $self->{h}; 552 glVertex 0 , $self->{h} - 1;
379 glEnd; 553 glEnd;
380 glPopMatrix; 554 glPopMatrix;
381 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 555 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382 } 556 }
383} 557}
384 558
385sub _draw { 559sub _draw {
386 my ($self) = @_; 560 my ($self) = @_;
387 561
388 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
389}
390
391sub find_widget {
392 my ($self, $x, $y) = @_;
393
394 return () unless $self->{can_events};
395
396 return $self
397 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
398 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
399
400 ()
401}
402
403sub set_parent {
404 my ($self, $parent) = @_;
405
406 Scalar::Util::weaken ($self->{parent} = $parent);
407
408 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size
410 unless exists $self->{req_w};
411}
412
413sub check_size {
414 my ($self, $forced) = @_;
415
416 $self->{force_alloc} = 1 if $forced;
417 $CFClient::UI::ROOT->{check_size}{$self} = $self;
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437} 563}
438 564
439sub DESTROY { 565sub DESTROY {
440 my ($self) = @_; 566 my ($self) = @_;
441 567
… …
456 my $class = shift; 582 my $class = shift;
457 583
458 # range [value, low, high, page] 584 # range [value, low, high, page]
459 585
460 $class->SUPER::new ( 586 $class->SUPER::new (
461 bg => [0, 0, 0, 0.2], 587 #bg => [0, 0, 0, 0.2],
462 active_bg => [1, 1, 1, 0.5], 588 #active_bg => [1, 1, 1, 0.5],
463 @_ 589 @_
464 ) 590 )
465} 591}
466 592
467sub _draw { 593sub _draw {
468 my ($self) = @_; 594 my ($self) = @_;
469 595
596 my $color = $FOCUS == $self && $self->{active_bg}
597 ? $self->{active_bg}
598 : $self->{bg};
599
600 if ($color && (@$color < 4 || $color->[3])) {
470 my ($w, $h) = @$self{qw(w h)}; 601 my ($w, $h) = @$self{qw(w h)};
471 602
472 glEnable GL_BLEND; 603 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 605 glColor @$color;
475 606
476 glBegin GL_QUADS; 607 glBegin GL_QUADS;
477 glVertex 0 , 0; 608 glVertex 0 , 0;
478 glVertex 0 , $h; 609 glVertex 0 , $h;
479 glVertex $w, $h; 610 glVertex $w, $h;
480 glVertex $w, 0; 611 glVertex $w, 0;
481 glEnd; 612 glEnd;
482 613
483 glDisable GL_BLEND; 614 glDisable GL_BLEND;
615 }
484} 616}
485 617
486############################################################################# 618#############################################################################
487 619
488package CFClient::UI::Empty; 620package CFClient::UI::Empty;
… …
532 $self->{children} = [ 664 $self->{children} = [
533 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
534 @{$self->{children}}, @widgets 666 @{$self->{children}}, @widgets
535 ]; 667 ];
536 668
537 $self->check_size (1); 669 $self->realloc;
538 $self->update;
539} 670}
540 671
541sub children { 672sub children {
542 @{ $_[0]{children} } 673 @{ $_[0]{children} }
543} 674}
… …
548 delete $child->{parent}; 679 delete $child->{parent};
549 $child->hide; 680 $child->hide;
550 681
551 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552 683
553 $self->check_size; 684 $self->realloc;
554 $self->update;
555} 685}
556 686
557sub clear { 687sub clear {
558 my ($self) = @_; 688 my ($self) = @_;
559 689
… …
563 for (@$children) { 693 for (@$children) {
564 delete $_->{parent}; 694 delete $_->{parent};
565 $_->hide; 695 $_->hide;
566 } 696 }
567 697
568 $self->check_size; 698 $self->realloc;
569 $self->update;
570} 699}
571 700
572sub find_widget { 701sub find_widget {
573 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
574 703
… …
627sub size_request { 756sub size_request {
628 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
629} 758}
630 759
631sub size_allocate { 760sub size_allocate {
632 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
633 762
634 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
635} 764}
636 765
637############################################################################# 766#############################################################################
… …
654 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
655 $self->SUPER::update; 784 $self->SUPER::update;
656} 785}
657 786
658sub size_allocate { 787sub size_allocate {
659 my ($self, $w, $h) = @_; 788 my ($self, $w, $h, $changed) = @_;
660 789
661 $self->SUPER::size_allocate ($w, $h); 790 $self->SUPER::size_allocate ($w, $h, $changed);
662 $self->update; 791 $self->update
792 if $changed;
663} 793}
664 794
665sub _render { 795sub _render {
666 $_[0]{children}[0]->draw; 796 $_[0]{children}[0]->draw;
667} 797}
… …
672 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673 glClearColor 0, 0, 0, 0; 803 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT; 804 glClear GL_COLOR_BUFFER_BIT;
675 805
676 $self->_render; 806 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 }; 807 };
685} 808}
686 809
687sub _draw { 810sub _draw {
688 my ($self) = @_; 811 my ($self) = @_;
… …
692 my $tex = $self->{texture} 815 my $tex = $self->{texture}
693 or return; 816 or return;
694 817
695 glEnable GL_TEXTURE_2D; 818 glEnable GL_TEXTURE_2D;
696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697 glColor 0, 0, 0, 1; 820 glColor 1, 1, 1, 1;
698 821
699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700 823
701 glDisable GL_TEXTURE_2D; 824 glDisable GL_TEXTURE_2D;
702} 825}
… …
705 828
706package CFClient::UI::ViewPort; 829package CFClient::UI::ViewPort;
707 830
708our @ISA = CFClient::UI::Window::; 831our @ISA = CFClient::UI::Window::;
709 832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 scroll_x => 0,
838 scroll_y => 1,
839 @_,
840 )
841}
842
710sub size_request { 843sub size_request {
711 my ($self) = @_; 844 my ($self) = @_;
712 845
713 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
715 847
716 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
717} 852}
718 853
719sub size_allocate { 854sub size_allocate {
720 my ($self, $w, $h) = @_; 855 my ($self, $w, $h, $changed) = @_;
721 856
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
859
860 $self->child->configure (0, 0, $w, $h);
722 $self->update; 861 $self->update;
723} 862}
724 863
725sub set_offset { 864sub set_offset {
726 my ($self, $x, $y) = @_; 865 my ($self, $x, $y) = @_;
… …
777 my $class = shift; 916 my $class = shift;
778 917
779 my $self; 918 my $self;
780 919
781 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
782 vertical => 1, 921 vertical => 1,
783 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
784 connect_changed => sub { 923 on_changed => sub {
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 924 $self->{vp}->set_offset (0, $_[1]);
786 }, 925 },
787 ; 926 ;
788 927
789 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
790 vp => (new CFClient::UI::ViewPort), 929 vp => (new CFClient::UI::ViewPort expand => 1),
791 slider => $slider, 930 slider => $slider,
792 @_, 931 @_,
793 ); 932 );
794 933
795 $self->{vp}->add ($self->{scrolled}); 934 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp}); 935 $self->add ($self->{vp});
797 $self->add ($self->{slider}); 936 $self->add ($self->{slider});
798 937
799 $self 938 $self
939}
940
941sub update {
942 my ($self) = @_;
943
944 $self->SUPER::update;
945
946 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
951sub size_allocate {
952 my ($self, $w, $h, $changed) = @_;
953
954 $self->SUPER::size_allocate ($w, $h, $changed);
955
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800} 958}
801 959
802#TODO# update range on size_allocate depending on child 960#TODO# update range on size_allocate depending on child
803# update viewport offset on scroll 961# update viewport offset on scroll
804 962
… …
855 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
856 1014
857sub new { 1015sub new {
858 my $class = shift; 1016 my $class = shift;
859 1017
860 # TODO: user_x, user_y, overwrite moveto?
861
862 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
863 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
864 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
865 border => 0.6, 1021 border => 0.6,
866 toplevel => 1, 1022 is_toplevel => 1,
867 can_events => 1, 1023 can_events => 1,
868 @_ 1024 @_
869 ); 1025 );
870 1026
871 $self->{title} &&= new CFClient::UI::Label 1027 $self->{title} &&= new CFClient::UI::Label
872 align => 0, 1028 align => 0,
… …
891 $h + $self->border * 2, 1047 $h + $self->border * 2,
892 ) 1048 )
893} 1049}
894 1050
895sub size_allocate { 1051sub size_allocate {
896 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
897 1055
898 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
900 1058
901 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902 if $self->{title}; 1060 if $self->{title};
903 1061
904 $self->child->configure ($self->border, $self->border, $w, $h); 1062 $self->child->configure ($self->border, $self->border, $w, $h);
905} 1063}
906 1064
… …
925 my ($ev, $x, $y) = @_; 1083 my ($ev, $x, $y) = @_;
926 1084
927 my $dx = $ev->{x} - $ox; 1085 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy; 1086 my $dy = $ev->{y} - $oy;
929 1087
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1092 $self->move ($self->{user_x}, $self->{user_y});
933 $self->check_size; 1093 $self->realloc;
934 }; 1094 };
935 1095
936 } elsif ($lr ^ $td) { 1096 } elsif ($lr ^ $td) {
937 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
938 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
… …
940 $self->{motion} = sub { 1100 $self->{motion} = sub {
941 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
942 1102
943 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 ($x, $y) = ($ev->{x}, $ev->{y});
944 1104
945 $self->move ($bx + $x - $ox, $by + $y - $oy); 1105 $self->{user_x} = $bx + $x - $ox;
1106 $self->{user_y} = $by + $y - $oy;
1107
1108 $self->move ($self->{user_x}, $self->{user_y});
946 $self->update; 1109 $self->realloc;
947 }; 1110 };
948 } 1111 }
949} 1112}
950 1113
951sub button_up { 1114sub button_up {
… …
1012sub new { 1175sub new {
1013 my $class = shift; 1176 my $class = shift;
1014 1177
1015 $class->SUPER::new ( 1178 $class->SUPER::new (
1016 col_expand => [], 1179 col_expand => [],
1017 @_ 1180 @_,
1018 ) 1181 )
1182}
1183
1184sub children {
1185 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019} 1186}
1020 1187
1021sub add { 1188sub add {
1022 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
1023 1190
1024 $child->set_parent ($self); 1191 $child->set_parent ($self);
1025 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
1026 1193
1027 $child->check_size; 1194 $self->realloc;
1028} 1195}
1029 1196
1030sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032}
1033
1034# TODO: move to container class maybe? send childs a signal on removal? 1197# TODO: move to container class maybe? send children a signal on removal?
1035sub clear { 1198sub clear {
1036 my ($self) = @_; 1199 my ($self) = @_;
1037 1200
1038 my @children = $self->children; 1201 my @children = $self->children;
1039 delete $self->{children}; 1202 delete $self->{children};
… …
1041 for (@children) { 1204 for (@children) {
1042 delete $_->{parent}; 1205 delete $_->{parent};
1043 $_->hide; 1206 $_->hide;
1044 } 1207 }
1045 1208
1046 $self->update; 1209 $self->realloc;
1047} 1210}
1048 1211
1049sub get_wh { 1212sub get_wh {
1050 my ($self) = @_; 1213 my ($self) = @_;
1051 1214
… …
1078 (sum @$hs), 1241 (sum @$hs),
1079 ) 1242 )
1080} 1243}
1081 1244
1082sub size_allocate { 1245sub size_allocate {
1083 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
1084 1247
1085 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
1086 1249
1087 my $req_w = sum @$ws; 1250 my $req_w = (sum @$ws) || 1;
1088 my $req_h = sum @$hs; 1251 my $req_h = (sum @$hs) || 1;
1089 1252
1090 # TODO: nicer code && do row_expand 1253 # TODO: nicer code && do row_expand
1091 my @col_expand = @{$self->{col_expand}}; 1254 my @col_expand = @{$self->{col_expand}};
1092 @col_expand = (1) x @$ws unless @col_expand; 1255 @col_expand = (1) x @$ws unless @col_expand;
1093 my $col_expand = (sum @col_expand) || 1; 1256 my $col_expand = (sum @col_expand) || 1;
… …
1147 } 1310 }
1148} 1311}
1149 1312
1150############################################################################# 1313#############################################################################
1151 1314
1315package CFClient::UI::Box;
1316
1317our @ISA = CFClient::UI::Container::;
1318
1319sub size_request {
1320 my ($self) = @_;
1321
1322 $self->{vertical}
1323 ? (
1324 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1325 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1326 )
1327 : (
1328 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 )
1331}
1332
1333sub size_allocate {
1334 my ($self, $w, $h, $changed) = @_;
1335
1336 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children};
1338
1339 my @req;
1340
1341 if ($self->{homogeneous}) {
1342 @req = ($space / (@$children || 1)) x @$children;
1343 } else {
1344 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1345 my $req = List::Util::sum @req;
1346
1347 if ($req > $space) {
1348 # ah well, not enough space
1349 $_ *= $space / $req for @req;
1350 } else {
1351 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1352
1353 $space = ($space - $req) / $expand; # remaining space to give away
1354
1355 $req[$_] += $space * $children->[$_]{expand}
1356 for 0 .. $#$children;
1357 }
1358 }
1359
1360 CFClient::UI::harmonize \@req;
1361
1362 my $pos = 0;
1363 for (0 .. $#$children) {
1364 my $alloc = $req[$_];
1365 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1366
1367 $pos += $alloc;
1368 }
1369
1370 1
1371}
1372
1373#############################################################################
1374
1152package CFClient::UI::HBox; 1375package CFClient::UI::HBox;
1153 1376
1154# TODO: wrap into common Box base class
1155
1156our @ISA = CFClient::UI::Container::; 1377our @ISA = CFClient::UI::Box::;
1157 1378
1158sub size_request { 1379sub new {
1159 my ($self) = @_; 1380 my $class = shift;
1160 1381
1161 my @alloc = map [$_->size_request], @{$self->{children}}; 1382 $class->SUPER::new (
1162 1383 vertical => 0,
1163 ( 1384 @_,
1164 (List::Util::sum map $_->[0], @alloc),
1165 (List::Util::max map $_->[1], @alloc),
1166 ) 1385 )
1167} 1386}
1168 1387
1169sub size_allocate {
1170 my ($self, $w, $h) = @_;
1171
1172 ($h, $w) = ($w, $h);
1173
1174 my $children = $self->{children};
1175
1176 my @h = map $_->{req_w}, @$children;
1177
1178 my $req_h = List::Util::sum @h;
1179
1180 if ($req_h > $h) {
1181 # ah well, not enough space
1182 $_ *= $h / $req_h for @h;
1183 } else {
1184 my $exp = List::Util::sum map $_->{expand}, @$children;
1185 $exp ||= 1;
1186
1187 for (0 .. $#$children) {
1188 my $child = $children->[$_];
1189
1190 my $alloc_h = $h[$_];
1191 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192 $h[$_] = $alloc_h;
1193 }
1194 }
1195
1196 CFClient::UI::harmonize \@h;
1197
1198 my $y = 0;
1199 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201 my $h = $h[$_];
1202 $child->configure ($y, 0, $h, $w);
1203
1204 $y += $h;
1205 }
1206
1207 1
1208}
1209
1210############################################################################# 1388#############################################################################
1211 1389
1212package CFClient::UI::VBox; 1390package CFClient::UI::VBox;
1213 1391
1214# TODO: wrap into common Box base class
1215
1216our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Box::;
1217 1393
1218sub size_request { 1394sub new {
1219 my ($self) = @_; 1395 my $class = shift;
1220 1396
1221 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $class->SUPER::new (
1222 1398 vertical => 1,
1223 ( 1399 @_,
1224 (List::Util::max map $_->[0], @alloc),
1225 (List::Util::sum map $_->[1], @alloc),
1226 ) 1400 )
1227} 1401}
1228 1402
1229sub size_allocate {
1230 my ($self, $w, $h) = @_;
1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234 my $children = $self->{children};
1235
1236 my @h = map $_->{req_h}, @$children;
1237
1238 my $req_h = List::Util::sum @h;
1239
1240 if ($req_h > $h) {
1241 # ah well, not enough space
1242 $_ *= $h / $req_h for @h;
1243 } else {
1244 my $exp = List::Util::sum map $_->{expand}, @$children;
1245 $exp ||= 1;
1246
1247 for (0 .. $#$children) {
1248 my $child = $children->[$_];
1249
1250 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251 }
1252 }
1253
1254 CFClient::UI::harmonize \@h;
1255
1256 my $y = 0;
1257 for (0 .. $#$children) {
1258 my $child = $children->[$_];
1259 my $h = $h[$_];
1260 $child->configure (0, $y, $w, $h);
1261
1262 $y += $h;
1263 }
1264
1265 1
1266}
1267
1268############################################################################# 1403#############################################################################
1269 1404
1270package CFClient::UI::Label; 1405package CFClient::UI::Label;
1271 1406
1272our @ISA = CFClient::UI::Base::; 1407our @ISA = CFClient::UI::DrawBG::;
1273 1408
1274use CFClient::OpenGL; 1409use CFClient::OpenGL;
1275 1410
1276sub new { 1411sub new {
1277 my ($class, %arg) = @_; 1412 my ($class, %arg) = @_;
1278 1413
1279 my $self = $class->SUPER::new ( 1414 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1415 fg => [1, 1, 1],
1416 #bg => none
1417 #active_bg => none
1281 #font => default_font 1418 #font => default_font
1282 #text => initial text 1419 #text => initial text
1283 #markup => initial narkup 1420 #markup => initial narkup
1421 #max_w => maximum pixel width
1422 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1423 layout => (new CFClient::Layout),
1285 fontsize => 1, 1424 fontsize => 1,
1286 align => -1, 1425 align => -1,
1287 valign => -1, 1426 valign => -1,
1288 padding => 2, 1427 padding => 2,
… …
1303 } 1442 }
1304 1443
1305 $self 1444 $self
1306} 1445}
1307 1446
1308sub escape { 1447sub escape($) {
1309 local $_ = $_[1]; 1448 local $_ = $_[0];
1310 1449
1311 s/&/&amp;/g; 1450 s/&/&amp;/g;
1312 s/>/&gt;/g; 1451 s/>/&gt;/g;
1313 s/</&lt;/g; 1452 s/</&lt;/g;
1314 1453
1315 $_[1] 1454 $_
1316} 1455}
1317 1456
1318sub update { 1457sub update {
1319 my ($self) = @_; 1458 my ($self) = @_;
1320 1459
… …
1329 $self->{text} = "T$text"; 1468 $self->{text} = "T$text";
1330 1469
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1333 1472
1334 $self->update; 1473 $self->realloc;
1335 $self->check_size;
1336} 1474}
1337 1475
1338sub set_markup { 1476sub set_markup {
1339 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1340 1478
… …
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345 1483
1346 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1347 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1348 1486
1349 $self->update; 1487 $self->realloc;
1350 $self->check_size;
1351} 1488}
1352 1489
1353sub size_request { 1490sub size_request {
1354 my ($self) = @_; 1491 my ($self) = @_;
1355 1492
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1493 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $self->{layout}->set_width ($self->{max_w} || -1); 1494 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1498
1360 my ($w, $h) = $self->{layout}->size; 1499 my ($w, $h) = $self->{layout}->size;
1361 1500
1362 if (exists $self->{template}) { 1501 if (exists $self->{template}) {
… …
1374 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1375 ) 1514 )
1376} 1515}
1377 1516
1378sub size_allocate { 1517sub size_allocate {
1379 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1380 1519
1381 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1382} 1522}
1383 1523
1384sub set_fontsize { 1524sub set_fontsize {
1385 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1386 1526
1387 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1388 delete $self->{texture}; 1528 delete $self->{texture};
1389 1529
1390 $self->update; 1530 $self->realloc;
1391 $self->check_size;
1392} 1531}
1393 1532
1394sub _draw { 1533sub _draw {
1395 my ($self) = @_; 1534 my ($self) = @_;
1535
1536 $self->SUPER::_draw; # draw background, if applicable
1396 1537
1397 my $tex = $self->{texture} ||= do { 1538 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1539 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1540 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $self->{layout}->set_width ($self->{w}); 1541 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1545
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1546 my $tex = new_from_layout CFClient::Texture $self->{layout};
1404 1547
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407 : ($self->{w} - $tex->{w}) * 0.5; 1550 : ($self->{w} - $tex->{w}) * 0.5);
1408 1551
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411 : ($self->{h} - $tex->{h}) * 0.5; 1554 : ($self->{h} - $tex->{h}) * 0.5);
1412 1555
1413 $tex 1556 $tex
1414 }; 1557 };
1415 1558
1416 glEnable GL_TEXTURE_2D; 1559 glEnable GL_TEXTURE_2D;
… …
1444 active_fg => [0, 0, 0], 1587 active_fg => [0, 0, 0],
1445 can_hover => 1, 1588 can_hover => 1,
1446 can_focus => 1, 1589 can_focus => 1,
1447 valign => 0, 1590 valign => 0,
1448 can_events => 1, 1591 can_events => 1,
1592 #text => ...
1449 @_ 1593 @_
1450 ) 1594 )
1451} 1595}
1452 1596
1453sub _set_text { 1597sub _set_text {
… …
1463 $self->{text} = $text; 1607 $self->{text} = $text;
1464 1608
1465 $text =~ s/./*/g if $self->{hidden}; 1609 $text =~ s/./*/g if $self->{hidden};
1466 $self->{layout}->set_text ("$text "); 1610 $self->{layout}->set_text ("$text ");
1467 1611
1468 $self->emit (changed => $self->{text}); 1612 $self->_emit (changed => $self->{text});
1469} 1613}
1470 1614
1471sub set_text { 1615sub set_text {
1472 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1473 1617
1474 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1619 $self->_set_text ($text);
1476 $self->check_size; 1620
1477 $self->update; 1621 $self->realloc;
1478} 1622}
1479 1623
1480sub get_text { 1624sub get_text {
1481 $_[0]{text} 1625 $_[0]{text}
1482} 1626}
… …
1485 my ($self) = @_; 1629 my ($self) = @_;
1486 1630
1487 my ($w, $h) = $self->SUPER::size_request; 1631 my ($w, $h) = $self->SUPER::size_request;
1488 1632
1489 ($w + 1, $h) # add 1 for cursor 1633 ($w + 1, $h) # add 1 for cursor
1490}
1491
1492sub size_allocate {
1493 my ($self, $w, $h) = @_;
1494
1495 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496} 1634}
1497 1635
1498sub key_down { 1636sub key_down {
1499 my ($self, $ev) = @_; 1637 my ($self, $ev) = @_;
1500 1638
… …
1515 } elsif ($sym == CFClient::SDLK_HOME) { 1653 } elsif ($sym == CFClient::SDLK_HOME) {
1516 $self->{cursor} = 0; 1654 $self->{cursor} = 0;
1517 } elsif ($sym == CFClient::SDLK_END) { 1655 } elsif ($sym == CFClient::SDLK_END) {
1518 $self->{cursor} = length $text; 1656 $self->{cursor} = length $text;
1519 } elsif ($uni == 27) { 1657 } elsif ($uni == 27) {
1520 $self->emit ('escape'); 1658 $self->_emit ('escape');
1521 } elsif ($uni) { 1659 } elsif ($uni) {
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1523 } 1661 }
1524 1662
1525 $self->_set_text ($text); 1663 $self->_set_text ($text);
1526 $self->update; 1664
1665 $self->realloc;
1527} 1666}
1528 1667
1529sub focus_in { 1668sub focus_in {
1530 my ($self) = @_; 1669 my ($self) = @_;
1531 1670
… …
1611 if ($sym == 13) { 1750 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1751 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1752 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1753 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1754 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1755 $self->_emit (activate => $txt);
1617 $self->update; 1756 $self->update;
1618 1757
1619 } elsif ($sym == CFClient::SDLK_UP) { 1758 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1759 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1760 $self->{history_saveback} = $self->get_text;
… …
1660 my $class = shift; 1799 my $class = shift;
1661 1800
1662 $class->SUPER::new ( 1801 $class->SUPER::new (
1663 padding => 4, 1802 padding => 4,
1664 fg => [1, 1, 1], 1803 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1804 active_fg => [0, 0, 1],
1667 can_hover => 1, 1805 can_hover => 1,
1668 align => 0, 1806 align => 0,
1669 valign => 0, 1807 valign => 0,
1670 can_events => 1, 1808 can_events => 1,
1671 @_ 1809 @_
1672 ) 1810 )
1673} 1811}
1674 1812
1813sub activate { }
1814
1675sub button_up { 1815sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1677 1817
1818 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1819 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1820 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate");
1681 }
1682} 1821}
1683 1822
1684sub _draw { 1823sub _draw {
1685 my ($self) = @_; 1824 my ($self) = @_;
1686 1825
… …
1718 1857
1719 $class->SUPER::new ( 1858 $class->SUPER::new (
1720 padding => 2, 1859 padding => 2,
1721 fg => [1, 1, 1], 1860 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1861 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1864 state => 0,
1724 can_hover => 1, 1865 can_hover => 1,
1725 @_ 1866 @_
1726 ) 1867 )
1727} 1868}
… …
1736 my ($self, $ev, $x, $y) = @_; 1877 my ($self, $ev, $x, $y) = @_;
1737 1878
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740 $self->{state} = !$self->{state}; 1881 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1882 $self->_emit (changed => $self->{state});
1742 } 1883 }
1743} 1884}
1744 1885
1745sub _draw { 1886sub _draw {
1746 my ($self) = @_; 1887 my ($self) = @_;
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2152 qw(s1_slider.png s1_slider_bg.png);
2012 2153
2013sub new { 2154sub new {
2014 my $class = shift; 2155 my $class = shift;
2015 2156
2016 # range [value, low, high, page] 2157 # range [value, low, high, page, unit]
2017 2158
2018 # TODO: 0-width page 2159 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2160 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2161 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2162 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2163 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2164 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2167 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2168 req_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2169 req_h => $::WIDTH / 80,
2027 vertical => 0, 2170 vertical => 0,
2028 can_hover => 1, 2171 can_hover => 1,
2029 inner_pad => 5, 2172 inner_pad => 0.02,
2030 @_ 2173 @_
2031 ); 2174 );
2032 2175
2176 $self->set_value ($self->{range}[0]);
2177 $self->update;
2178
2033 $self 2179 $self
2180}
2181
2182sub changed { }
2183
2184sub set_range {
2185 my ($self, $range) = @_;
2186
2187 ($range, $self->{range}) = ($self->{range}, $range);
2188
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}";
2191}
2192
2193sub set_value {
2194 my ($self, $value) = @_;
2195
2196 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2197
2198 $hi = $lo + 1 if $hi <= $lo;
2199
2200 $page = $hi - $lo if $page > $hi - $lo;
2201
2202 $value = $lo if $value < $lo;
2203 $value = $hi - $page if $value > $hi - $page;
2204
2205 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2206 if $unit;
2207
2208 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209
2210 if ($value != $old_value) {
2211 $self->_emit (changed => $value);
2212 $self->update;
2213 }
2034} 2214}
2035 2215
2036sub size_request { 2216sub size_request {
2037 my ($self) = @_; 2217 my ($self) = @_;
2038 2218
… …
2044 2224
2045sub button_down { 2225sub button_down {
2046 my ($self, $ev, $x, $y) = @_; 2226 my ($self, $ev, $x, $y) = @_;
2047 2227
2048 $self->SUPER::button_down ($ev, $x, $y); 2228 $self->SUPER::button_down ($ev, $x, $y);
2229
2230 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231
2049 $self->mouse_motion ($ev, $x, $y); 2232 $self->mouse_motion ($ev, $x, $y);
2050} 2233}
2051 2234
2052sub mouse_motion { 2235sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2236 my ($self, $ev, $x, $y) = @_;
2054 2237
2055 if ($GRAB == $self) { 2238 if ($GRAB == $self) {
2239 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2240
2241 my (undef, $lo, $hi, $page) = @{$self->{range}};
2242
2243 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244
2245 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2246 }
2247}
2248
2249sub update {
2250 my ($self) = @_;
2251
2252 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2253 $self->set_value ($self->{range}[0]);
2254
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2255 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100;
2057 2257
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2258 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059 2259
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2260 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2261 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062 2262
2063 $x -= $inner_pad_px; # substract the padding 2263 $value = ($value - $lo) / $range;
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2264 $value = $value * $self->{scale} + $self->{offset};
2065 $x = $lo if $x < $lo;
2066 $x = $hi - $page if $x > $hi - $page;
2067 $self->{range}[0] = $x;
2068 2265
2069 $self->emit (changed => $x); 2266 $self->{knob_x} = $value - $knob_w * 0.5;
2070 $self->update; 2267 $self->{knob_w} = $knob_w;
2071 } 2268 });
2072}
2073 2269
2074# the inner_* stuff is for generating a padding for the slider handle, 2270 $self->SUPER::update;
2075# so that the handle doesn't leave the texture. This calculation isn't 100%
2076# correct propably, but it does the job for now
2077sub _calc_inner_pad_px {
2078 my ($self, $w) = @_;
2079 ($w / 100) * $self->{inner_pad} # % to pixels
2080} 2271}
2081 2272
2082sub _draw { 2273sub _draw {
2083 my ($self) = @_; 2274 my ($self) = @_;
2084 2275
2085 $self->SUPER::_draw (); 2276 $self->SUPER::_draw ();
2086 2277
2087 my ($w, $h) = @$self{qw(w h)}; 2278 glScale $self->{w}, $self->{h};
2088 2279
2089 if ($self->{vertical}) { 2280 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2281 # draw a vertical slider like a rotated horizontal slider
2091 2282
2283 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2284 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2285 }
2097 2286
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2287 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2288 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2289
2101 my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103 $hi = $value + 1 if $lo == $hi;
2104
2105 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108 $page = int $page * $inner_w / ($hi - $lo);
2109 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111 $w -= $page;
2112 $page &= ~1;
2113 glTranslate $page * 0.5, 0, 0;
2114 $page ||= 2;
2115
2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119 glEnable GL_TEXTURE_2D; 2290 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2291 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2292
2122 # draw background 2293 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2294 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2295
2125 # draw handle 2296 # draw handle
2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2297 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127 2298
2128 glDisable GL_TEXTURE_2D; 2299 glDisable GL_TEXTURE_2D;
2129} 2300}
2301
2302#############################################################################
2303
2304package CFClient::UI::ValSlider;
2305
2306our @ISA = CFClient::UI::HBox::;
2307
2308sub new {
2309 my ($class, %arg) = @_;
2310
2311 my $range = delete $arg{range};
2312
2313 my $self = $class->SUPER::new (
2314 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2315 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2316 to_value => sub { shift },
2317 from_value => sub { shift },
2318 %arg,
2319 );
2320
2321 $self->{slider}->connect (changed => sub {
2322 my ($self, $value) = @_;
2323 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2324 $self->{parent}->emit (changed => $value);
2325 });
2326
2327# $self->{entry}->connect (changed => sub {
2328# my ($self, $value) = @_;
2329# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2330# $self->{parent}->emit (changed => $value);
2331# });
2332
2333 $self->add ($self->{slider}, $self->{entry});
2334
2335 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2336
2337 $self
2338}
2339
2340sub set_range { shift->{slider}->set_range (@_) }
2341sub set_value { shift->{slider}->set_value (@_) }
2130 2342
2131############################################################################# 2343#############################################################################
2132 2344
2133package CFClient::UI::TextView; 2345package CFClient::UI::TextView;
2134 2346
… …
2164 2376
2165 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2378 $self->reflow;
2167} 2379}
2168 2380
2169sub text_height {
2170 my ($self, $text) = @_;
2171
2172 my $layout = $self->{layout};
2173
2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175 $layout->set_width ($self->{children}[0]{w});
2176 $layout->set_markup ($text);
2177
2178 ($layout->size)[1]
2179}
2180
2181sub reflow {
2182 my ($self) = @_;
2183
2184 $self->{need_reflow}++;
2185 $self->update;
2186}
2187
2188sub size_allocate { 2381sub size_allocate {
2189 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
2190 2383
2191 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2192 2387
2193 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
2194 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2195 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
2196 2391
2197 $self->reflow; 2392 $self->reflow;
2198} 2393}
2199 2394
2395sub text_size {
2396 my ($self, $text, $indent) = @_;
2397
2398 my $layout = $self->{layout};
2399
2400 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2401 $layout->set_width ($self->{children}[0]{w} - $indent);
2402 $layout->set_markup ($text);
2403
2404 $layout->size
2405}
2406
2407sub reflow {
2408 my ($self) = @_;
2409
2410 $self->{need_reflow}++;
2411 $self->update;
2412}
2413
2414sub set_offset {
2415 my ($self, $offset) = @_;
2416
2417 # todo: base offset on lines or so, not on pixels
2418 $self->{children}[1]->set_value ($offset);
2419}
2420
2421sub clear {
2422 my ($self) = @_;
2423
2424 $self->{par} = [];
2425 $self->{height} = 0;
2426 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2427}
2428
2200sub add_paragraph { 2429sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2430 my ($self, $color, $text, $indent) = @_;
2202 2431
2203 #TODO: intelligently "reformat" paragraph 2432 for my $line (split /\n/, $text) {
2204 2433 my ($w, $h) = $self->text_size ($line);
2205 my $height = $self->text_height ($text);
2206
2207 $self->{height} += $height; 2434 $self->{height} += $h;
2435 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2436 }
2208 2437
2209 push @{$self->{par}}, [$height, $color, $text];
2210
2211 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2438 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212 $self->{children}[1]->update;
2213} 2439}
2214 2440
2215sub update { 2441sub update {
2216 my ($self) = @_; 2442 my ($self) = @_;
2217 2443
… …
2220 return unless $self->{h} > 0; 2446 return unless $self->{h} > 0;
2221 2447
2222 delete $self->{texture}; 2448 delete $self->{texture};
2223 2449
2224 $ROOT->on_post_alloc ($self, sub { 2450 $ROOT->on_post_alloc ($self, sub {
2451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452
2225 if (delete $self->{need_reflow}) { 2453 if (delete $self->{need_reflow}) {
2226 my $height = 0; 2454 my $height = 0;
2227 2455
2228 $height += $_->[0] = $self->text_height ($_->[2]) 2456 my $layout = $self->{layout};
2457
2458 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459
2229 for @{$self->{par}}; 2460 for (@{$self->{par}}) {
2461 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2462 $layout->set_width ($W - $_->[3]);
2463 $layout->set_markup ($_->[4]);
2464 my ($w, $h) = $layout->size;
2465 $_->[0] = $w + $_->[3];
2466 $_->[1] = $h;
2467 }
2468
2469 $height += $_->[1];
2470 }
2230 2471
2231 $self->{height} = $height; 2472 $self->{height} = $height;
2232 2473
2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2474 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234 2475
2235 delete $self->{texture}; 2476 delete $self->{texture};
2236 } 2477 }
2237 2478
2238 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239 glClearColor 0, 0, 0, 0; 2480 glClearColor 0.5, 0.5, 0.5, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2481 glClear GL_COLOR_BUFFER_BIT;
2241 2482
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0]; 2483 my $top = int $self->{children}[1]{range}[0];
2246 2484
2247 my $y0 = $top; 2485 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2486 my $y1 = $top + $H;
2249 2487
2250 my $y = 0; 2488 my $y = 0;
2251 2489
2252 my $layout = $self->{layout}; 2490 my $layout = $self->{layout};
2253 2491
2254 $layout->set_font ($self->{font}) if $self->{font}; 2492 $layout->set_font ($self->{font}) if $self->{font};
2255 2493
2494 glEnable GL_BLEND;
2495 #TODO# not correct in windows where rgba is forced off
2496 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2497
2256 for my $par (@{$self->{par}}) { 2498 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2499 my $h = $par->[1];
2258 2500
2259 if ($y0 < $y + $h && $y < $y1) { 2501 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] }); 2502 $layout->set_foreground (@{ $par->[2] });
2503 $layout->set_width ($W - $par->[3]);
2261 $layout->set_markup ($par->[2]); 2504 $layout->set_markup ($par->[4]);
2262 2505
2263 my ($W, $H) = $layout->size; 2506 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2507
2508 glRasterPos $par->[3], $y - $y0;
2509 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2510 }
2266 2511
2267 $y += $h; 2512 $y += $h;
2268 } 2513 }
2269 2514
2270 glDisable GL_TEXTURE_2D; 2515 glDisable GL_BLEND;
2271 }; 2516 };
2272 }); 2517 });
2273} 2518}
2274 2519
2275sub _draw { 2520sub _draw {
2276 my ($self) = @_; 2521 my ($self) = @_;
2277 2522
2278 glEnable GL_TEXTURE_2D; 2523 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2525 glColor 1, 1, 1, 1;
2281 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2526 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282 glDisable GL_TEXTURE_2D; 2527 glDisable GL_TEXTURE_2D;
2283 2528
2284 $self->{children}[1]->draw; 2529 $self->{children}[1]->draw;
2285 2530
2286} 2531}
… …
2335 2580
2336sub new { 2581sub new {
2337 my $class = shift; 2582 my $class = shift;
2338 2583
2339 my $self = $class->SUPER::new ( 2584 my $self = $class->SUPER::new (
2340 state => 0, 2585 state => 0,
2341 connect_activate => \&toggle_flopper, 2586 on_activate => \&toggle_flopper,
2342 @_ 2587 @_
2343 ); 2588 );
2344 2589
2345 if ($self->{state}) {
2346 $self->{state} = 0;
2347 $self->toggle_flopper;
2348 }
2349
2350 $self 2590 $self
2351} 2591}
2352 2592
2353sub toggle_flopper { 2593sub toggle_flopper {
2354 my ($self) = @_; 2594 my ($self) = @_;
2355 2595
2356 # TODO: use animation 2596 $self->{other}->toggle_visibility;
2357 if ($self->{state} = !$self->{state}) {
2358 $CFClient::UI::ROOT->add ($self->{other});
2359 $self->{other}->move ($self->coord2global (0, $self->{h}));
2360 $self->emit ("open");
2361 } else {
2362 $CFClient::UI::ROOT->remove ($self->{other});
2363 $self->emit ("close");
2364 }
2365
2366 $self->emit (changed => $self->{state});
2367} 2597}
2368 2598
2369############################################################################# 2599#############################################################################
2370 2600
2371package CFClient::UI::Tooltip; 2601package CFClient::UI::Tooltip;
… …
2385 2615
2386sub set_tooltip_from { 2616sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2617 my ($self, $widget) = @_;
2388 2618
2389 $self->add (new CFClient::UI::Label 2619 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2620 markup => $widget->{tooltip},
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2622 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2623 fg => [0, 0, 0, 1],
2624 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2625 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2626 );
2396} 2627}
2397 2628
2398sub size_request { 2629sub size_request {
2399 my ($self) = @_; 2630 my ($self) = @_;
… …
2402 2633
2403 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2404} 2635}
2405 2636
2406sub size_allocate { 2637sub size_allocate {
2407 my ($self, $w, $h) = @_; 2638 my ($self, $w, $h, $changed) = @_;
2408 2639
2640 return unless $changed;
2641
2409 $self->SUPER::size_allocate ($w - 4, $h - 4); 2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2410} 2643}
2411 2644
2412sub _draw { 2645sub _draw {
2413 my ($self) = @_; 2646 my ($self) = @_;
2414 2647
… …
2445use CFClient::OpenGL; 2678use CFClient::OpenGL;
2446 2679
2447sub new { 2680sub new {
2448 my $class = shift; 2681 my $class = shift;
2449 2682
2450 $class->SUPER::new ( 2683 my $self = $class->SUPER::new (
2451 aspect => 1, 2684 aspect => 1,
2685 can_events => 0,
2452 @_, 2686 @_,
2453 ) 2687 );
2688
2689 if ($self->{anim} && $self->{animspeed}) {
2690 Scalar::Util::weaken (my $widget = $self);
2691
2692 $self->{timer} = Event->timer (
2693 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2694 hard => 1,
2695 interval => $self->{animspeed},
2696 cb => sub {
2697 ++$widget->{frame};
2698 $widget->update;
2699 },
2700 );
2701 }
2702
2703 $self
2454} 2704}
2455 2705
2456sub size_request { 2706sub size_request {
2457 (32, 8) 2707 (32, 8)
2458} 2708}
2459 2709
2710sub update {
2711 my ($self) = @_;
2712
2713 return unless $self->{visible};
2714
2715 $self->SUPER::update;
2716}
2717
2460sub _draw { 2718sub _draw {
2461 my ($self) = @_; 2719 my ($self) = @_;
2462 2720
2463 return unless $::CONN;#d# manage and cache textures differently 2721 return unless $::CONN;
2722
2723 my $face;
2724
2725 if ($self->{frame}) {
2726 my $anim = $::CONN->{anim}[$self->{anim}];
2727
2728 $face = $anim->[ $self->{frame} % @$anim ]
2729 if $anim && @$anim;
2730 }
2731
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2733
2466 # TODO animation
2467 if ($tex) { 2734 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2735 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2737 glColor 1, 1, 1, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2739 glDisable GL_TEXTURE_2D;
2473 } 2740 }
2474} 2741}
2475 2742
2476############################################################################# 2743sub DESTROY {
2744 my ($self) = @_;
2477 2745
2746 $self->{timer}->cancel
2747 if $self->{timer};
2748
2749 $self->SUPER::DESTROY;
2750}
2751
2752#############################################################################
2753
2478package CFClient::UI::InventoryItem; 2754package CFClient::UI::Inventory;
2479 2755
2480our @ISA = CFClient::UI::HBox::; 2756our @ISA = CFClient::UI::ScrolledWindow::;
2481 2757
2482sub new { 2758sub new {
2483 my $class = shift; 2759 my $class = shift;
2484 2760
2485 my %args = @_;
2486
2487 my $item = delete $args{item};
2488
2489 my $desc = $item->{nrof} < 2
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493
2494 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2495 can_hover => 1, 2762 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2496 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) {
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ],
2519 )->popup ($ev);
2520 }
2521
2522 1
2523 },
2524 %args
2525 );
2526
2527 $self->add (new CFClient::UI::Face
2528 can_events => 0,
2529 face => $item->{face},
2530 anim => $item->{anim},
2531 animspeed => $item->{animspeed},
2532 );
2533
2534 $self->add (new CFClient::UI::Label
2535 can_events => 0,
2536 text => $desc,
2537 );
2538
2539 $self
2540}
2541
2542#############################################################################
2543
2544package CFClient::UI::Inventory;
2545
2546our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 scrolled => (new CFClient::UI::VBox),
2553 @_, 2763 @_,
2554 ); 2764 );
2555 2765
2556 $self 2766 $self
2557} 2767}
… …
2567 or ($a->{name} cmp $b->{name}) 2777 or ($a->{name} cmp $b->{name})
2568 } @$items; 2778 } @$items;
2569 2779
2570 $self->{real_items} = \@items; 2780 $self->{real_items} = \@items;
2571 2781
2782 my $row = 0;
2572 for my $item (@items) { 2783 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2 2784 CFClient::Item::update_widgets $item;
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576 2785
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2786 $self->{scrolled}->add (0, $row, $item->{face_widget});
2578 } 2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2579 2789
2580 $self->{scrolled}->add (@items); 2790 $row++;
2581 2791 }
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583}
2584
2585sub size_request {
2586 my ($self) = @_;
2587 ($self->{req_w}, $self->{req_h});
2588} 2792}
2589 2793
2590############################################################################# 2794#############################################################################
2591 2795
2592package CFClient::UI::Menu; 2796package CFClient::UI::Menu;
… …
2627 2831
2628# popup given the event (must be a mouse button down event currently) 2832# popup given the event (must be a mouse button down event currently)
2629sub popup { 2833sub popup {
2630 my ($self, $ev) = @_; 2834 my ($self, $ev) = @_;
2631 2835
2632 $self->emit ("popdown"); 2836 $self->_emit ("popdown");
2633 2837
2634 # maybe save $GRAB? must be careful about events... 2838 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self; 2839 $GRAB = $self;
2636 $self->{button} = $ev->{button}; 2840 $self->{button} = $ev->{button};
2637 2841
… …
2652 2856
2653 if ($ev->{button} == $self->{button}) { 2857 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB; 2858 undef $GRAB;
2655 $self->hide; 2859 $self->hide;
2656 2860
2657 $self->emit ("popdown"); 2861 $self->_emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover}; 2862 $self->{hover}[1]->() if $self->{hover};
2659 } 2863 }
2660} 2864}
2661 2865
2662############################################################################# 2866#############################################################################
2663 2867
2664package CFClient::UI::Statusbox; 2868package CFClient::UI::Statusbox;
2665 2869
2666our @ISA = CFClient::UI::VBox::; 2870our @ISA = CFClient::UI::VBox::;
2871
2872sub new {
2873 my $class = shift;
2874
2875 $class->SUPER::new (
2876 fontsize => 0.8,
2877 @_,
2878 )
2879}
2667 2880
2668sub reorder { 2881sub reorder {
2669 my ($self) = @_; 2882 my ($self) = @_;
2670 my $NOW = time; 2883 my $NOW = time;
2671 2884
… …
2690 ? "<b>$item->{count} ×</b> $item->{text}" 2903 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 2904 : $item->{text};
2692 2905
2693 for ($short) { 2906 for ($short) {
2694 s/^\s+//; 2907 s/^\s+//;
2695 s/\012.*/…/s; 2908 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 2909 }
2699 2910
2700 new CFClient::UI::Label 2911 new CFClient::UI::Label
2701 markup => $short, 2912 markup => $short,
2702 tooltip => $item->{tooltip}, 2913 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 2914 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 2915 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 2916 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44,
2706 color => $item->{color}, 2918 fg => $item->{fg},
2707 can_events => 1, 2919 can_events => 1,
2708 can_hover => 1 2920 can_hover => 1
2709 }; 2921 };
2710 } 2922 }
2711 2923
… …
2716sub add { 2928sub add {
2717 my ($self, $text, %arg) = @_; 2929 my ($self, $text, %arg) = @_;
2718 2930
2719 $text =~ s/^\s+//; 2931 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//; 2932 $text =~ s/\s+$//;
2933
2934 return unless $text;
2721 2935
2722 my $timeout = time + ((delete $arg{timeout}) || 60); 2936 my $timeout = time + ((delete $arg{timeout}) || 60);
2723 2937
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725 2939
… …
2737 $self->{item}{$group} = { 2951 $self->{item}{$group} = {
2738 id => ++$self->{id}, 2952 id => ++$self->{id},
2739 text => $text, 2953 text => $text,
2740 timeout => $timeout, 2954 timeout => $timeout,
2741 tooltip => $text, 2955 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 2956 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 2957 pri => 0,
2745 count => 1, 2958 count => 1,
2746 %arg, 2959 %arg,
2747 }; 2960 };
2748 } 2961 }
2749 2962
2750 $self->reorder; 2963 $self->reorder;
2751} 2964}
2752 2965
2966sub reconfigure {
2967 my ($self) = @_;
2968
2969 delete $_->{label}
2970 for values %{ $self->{item} || {} };
2971
2972 $self->reorder;
2973 $self->SUPER::reconfigure;
2974}
2975
2753############################################################################# 2976#############################################################################
2754 2977
2755package CFClient::UI::Root; 2978package CFClient::UI::Root;
2756 2979
2757our @ISA = CFClient::UI::Container::; 2980our @ISA = CFClient::UI::Container::;
… …
2759use CFClient::OpenGL; 2982use CFClient::OpenGL;
2760 2983
2761sub new { 2984sub new {
2762 my $class = shift; 2985 my $class = shift;
2763 2986
2764 $class->SUPER::new ( 2987 my $self = $class->SUPER::new (
2988 visible => 1,
2765 @_, 2989 @_,
2766 ) 2990 );
2991
2992 Scalar::Util::weaken ($self->{root} = $self);
2993
2994 $self
2767} 2995}
2768 2996
2769sub configure { 2997sub configure {
2770 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
2771 2999
2772 $self->{w} = $w; 3000 $self->{w} = $w;
2773 $self->{h} = $h; 3001 $self->{h} = $h;
2774} 3002}
2775 3003
2776sub check_size { 3004sub reconfigure {
2777 my ($self) = @_; 3005 my ($self) = @_;
2778 3006
3007 $self->SUPER::reconfigure;
3008
2779 $self->size_allocate ($self->{w}, $self->{h}) 3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
2780 if $self->{w}; 3010 if $self->{w};
2781} 3011}
2782 3012
2783sub size_request { 3013sub size_request {
2784 my ($self) = @_; 3014 my ($self) = @_;
2785 3015
2786 ($self->{w}, $self->{h}) 3016 ($self->{w}, $self->{h})
2787} 3017}
2788 3018
2789sub size_allocate { 3019sub size_allocate {
2790 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h, $changed) = @_;
2791
2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797 3021
2798 for my $child ($self->children) { 3022 for my $child ($self->children) {
2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800 3024
3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3026 if exists $child->{req_x};
3027
3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3029 if exists $child->{req_y};
3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035
2803 $child->configure ($X, $Y, $W, $H); 3036 $child->configure ($X, $Y, $W, $H);
2804 } 3037 }
2805} 3038}
2806 3039
2807sub coord2local { 3040sub coord2local {
… …
2817} 3050}
2818 3051
2819sub update { 3052sub update {
2820 my ($self) = @_; 3053 my ($self) = @_;
2821 3054
2822 $self->check_size;
2823 $::WANT_REFRESH++; 3055 $::WANT_REFRESH++;
2824} 3056}
2825 3057
2826sub add { 3058sub add {
2827 my ($self, @children) = @_; 3059 my ($self, @children) = @_;
2828 3060
2829 for my $child (@children) { 3061 for my $child (@children) {
2830 $child->{toplevel} = 1; 3062 $child->{is_toplevel} = 1;
2831 3063
2832 # integerise window positions 3064 # integerise window positions
2833 $child->{x} = int $child->{x}; 3065 $child->{x} = int $child->{x};
2834 $child->{y} = int $child->{y}; 3066 $child->{y} = int $child->{y};
2835 } 3067 }
2836 3068
2837 $self->SUPER::add (@children); 3069 $self->SUPER::add (@children);
2838} 3070}
2839 3071
3072sub remove {
3073 my ($self, @children) = @_;
3074
3075 $self->SUPER::remove (@children);
3076
3077 while (@children) {
3078 my $w = pop @children;
3079 push @children, $w->children;
3080 $w->set_invisible;
3081 }
3082}
3083
2840sub on_refresh { 3084sub on_refresh {
2841 my ($self, $id, $cb) = @_; 3085 my ($self, $id, $cb) = @_;
2842 3086
2843 $self->{refresh_hook}{$id} = $cb; 3087 $self->{refresh_hook}{$id} = $cb;
2844} 3088}
… …
2855 while ($self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
2856 $_->() 3100 $_->()
2857 for values %{delete $self->{refresh_hook}}; 3101 for values %{delete $self->{refresh_hook}};
2858 } 3102 }
2859 3103
2860 if ($self->{check_size}) { 3104 if ($self->{realloc}) {
2861 my @queue = ([], []); 3105 my @queue;
2862 3106
2863 for (;;) { 3107 while () {
2864 if ($self->{check_size}) { 3108 if ($self->{realloc}) {
2865 # heuristic: check containers last 3109 #TODO use array-of-depth approach
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3110
2867 for values %{delete $self->{check_size}} 3111 @queue = sort { $a->{visible} <=> $b->{visible} }
3112 @queue, values %{delete $self->{realloc}};
2868 } 3113 }
2869 3114
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3115 my $widget = pop @queue || last;
2871 3116
3117 $widget->{visible} or last; # do not resize invisible widgets
3118
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2873 ? @$widget{qw(user_w user_h)} 3120 ? @$widget{qw(def_w def_h)}
2874 : $widget->size_request; 3121 : $widget->size_request;
2875 3122
2876 if (delete $widget->{force_alloc}
2877 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879 3124
2880 $widget->{req_w} = $w; 3125 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h; 3126 $widget->{req_h} = $h;
2882 3127
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2884 3129
2885 $widget->{parent}->check_size 3130 push @queue, $widget->{parent}
2886 if $widget->{parent}; 3131 if $widget->{parent};
2887 }
2888 } 3132 }
2889 } 3133 }
2890 3134
2891 while ($self->{size_alloc}) { 3135 while (my $size_alloc = delete $self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) { 3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2893 my ($widget, $w, $h) = @$_; 3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
2894 3141
2895 $w = 0 if $w < 0; 3142 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0; 3143 $h = 0 if $h < 0;
2897 3144
2898 $widget->{w} = $w; 3145 $widget->{w} = $w;
2899 $widget->{h} = $h; 3146 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h);
2901 $widget->emit (size_allocate => $w, $h); 3147 $widget->emit (size_allocate => $w, $h, 1);
2902 } 3148 }
2903 } 3149 }
2904 3150
2905 while ($self->{post_alloc_hook}) { 3151 while ($self->{post_alloc_hook}) {
2906 $_->() 3152 $_->()
… …
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 3158 glClear GL_COLOR_BUFFER_BIT;
2913 3159
2914 glMatrixMode GL_PROJECTION; 3160 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 3161 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 3163 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 3164 glLoadIdentity;
2919 3165
2920 $self->_draw; 3166 $self->_draw;
2921} 3167}
… …
2923############################################################################# 3169#############################################################################
2924 3170
2925package CFClient::UI; 3171package CFClient::UI;
2926 3172
2927$ROOT = new CFClient::UI::Root; 3173$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3174$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3175
29301 31761
2931 3177

Diff Legend

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