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.201 by root, Sat May 13 23:17:49 2006 UTC vs.
Revision 1.252 by root, Sun May 28 23:21:28 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;
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}
16 38
17sub check_tooltip { 39sub check_tooltip {
18 if (!$GRAB) { 40 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
25 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
26 48
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 50
29 $TOOLTIP->set_tooltip_from ($widget); 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);
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 60 }
42 61
43 return; 62 return;
44 } 63 }
45 } 64 }
… …
49 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
50} 69}
51 70
52# class methods for events 71# class methods for events
53sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 73 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 74 if $FOCUS;
56} 75}
57 76
58sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 78 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 79 if $FOCUS;
61} 80}
62 81
63sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
64 my ($ev) = @_; 83 my ($ev) = @_;
… …
73 check_tooltip; 92 check_tooltip;
74 } 93 }
75 94
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 96
78 if ($GRAB) { 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79 ($x, $y) = $GRAB->coord2local ($x, $y); 98 if $GRAB;
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
82} 99}
83 100
84sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
85 my ($ev) = @_; 102 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
87 104
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89 106
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 108
92 if ($GRAB) { 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 ($x, $y) = $GRAB->coord2local ($x, $y); 110 if $GRAB;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 111
97 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 114 $grab->update if $grab;
100 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
116 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
117 132
118 check_tooltip; 133 check_tooltip;
119 } 134 }
120 135
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124 } 137 if $HOVER;
125} 138}
126 139
127# convert position array to integers 140# convert position array to integers
128sub harmonize { 141sub harmonize {
129 my ($vals) = @_; 142 my ($vals) = @_;
… …
133 for (@$vals) { 146 for (@$vals) {
134 my $i = int $_ + $rem; 147 my $i = int $_ + $rem;
135 $rem += $_ - $i; 148 $rem += $_ - $i;
136 $_ = $i; 149 $_ = $i;
137 } 150 }
151}
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;
138} 185}
139 186
140############################################################################# 187#############################################################################
141 188
142package CFClient::UI::Base; 189package CFClient::UI::Base;
… …
155 can_events => 1, 202 can_events => 1,
156 @_ 203 @_
157 }, $class; 204 }, $class;
158 205
159 for (keys %$self) { 206 for (keys %$self) {
160 if (/^connect_(.*)$/) { 207 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 208 $self->connect ($1 => delete $self->{$_});
162 } 209 }
163 } 210 }
164 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
165 $self 221 $self
166} 222}
167 223
168sub destroy { 224sub destroy {
169 my ($self) = @_; 225 my ($self) = @_;
… …
178 return if $self->{parent}; 234 return if $self->{parent};
179 235
180 $CFClient::UI::ROOT->add ($self); 236 $CFClient::UI::ROOT->add ($self);
181} 237}
182 238
183sub hide { 239sub center {
184 my ($self) = @_; 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};
185 275
186 undef $GRAB if $GRAB == $self; 276 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $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
304sub hide {
305 my ($self) = @_;
306
307 $self->set_invisible;
188 308
189 $self->{parent}->remove ($self) 309 $self->{parent}->remove ($self)
190 if $self->{parent}; 310 if $self->{parent};
191} 311}
192 312
… …
201} 321}
202 322
203sub set_size { 323sub set_size {
204 my ($self, $w, $h) = @_; 324 my ($self, $w, $h) = @_;
205 325
206 $self->{user_w} = $w; 326 $self->{def_w} = $w;
207 $self->{user_h} = $h; 327 $self->{def_h} = $h;
208 328
209 $self->check_size; 329 $self->realloc;
210} 330}
211 331
212sub size_request { 332sub size_request {
213 require Carp; 333 require Carp;
214 Carp::confess "size_request is abstract"; 334 Carp::confess "size_request is abstract";
… …
234 $self->{y} = $y; 354 $self->{y} = $y;
235 $self->update; 355 $self->update;
236 } 356 }
237 357
238 if ($self->{w} != $w || $self->{h} != $h) { 358 if ($self->{w} != $w || $self->{h} != $h) {
359 return unless $self->{visible};
360
239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
240 } 362 }
241} 363}
242 364
243sub size_allocate { 365sub size_allocate {
244 # nothing to be done 366 # nothing to be done
245} 367}
246 368
247sub children { 369sub children {
248} 370}
249 371
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259}
260
261sub set_max_size { 372sub set_max_size {
262 my ($self, $w, $h) = @_; 373 my ($self, $w, $h) = @_;
263 374
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 375 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 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 }
266} 393}
267 394
268# translate global coordinates to local coordinate system 395# translate global coordinates to local coordinate system
269sub coord2local { 396sub coord2local {
270 my ($self, $x, $y) = @_; 397 my ($self, $x, $y) = @_;
… …
285 return if $FOCUS == $self; 412 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 413 return unless $self->{can_focus};
287 414
288 my $focus = $FOCUS; $FOCUS = $self; 415 my $focus = $FOCUS; $FOCUS = $self;
289 416
290 $self->emit (focus_in => $focus); 417 $self->_emit (focus_in => $focus);
291 418
292 $focus->update if $focus; 419 $focus->update if $focus;
293 $FOCUS->update; 420 $FOCUS->update;
294} 421}
295 422
… …
298 425
299 return unless $FOCUS == $self; 426 return unless $FOCUS == $self;
300 427
301 my $focus = $FOCUS; undef $FOCUS; 428 my $focus = $FOCUS; undef $FOCUS;
302 429
303 $self->emit (focus_out => $focus); 430 $self->_emit (focus_out => $focus);
304 431
305 $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;
306} 436}
307 437
308sub mouse_motion { } 438sub mouse_motion { }
309sub button_up { } 439sub button_up { }
310sub key_down { } 440sub key_down { }
311sub key_up { } 441sub key_up { }
312 442
313sub button_down { 443sub button_down {
314 my ($self, $ev, $x, $y) = @_; 444 my ($self, $ev, $x, $y) = @_;
315 445
316 $self->focus_in; 446 $self->focus_in;
… …
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 449sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 450sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 451sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 452sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
323sub 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}
324 517
325sub draw { 518sub draw {
326 my ($self) = @_; 519 my ($self) = @_;
327 520
328 return unless $self->{h} && $self->{w}; 521 return unless $self->{h} && $self->{w};
… …
350 if ($ENV{PCLIENT_DEBUG}) { 543 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix; 544 glPushMatrix;
352 glColor 1, 1, 0, 1; 545 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 546 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP; 547 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 548 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 549 glVertex $self->{w} - 1, 0;
357 glVertex $self->{w}, $self->{h}; 550 glVertex $self->{w} - 1, $self->{h} - 1;
358 glVertex 0 , $self->{h}; 551 glVertex 0 , $self->{h} - 1;
359 glEnd; 552 glEnd;
360 glPopMatrix; 553 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 554 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 555 }
363} 556}
364 557
365sub _draw { 558sub _draw {
366 my ($self) = @_; 559 my ($self) = @_;
367 560
368 warn "no draw defined for $self\n"; 561 warn "no draw defined for $self\n";
369} 562}
370 563
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
391}
392
393sub check_size {
394 my ($self, $forced) = @_;
395
396 $self->{force_alloc} = 1 if $forced;
397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
398}
399
400sub update {
401 my ($self) = @_;
402
403 $self->{parent}->update
404 if $self->{parent};
405}
406
407sub connect {
408 my ($self, $signal, $cb) = @_;
409
410 push @{ $self->{signal_cb}{$signal} }, $cb;
411}
412
413sub emit {
414 my ($self, $signal, @args) = @_;
415
416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
417}
418
419sub DESTROY { 564sub DESTROY {
420 my ($self) = @_; 565 my ($self) = @_;
421 566
567 delete $WIDGET{$self+0};
422 #$self->deactivate; 568 #$self->deactivate;
423} 569}
424 570
425############################################################################# 571#############################################################################
426 572
… …
435 my $class = shift; 581 my $class = shift;
436 582
437 # range [value, low, high, page] 583 # range [value, low, high, page]
438 584
439 $class->SUPER::new ( 585 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 586 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 587 #active_bg => [1, 1, 1, 0.5],
442 @_ 588 @_
443 ) 589 )
444} 590}
445 591
446sub _draw { 592sub _draw {
447 my ($self) = @_; 593 my ($self) = @_;
448 594
595 my $color = $FOCUS == $self && $self->{active_bg}
596 ? $self->{active_bg}
597 : $self->{bg};
598
599 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 600 my ($w, $h) = @$self{qw(w h)};
450 601
451 glEnable GL_BLEND; 602 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 604 glColor @$color;
454 605
455 glBegin GL_QUADS; 606 glBegin GL_QUADS;
456 glVertex 0 , 0; 607 glVertex 0 , 0;
457 glVertex 0 , $h; 608 glVertex 0 , $h;
458 glVertex $w, $h; 609 glVertex $w, $h;
459 glVertex $w, 0; 610 glVertex $w, 0;
460 glEnd; 611 glEnd;
461 612
462 glDisable GL_BLEND; 613 glDisable GL_BLEND;
614 }
463} 615}
464 616
465############################################################################# 617#############################################################################
466 618
467package CFClient::UI::Empty; 619package CFClient::UI::Empty;
… …
511 $self->{children} = [ 663 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 664 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 665 @{$self->{children}}, @widgets
514 ]; 666 ];
515 667
516 $self->check_size (1); 668 $self->realloc;
517 $self->update;
518} 669}
519 670
520sub children { 671sub children {
521 @{ $_[0]{children} } 672 @{ $_[0]{children} }
522} 673}
… …
527 delete $child->{parent}; 678 delete $child->{parent};
528 $child->hide; 679 $child->hide;
529 680
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531 682
532 $self->check_size; 683 $self->realloc;
533 $self->update;
534} 684}
535 685
536sub clear { 686sub clear {
537 my ($self) = @_; 687 my ($self) = @_;
538 688
… …
542 for (@$children) { 692 for (@$children) {
543 delete $_->{parent}; 693 delete $_->{parent};
544 $_->hide; 694 $_->hide;
545 } 695 }
546 696
547 $self->check_size; 697 $self->realloc;
548 $self->update;
549} 698}
550 699
551sub find_widget { 700sub find_widget {
552 my ($self, $x, $y) = @_; 701 my ($self, $x, $y) = @_;
553 702
… …
606sub size_request { 755sub size_request {
607 $_[0]{children}[0]->size_request 756 $_[0]{children}[0]->size_request
608} 757}
609 758
610sub size_allocate { 759sub size_allocate {
611 my ($self, $w, $h) = @_; 760 my ($self, $w, $h, $changed) = @_;
612 761
613 $self->{children}[0]->configure (0, 0, $w, $h); 762 $self->{children}[0]->configure (0, 0, $w, $h);
614} 763}
615 764
616############################################################################# 765#############################################################################
… …
633 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 782 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 783 $self->SUPER::update;
635} 784}
636 785
637sub size_allocate { 786sub size_allocate {
638 my ($self, $w, $h) = @_; 787 my ($self, $w, $h, $changed) = @_;
639 788
640 $self->SUPER::size_allocate ($w, $h); 789 $self->SUPER::size_allocate ($w, $h, $changed);
641 $self->update; 790 $self->update
791 if $changed;
642} 792}
643 793
644sub _render { 794sub _render {
645 $_[0]{children}[0]->draw; 795 $_[0]{children}[0]->draw;
646} 796}
… …
651 $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 {
652 glClearColor 0, 0, 0, 0; 802 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 803 glClear GL_COLOR_BUFFER_BIT;
654 804
655 $self->_render; 805 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 806 };
664} 807}
665 808
666sub _draw { 809sub _draw {
667 my ($self) = @_; 810 my ($self) = @_;
… …
671 my $tex = $self->{texture} 814 my $tex = $self->{texture}
672 or return; 815 or return;
673 816
674 glEnable GL_TEXTURE_2D; 817 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 818 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 819 glColor 1, 1, 1, 1;
677 820
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 821 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 822
680 glDisable GL_TEXTURE_2D; 823 glDisable GL_TEXTURE_2D;
681} 824}
… …
684 827
685package CFClient::UI::ViewPort; 828package CFClient::UI::ViewPort;
686 829
687our @ISA = CFClient::UI::Window::; 830our @ISA = CFClient::UI::Window::;
688 831
832sub new {
833 my $class = shift;
834
835 $class->SUPER::new (
836 scroll_x => 0,
837 scroll_y => 1,
838 @_,
839 )
840}
841
689sub size_request { 842sub size_request {
690 my ($self) = @_; 843 my ($self) = @_;
691 844
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 845 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 846
695 @$self{qw(child_w child_h)} 847 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y};
849
850 ($w, $h)
696} 851}
697 852
698sub size_allocate { 853sub size_allocate {
699 my ($self, $w, $h) = @_; 854 my ($self, $w, $h, $changed) = @_;
700 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);
701 $self->update; 860 $self->update;
702} 861}
703 862
704sub set_offset { 863sub set_offset {
705 my ($self, $x, $y) = @_; 864 my ($self, $x, $y) = @_;
… …
756 my $class = shift; 915 my $class = shift;
757 916
758 my $self; 917 my $self;
759 918
760 my $slider = new CFClient::UI::Slider 919 my $slider = new CFClient::UI::Slider
761 vertical => 1, 920 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 921 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 922 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 923 $self->{vp}->set_offset (0, $_[1]);
765 }, 924 },
766 ; 925 ;
767 926
768 $self = $class->SUPER::new ( 927 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 928 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 929 slider => $slider,
771 @_, 930 @_,
772 ); 931 );
773 932
774 $self->{vp}->add ($self->{scrolled}); 933 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp}); 934 $self->add ($self->{vp});
776 $self->add ($self->{slider}); 935 $self->add ($self->{slider});
777 936
778 $self 937 $self
938}
939
940sub update {
941 my ($self) = @_;
942
943 $self->SUPER::update;
944
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]);
948}
949
950sub size_allocate {
951 my ($self, $w, $h, $changed) = @_;
952
953 $self->SUPER::size_allocate ($w, $h, $changed);
954
955 my $child = $self->{vp}->child;
956 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
779} 957}
780 958
781#TODO# update range on size_allocate depending on child 959#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 960# update viewport offset on scroll
783 961
… …
834 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);
835 1013
836sub new { 1014sub new {
837 my $class = shift; 1015 my $class = shift;
838 1016
839 # TODO: user_x, user_y, overwrite moveto?
840
841 my $self = $class->SUPER::new ( 1017 my $self = $class->SUPER::new (
842 bg => [1, 1, 1, 1], 1018 bg => [1, 1, 1, 1],
843 border_bg => [1, 1, 1, 1], 1019 border_bg => [1, 1, 1, 1],
844 border => 0.6, 1020 border => 0.6,
1021 is_toplevel => 1,
845 can_events => 1, 1022 can_events => 1,
846 @_ 1023 @_
847 ); 1024 );
848 1025
849 $self->{title} &&= new CFClient::UI::Label 1026 $self->{title} &&= new CFClient::UI::Label
850 align => 0, 1027 align => 0,
… …
869 $h + $self->border * 2, 1046 $h + $self->border * 2,
870 ) 1047 )
871} 1048}
872 1049
873sub size_allocate { 1050sub size_allocate {
874 my ($self, $w, $h) = @_; 1051 my ($self, $w, $h, $changed) = @_;
1052
1053 return unless $changed;
875 1054
876 $h -= List::Util::max 0, $self->border * 2; 1055 $h -= List::Util::max 0, $self->border * 2;
877 $w -= List::Util::max 0, $self->border * 2; 1056 $w -= List::Util::max 0, $self->border * 2;
878 1057
879 $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)
880 if $self->{title}; 1059 if $self->{title};
881 1060
882 $self->child->configure ($self->border, $self->border, $w, $h); 1061 $self->child->configure ($self->border, $self->border, $w, $h);
883} 1062}
884 1063
… …
903 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
904 1083
905 my $dx = $ev->{x} - $ox; 1084 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy; 1085 my $dy = $ev->{y} - $oy;
907 1086
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1091 $self->move ($self->{user_x}, $self->{user_y});
911 $self->check_size; 1092 $self->realloc;
912 }; 1093 };
913 1094
914 } elsif ($lr ^ $td) { 1095 } elsif ($lr ^ $td) {
915 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1096 my ($ox, $oy) = ($ev->{x}, $ev->{y});
916 my ($bx, $by) = ($self->{x}, $self->{y}); 1097 my ($bx, $by) = ($self->{x}, $self->{y});
… …
918 $self->{motion} = sub { 1099 $self->{motion} = sub {
919 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
920 1101
921 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 ($x, $y) = ($ev->{x}, $ev->{y});
922 1103
923 $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});
924 $self->update; 1108 $self->realloc;
925 }; 1109 };
926 } 1110 }
927} 1111}
928 1112
929sub button_up { 1113sub button_up {
… …
990sub new { 1174sub new {
991 my $class = shift; 1175 my $class = shift;
992 1176
993 $class->SUPER::new ( 1177 $class->SUPER::new (
994 col_expand => [], 1178 col_expand => [],
995 @_ 1179 @_,
996 ) 1180 )
1181}
1182
1183sub children {
1184 grep $_, map @$_, grep $_, @{ $_[0]{children} }
997} 1185}
998 1186
999sub add { 1187sub add {
1000 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1001 1189
1002 $child->set_parent ($self); 1190 $child->set_parent ($self);
1003 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1004 1192
1005 $child->check_size; 1193 $self->realloc;
1006} 1194}
1007 1195
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010}
1011
1012# 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?
1013sub clear { 1197sub clear {
1014 my ($self) = @_; 1198 my ($self) = @_;
1015 1199
1016 my @children = $self->children; 1200 my @children = $self->children;
1017 delete $self->{children}; 1201 delete $self->{children};
… …
1019 for (@children) { 1203 for (@children) {
1020 delete $_->{parent}; 1204 delete $_->{parent};
1021 $_->hide; 1205 $_->hide;
1022 } 1206 }
1023 1207
1024 $self->update; 1208 $self->realloc;
1025} 1209}
1026 1210
1027sub get_wh { 1211sub get_wh {
1028 my ($self) = @_; 1212 my ($self) = @_;
1029 1213
… …
1056 (sum @$hs), 1240 (sum @$hs),
1057 ) 1241 )
1058} 1242}
1059 1243
1060sub size_allocate { 1244sub size_allocate {
1061 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1062 1246
1063 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1064 1248
1065 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
1066 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
1067 1251
1068 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
1069 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
1070 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
1071 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1125 } 1309 }
1126} 1310}
1127 1311
1128############################################################################# 1312#############################################################################
1129 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
1130package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1131 1375
1132# TODO: wrap into common Box base class
1133
1134our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1135 1377
1136sub size_request { 1378sub new {
1137 my ($self) = @_; 1379 my $class = shift;
1138 1380
1139 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1140 1382 vertical => 0,
1141 ( 1383 @_,
1142 (List::Util::sum map $_->[0], @alloc),
1143 (List::Util::max map $_->[1], @alloc),
1144 ) 1384 )
1145} 1385}
1146 1386
1147sub size_allocate {
1148 my ($self, $w, $h) = @_;
1149
1150 ($h, $w) = ($w, $h);
1151
1152 my $children = $self->{children};
1153
1154 my @h = map $_->{req_w}, @$children;
1155
1156 my $req_h = List::Util::sum @h;
1157
1158 if ($req_h > $h) {
1159 # ah well, not enough space
1160 $_ *= $h / $req_h for @h;
1161 } else {
1162 my $exp = List::Util::sum map $_->{expand}, @$children;
1163 $exp ||= 1;
1164
1165 for (0 .. $#$children) {
1166 my $child = $children->[$_];
1167
1168 my $alloc_h = $h[$_];
1169 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1170 $h[$_] = $alloc_h;
1171 }
1172 }
1173
1174 CFClient::UI::harmonize \@h;
1175
1176 my $y = 0;
1177 for (0 .. $#$children) {
1178 my $child = $children->[$_];
1179 my $h = $h[$_];
1180 $child->configure ($y, 0, $h, $w);
1181
1182 $y += $h;
1183 }
1184
1185 1
1186}
1187
1188############################################################################# 1387#############################################################################
1189 1388
1190package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1191 1390
1192# TODO: wrap into common Box base class
1193
1194our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1195 1392
1196sub size_request { 1393sub new {
1197 my ($self) = @_; 1394 my $class = shift;
1198 1395
1199 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1200 1397 vertical => 1,
1201 ( 1398 @_,
1202 (List::Util::max map $_->[0], @alloc),
1203 (List::Util::sum map $_->[1], @alloc),
1204 ) 1399 )
1205} 1400}
1206 1401
1207sub size_allocate {
1208 my ($self, $w, $h) = @_;
1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1212 my $children = $self->{children};
1213
1214 my @h = map $_->{req_h}, @$children;
1215
1216 my $req_h = List::Util::sum @h;
1217
1218 if ($req_h > $h) {
1219 # ah well, not enough space
1220 $_ *= $h / $req_h for @h;
1221 } else {
1222 my $exp = List::Util::sum map $_->{expand}, @$children;
1223 $exp ||= 1;
1224
1225 for (0 .. $#$children) {
1226 my $child = $children->[$_];
1227
1228 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1229 }
1230 }
1231
1232 CFClient::UI::harmonize \@h;
1233
1234 my $y = 0;
1235 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_];
1238 $child->configure (0, $y, $w, $h);
1239
1240 $y += $h;
1241 }
1242
1243 1
1244}
1245
1246############################################################################# 1402#############################################################################
1247 1403
1248package CFClient::UI::Label; 1404package CFClient::UI::Label;
1249 1405
1250our @ISA = CFClient::UI::Base::; 1406our @ISA = CFClient::UI::DrawBG::;
1251 1407
1252use CFClient::OpenGL; 1408use CFClient::OpenGL;
1253 1409
1254sub new { 1410sub new {
1255 my ($class, %arg) = @_; 1411 my ($class, %arg) = @_;
1256 1412
1257 my $self = $class->SUPER::new ( 1413 my $self = $class->SUPER::new (
1258 fg => [1, 1, 1], 1414 fg => [1, 1, 1],
1415 #bg => none
1416 #active_bg => none
1259 #font => default_font 1417 #font => default_font
1260 #text => initial text 1418 #text => initial text
1261 #markup => initial narkup 1419 #markup => initial narkup
1420 #max_w => maximum pixel width
1421 ellipsise => 3, # end
1262 layout => (new CFClient::Layout), 1422 layout => (new CFClient::Layout),
1263 fontsize => 1, 1423 fontsize => 1,
1264 align => -1, 1424 align => -1,
1265 valign => -1, 1425 valign => -1,
1266 padding => 2, 1426 padding => 2,
… …
1281 } 1441 }
1282 1442
1283 $self 1443 $self
1284} 1444}
1285 1445
1286sub escape { 1446sub escape($) {
1287 local $_ = $_[1]; 1447 local $_ = $_[0];
1288 1448
1289 s/&/&amp;/g; 1449 s/&/&amp;/g;
1290 s/>/&gt;/g; 1450 s/>/&gt;/g;
1291 s/</&lt;/g; 1451 s/</&lt;/g;
1292 1452
1293 $_[1] 1453 $_
1294} 1454}
1295 1455
1296sub update { 1456sub update {
1297 my ($self) = @_; 1457 my ($self) = @_;
1298 1458
… …
1307 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1308 1468
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1310 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1311 1471
1472 $self->realloc;
1312 $self->update; 1473 $self->update;
1313 $self->check_size;
1314} 1474}
1315 1475
1316sub set_markup { 1476sub set_markup {
1317 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1318 1478
… …
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323 1483
1324 $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;
1325 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1326 1486
1487 $self->realloc;
1327 $self->update; 1488 $self->update;
1328 $self->check_size;
1329} 1489}
1330 1490
1331sub size_request { 1491sub size_request {
1332 my ($self) = @_; 1492 my ($self) = @_;
1333 1493
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1494 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1495 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1499
1338 my ($w, $h) = $self->{layout}->size; 1500 my ($w, $h) = $self->{layout}->size;
1339 1501
1340 if (exists $self->{template}) { 1502 if (exists $self->{template}) {
… …
1352 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1353 ) 1515 )
1354} 1516}
1355 1517
1356sub size_allocate { 1518sub size_allocate {
1357 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1358 1520
1359 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1360} 1523}
1361 1524
1362sub set_fontsize { 1525sub set_fontsize {
1363 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1364 1527
1365 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1366 delete $self->{texture}; 1529 delete $self->{texture};
1367 1530
1368 $self->update; 1531 $self->realloc;
1369 $self->check_size;
1370} 1532}
1371 1533
1372sub _draw { 1534sub _draw {
1373 my ($self) = @_; 1535 my ($self) = @_;
1536
1537 $self->SUPER::_draw; # draw background, if applicable
1374 1538
1375 my $tex = $self->{texture} ||= do { 1539 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 1540 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1541 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $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});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 1546
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1547 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382 1548
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5; 1551 : ($self->{w} - $tex->{w}) * 0.5);
1386 1552
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5; 1555 : ($self->{h} - $tex->{h}) * 0.5);
1390 1556
1391 $tex 1557 $tex
1392 }; 1558 };
1393 1559
1394 glEnable GL_TEXTURE_2D; 1560 glEnable GL_TEXTURE_2D;
… …
1422 active_fg => [0, 0, 0], 1588 active_fg => [0, 0, 0],
1423 can_hover => 1, 1589 can_hover => 1,
1424 can_focus => 1, 1590 can_focus => 1,
1425 valign => 0, 1591 valign => 0,
1426 can_events => 1, 1592 can_events => 1,
1593 #text => ...
1427 @_ 1594 @_
1428 ) 1595 )
1429} 1596}
1430 1597
1431sub _set_text { 1598sub _set_text {
… …
1441 $self->{text} = $text; 1608 $self->{text} = $text;
1442 1609
1443 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1445 1612
1446 $self->emit (changed => $self->{text}); 1613 $self->_emit (changed => $self->{text});
1447} 1614}
1448 1615
1449sub set_text { 1616sub set_text {
1450 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1451 1618
1452 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 1620 $self->_set_text ($text);
1454 $self->check_size; 1621
1455 $self->update; 1622 $self->realloc;
1456} 1623}
1457 1624
1458sub get_text { 1625sub get_text {
1459 $_[0]{text} 1626 $_[0]{text}
1460} 1627}
… …
1463 my ($self) = @_; 1630 my ($self) = @_;
1464 1631
1465 my ($w, $h) = $self->SUPER::size_request; 1632 my ($w, $h) = $self->SUPER::size_request;
1466 1633
1467 ($w + 1, $h) # add 1 for cursor 1634 ($w + 1, $h) # add 1 for cursor
1468}
1469
1470sub size_allocate {
1471 my ($self, $w, $h) = @_;
1472
1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474} 1635}
1475 1636
1476sub key_down { 1637sub key_down {
1477 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1478 1639
… …
1493 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1494 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1495 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1496 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1497 } elsif ($uni == 27) { 1658 } elsif ($uni == 27) {
1498 $self->emit ('escape'); 1659 $self->_emit ('escape');
1499 } elsif ($uni) { 1660 } elsif ($uni) {
1500 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1501 } 1662 }
1502 1663
1503 $self->_set_text ($text); 1664 $self->_set_text ($text);
1504 $self->update; 1665
1666 $self->realloc;
1505} 1667}
1506 1668
1507sub focus_in { 1669sub focus_in {
1508 my ($self) = @_; 1670 my ($self) = @_;
1509 1671
… …
1589 if ($sym == 13) { 1751 if ($sym == 13) {
1590 unshift @{$self->{history}}, 1752 unshift @{$self->{history}},
1591 my $txt = $self->get_text; 1753 my $txt = $self->get_text;
1592 $self->{history_pointer} = -1; 1754 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = ''; 1755 $self->{history_saveback} = '';
1594 $self->emit (activate => $txt); 1756 $self->_emit (activate => $txt);
1595 $self->update; 1757 $self->update;
1596 1758
1597 } elsif ($sym == CFClient::SDLK_UP) { 1759 } elsif ($sym == CFClient::SDLK_UP) {
1598 if ($self->{history_pointer} < 0) { 1760 if ($self->{history_pointer} < 0) {
1599 $self->{history_saveback} = $self->get_text; 1761 $self->{history_saveback} = $self->get_text;
… …
1638 my $class = shift; 1800 my $class = shift;
1639 1801
1640 $class->SUPER::new ( 1802 $class->SUPER::new (
1641 padding => 4, 1803 padding => 4,
1642 fg => [1, 1, 1], 1804 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 1805 active_fg => [0, 0, 1],
1645 can_hover => 1, 1806 can_hover => 1,
1646 align => 0, 1807 align => 0,
1647 valign => 0, 1808 valign => 0,
1648 can_events => 1, 1809 can_events => 1,
1649 @_ 1810 @_
1650 ) 1811 )
1651} 1812}
1652 1813
1814sub activate { }
1815
1653sub button_up { 1816sub button_up {
1654 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1655 1818
1819 $self->emit ("activate")
1656 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1657 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1658 $self->emit ("activate");
1659 }
1660} 1822}
1661 1823
1662sub _draw { 1824sub _draw {
1663 my ($self) = @_; 1825 my ($self) = @_;
1664 1826
… …
1696 1858
1697 $class->SUPER::new ( 1859 $class->SUPER::new (
1698 padding => 2, 1860 padding => 2,
1699 fg => [1, 1, 1], 1861 fg => [1, 1, 1],
1700 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],
1701 state => 0, 1865 state => 0,
1702 can_hover => 1, 1866 can_hover => 1,
1703 @_ 1867 @_
1704 ) 1868 )
1705} 1869}
… …
1714 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1715 1879
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1720 } 1884 }
1721} 1885}
1722 1886
1723sub _draw { 1887sub _draw {
1724 my ($self) = @_; 1888 my ($self) = @_;
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2153 qw(s1_slider.png s1_slider_bg.png);
1990 2154
1991sub new { 2155sub new {
1992 my $class = shift; 2156 my $class = shift;
1993 2157
1994 # range [value, low, high, page] 2158 # range [value, low, high, page, unit]
1995 2159
1996 # TODO: 0-width page 2160 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2161 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2162 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 2164 fg => [1, 1, 1],
2001 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],
2002 range => [0, 0, 100, 10], 2168 range => [0, 0, 100, 10, 0],
2003 req_w => $::WIDTH / 80, 2169 req_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2170 req_h => $::WIDTH / 80,
2005 vertical => 0, 2171 vertical => 0,
2006 can_hover => 1, 2172 can_hover => 1,
2007 inner_pad => 5, 2173 inner_pad => 0.02,
2008 @_ 2174 @_
2009 ); 2175 );
2010 2176
2177 $self->set_value ($self->{range}[0]);
2178 $self->update;
2179
2011 $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 }
2012} 2215}
2013 2216
2014sub size_request { 2217sub size_request {
2015 my ($self) = @_; 2218 my ($self) = @_;
2016 2219
… …
2022 2225
2023sub button_down { 2226sub button_down {
2024 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
2025 2228
2026 $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
2027 $self->mouse_motion ($ev, $x, $y); 2233 $self->mouse_motion ($ev, $x, $y);
2028} 2234}
2029 2235
2030sub mouse_motion { 2236sub mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2237 my ($self, $ev, $x, $y) = @_;
2032 2238
2033 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
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2256 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100;
2035 2258
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2259 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037 2260
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2261 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2262 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040 2263
2041 $x -= $inner_pad_px; # substract the padding 2264 $value = ($value - $lo) / $range;
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2265 $value = $value * $self->{scale} + $self->{offset};
2043 $x = $lo if $x < $lo;
2044 $x = $hi - $page if $x > $hi - $page;
2045 $self->{range}[0] = $x;
2046 2266
2047 $self->emit (changed => $x); 2267 $self->{knob_x} = $value - $knob_w * 0.5;
2048 $self->update; 2268 $self->{knob_w} = $knob_w;
2049 } 2269 });
2050}
2051 2270
2052# the inner_* stuff is for generating a padding for the slider handle, 2271 $self->SUPER::update;
2053# so that the handle doesn't leave the texture. This calculation isn't 100%
2054# correct propably, but it does the job for now
2055sub _calc_inner_pad_px {
2056 my ($self, $w) = @_;
2057 ($w / 100) * $self->{inner_pad} # % to pixels
2058} 2272}
2059 2273
2060sub _draw { 2274sub _draw {
2061 my ($self) = @_; 2275 my ($self) = @_;
2062 2276
2063 $self->SUPER::_draw (); 2277 $self->SUPER::_draw ();
2064 2278
2065 my ($w, $h) = @$self{qw(w h)}; 2279 glScale $self->{w}, $self->{h};
2066 2280
2067 if ($self->{vertical}) { 2281 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2282 # draw a vertical slider like a rotated horizontal slider
2069 2283
2284 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 2285 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2286 }
2075 2287
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2288 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2289 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2290
2079 my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081 $hi = $value + 1 if $lo == $hi;
2082
2083 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086 $page = int $page * $inner_w / ($hi - $lo);
2087 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089 $w -= $page;
2090 $page &= ~1;
2091 glTranslate $page * 0.5, 0, 0;
2092 $page ||= 2;
2093
2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097 glEnable GL_TEXTURE_2D; 2291 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2293
2100 # draw background 2294 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2295 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2296
2103 # draw handle 2297 # draw handle
2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2298 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2105 2299
2106 glDisable GL_TEXTURE_2D; 2300 glDisable GL_TEXTURE_2D;
2107} 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 (@_) }
2108 2343
2109############################################################################# 2344#############################################################################
2110 2345
2111package CFClient::UI::TextView; 2346package CFClient::UI::TextView;
2112 2347
… …
2142 2377
2143 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2144 $self->reflow; 2379 $self->reflow;
2145} 2380}
2146 2381
2147sub text_height {
2148 my ($self, $text) = @_;
2149
2150 my $layout = $self->{layout};
2151
2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153 $layout->set_width ($self->{children}[0]{w});
2154 $layout->set_markup ($text);
2155
2156 ($layout->size)[1]
2157}
2158
2159sub reflow {
2160 my ($self) = @_;
2161
2162 $self->{need_reflow}++;
2163 $self->update;
2164}
2165
2166sub size_allocate { 2382sub size_allocate {
2167 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2168 2384
2169 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2170 2388
2171 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2174 2392
2175 $self->reflow; 2393 $self->reflow;
2176} 2394}
2177 2395
2396sub text_size {
2397 my ($self, $text, $indent) = @_;
2398
2399 my $layout = $self->{layout};
2400
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $layout->set_width ($self->{children}[0]{w} - $indent);
2403 $layout->set_markup ($text);
2404
2405 $layout->size
2406}
2407
2408sub reflow {
2409 my ($self) = @_;
2410
2411 $self->{need_reflow}++;
2412 $self->update;
2413}
2414
2415sub set_offset {
2416 my ($self, $offset) = @_;
2417
2418 # todo: base offset on lines or so, not on pixels
2419 $self->{children}[1]->set_value ($offset);
2420}
2421
2422sub clear {
2423 my ($self) = @_;
2424
2425 $self->{par} = [];
2426 $self->{height} = 0;
2427 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2428}
2429
2178sub add_paragraph { 2430sub add_paragraph {
2179 my ($self, $color, $text) = @_; 2431 my ($self, $color, $text, $indent) = @_;
2180 2432
2181 #TODO: intelligently "reformat" paragraph 2433 for my $line (split /\n/, $text) {
2182 2434 my ($w, $h) = $self->text_size ($line);
2183 my $height = $self->text_height ($text);
2184
2185 $self->{height} += $height; 2435 $self->{height} += $h;
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2437 }
2186 2438
2187 push @{$self->{par}}, [$height, $color, $text];
2188
2189 $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]);
2190 $self->{children}[1]->update;
2191} 2440}
2192 2441
2193sub update { 2442sub update {
2194 my ($self) = @_; 2443 my ($self) = @_;
2195 2444
… …
2198 return unless $self->{h} > 0; 2447 return unless $self->{h} > 0;
2199 2448
2200 delete $self->{texture}; 2449 delete $self->{texture};
2201 2450
2202 $ROOT->on_post_alloc ($self, sub { 2451 $ROOT->on_post_alloc ($self, sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453
2203 if (delete $self->{need_reflow}) { 2454 if (delete $self->{need_reflow}) {
2204 my $height = 0; 2455 my $height = 0;
2205 2456
2206 $height += $_->[0] = $self->text_height ($_->[2]) 2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2207 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 }
2208 2472
2209 $self->{height} = $height; 2473 $self->{height} = $height;
2210 2474
2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212 2476
2213 delete $self->{texture}; 2477 delete $self->{texture};
2214 } 2478 }
2215 2479
2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2217 glClearColor 0, 0, 0, 0; 2481 glClearColor 0.5, 0.5, 0.5, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 2482 glClear GL_COLOR_BUFFER_BIT;
2219 2483
2220 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223 my $top = int $self->{children}[1]{range}[0]; 2484 my $top = int $self->{children}[1]{range}[0];
2224 2485
2225 my $y0 = $top; 2486 my $y0 = $top;
2226 my $y1 = $top + $self->{h}; 2487 my $y1 = $top + $H;
2227 2488
2228 my $y = 0; 2489 my $y = 0;
2229 2490
2230 my $layout = $self->{layout}; 2491 my $layout = $self->{layout};
2231 2492
2232 $layout->set_font ($self->{font}) if $self->{font}; 2493 $layout->set_font ($self->{font}) if $self->{font};
2233 2494
2495 glEnable GL_BLEND;
2496 #TODO# not correct in windows where rgba is forced off
2497 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2498
2234 for my $par (@{$self->{par}}) { 2499 for my $par (@{$self->{par}}) {
2235 my $h = $par->[0]; 2500 my $h = $par->[1];
2236 2501
2237 if ($y0 < $y + $h && $y < $y1) { 2502 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] }); 2503 $layout->set_foreground (@{ $par->[2] });
2504 $layout->set_width ($W - $par->[3]);
2239 $layout->set_markup ($par->[2]); 2505 $layout->set_markup ($par->[4]);
2240 2506
2241 my ($W, $H) = $layout->size; 2507 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2508
2509 glRasterPos $par->[3], $y - $y0;
2510 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2243 } 2511 }
2244 2512
2245 $y += $h; 2513 $y += $h;
2246 } 2514 }
2247 2515
2248 glDisable GL_TEXTURE_2D; 2516 glDisable GL_BLEND;
2249 }; 2517 };
2250 }); 2518 });
2251} 2519}
2252 2520
2253sub _draw { 2521sub _draw {
2254 my ($self) = @_; 2522 my ($self) = @_;
2255 2523
2256 glEnable GL_TEXTURE_2D; 2524 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 2526 glColor 1, 1, 1, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2527 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2260 glDisable GL_TEXTURE_2D; 2528 glDisable GL_TEXTURE_2D;
2261 2529
2262 $self->{children}[1]->draw; 2530 $self->{children}[1]->draw;
2263 2531
2264} 2532}
… …
2313 2581
2314sub new { 2582sub new {
2315 my $class = shift; 2583 my $class = shift;
2316 2584
2317 my $self = $class->SUPER::new ( 2585 my $self = $class->SUPER::new (
2318 state => 0, 2586 state => 0,
2319 connect_activate => \&toggle_flopper, 2587 on_activate => \&toggle_flopper,
2320 @_ 2588 @_
2321 ); 2589 );
2322 2590
2323 if ($self->{state}) {
2324 $self->{state} = 0;
2325 $self->toggle_flopper;
2326 }
2327
2328 $self 2591 $self
2329} 2592}
2330 2593
2331sub toggle_flopper { 2594sub toggle_flopper {
2332 my ($self) = @_; 2595 my ($self) = @_;
2333 2596
2334 # TODO: use animation 2597 $self->{other}->toggle_visibility;
2335 if ($self->{state} = !$self->{state}) {
2336 $CFClient::UI::ROOT->add ($self->{other});
2337 $self->{other}->move ($self->coord2global (0, $self->{h}));
2338 $self->emit ("open");
2339 } else {
2340 $CFClient::UI::ROOT->remove ($self->{other});
2341 $self->emit ("close");
2342 }
2343
2344 $self->emit (changed => $self->{state});
2345} 2598}
2346 2599
2347############################################################################# 2600#############################################################################
2348 2601
2349package CFClient::UI::Tooltip; 2602package CFClient::UI::Tooltip;
… …
2363 2616
2364sub set_tooltip_from { 2617sub set_tooltip_from {
2365 my ($self, $widget) = @_; 2618 my ($self, $widget) = @_;
2366 2619
2367 $self->add (new CFClient::UI::Label 2620 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip}, 2621 markup => $widget->{tooltip},
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 2623 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 2624 fg => [0, 0, 0, 1],
2625 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 2626 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 2627 );
2374} 2628}
2375 2629
2376sub size_request { 2630sub size_request {
2377 my ($self) = @_; 2631 my ($self) = @_;
… …
2380 2634
2381 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2382} 2636}
2383 2637
2384sub size_allocate { 2638sub size_allocate {
2385 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2386 2640
2641 return unless $changed;
2642
2387 $self->SUPER::size_allocate ($w - 4, $h - 4); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2388} 2644}
2389 2645
2390sub _draw { 2646sub _draw {
2391 my ($self) = @_; 2647 my ($self) = @_;
2392 2648
… …
2409 glVertex $w, $h; 2665 glVertex $w, $h;
2410 glVertex $w, 0; 2666 glVertex $w, 0;
2411 glEnd; 2667 glEnd;
2412 2668
2413 glTranslate 2 - 0.375, 2 - 0.375; 2669 glTranslate 2 - 0.375, 2 - 0.375;
2670
2414 $self->SUPER::_draw; 2671 $self->SUPER::_draw;
2415} 2672}
2416 2673
2417############################################################################# 2674#############################################################################
2418 2675
… …
2423use CFClient::OpenGL; 2680use CFClient::OpenGL;
2424 2681
2425sub new { 2682sub new {
2426 my $class = shift; 2683 my $class = shift;
2427 2684
2428 $class->SUPER::new ( 2685 my $self = $class->SUPER::new (
2429 aspect => 1, 2686 aspect => 1,
2687 can_events => 0,
2430 @_, 2688 @_,
2431 ) 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
2432} 2706}
2433 2707
2434sub size_request { 2708sub size_request {
2435 (32, 8) 2709 (32, 8)
2436} 2710}
2437 2711
2712sub update {
2713 my ($self) = @_;
2714
2715 return unless $self->{visible};
2716
2717 $self->SUPER::update;
2718}
2719
2438sub _draw { 2720sub _draw {
2439 my ($self) = @_; 2721 my ($self) = @_;
2440 2722
2441 return unless $::CONN;#d# manage and cache textures differently 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
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2734 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443 2735
2444 # TODO animation
2445 if ($tex) { 2736 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 2737 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 2739 glColor 1, 1, 1, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2740 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2451 } 2742 }
2452} 2743}
2453 2744
2454############################################################################# 2745sub DESTROY {
2746 my ($self) = @_;
2455 2747
2748 $self->{timer}->cancel
2749 if $self->{timer};
2750
2751 $self->SUPER::DESTROY;
2752}
2753
2754#############################################################################
2755
2456package CFClient::UI::InventoryItem; 2756package CFClient::UI::Inventory;
2457 2757
2458our @ISA = CFClient::UI::HBox::; 2758our @ISA = CFClient::UI::ScrolledWindow::;
2459 2759
2460sub new { 2760sub new {
2461 my $class = shift; 2761 my $class = shift;
2462 2762
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new ( 2763 my $self = $class->SUPER::new (
2473 can_hover => 1, 2764 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_, 2765 @_,
2532 ); 2766 );
2533 2767
2534 $self 2768 $self
2535} 2769}
… …
2545 or ($a->{name} cmp $b->{name}) 2779 or ($a->{name} cmp $b->{name})
2546 } @$items; 2780 } @$items;
2547 2781
2548 $self->{real_items} = \@items; 2782 $self->{real_items} = \@items;
2549 2783
2784 my $row = 0;
2550 for my $item (@items) { 2785 for my $item (@items) {
2551 my $desc = $item->{nrof} < 2 2786 CFClient::Item::update_widgets $item;
2552 ? $item->{name}
2553 : "$item->{nrof} $item->{name_pl}";
2554 2787
2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2788 $self->{scrolled}->add (0, $row, $item->{face_widget});
2556 } 2789 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2790 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2557 2791
2558 $self->{scrolled}->add (@items); 2792 $row++;
2559 2793 }
2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561}
2562
2563sub size_request {
2564 my ($self) = @_;
2565 ($self->{req_w}, $self->{req_h});
2566} 2794}
2567 2795
2568############################################################################# 2796#############################################################################
2569 2797
2570package CFClient::UI::Menu; 2798package CFClient::UI::Menu;
… …
2605 2833
2606# popup given the event (must be a mouse button down event currently) 2834# popup given the event (must be a mouse button down event currently)
2607sub popup { 2835sub popup {
2608 my ($self, $ev) = @_; 2836 my ($self, $ev) = @_;
2609 2837
2610 $self->emit ("popdown"); 2838 $self->_emit ("popdown");
2611 2839
2612 # maybe save $GRAB? must be careful about events... 2840 # maybe save $GRAB? must be careful about events...
2613 $GRAB = $self; 2841 $GRAB = $self;
2614 $self->{button} = $ev->{button}; 2842 $self->{button} = $ev->{button};
2615 2843
… …
2630 2858
2631 if ($ev->{button} == $self->{button}) { 2859 if ($ev->{button} == $self->{button}) {
2632 undef $GRAB; 2860 undef $GRAB;
2633 $self->hide; 2861 $self->hide;
2634 2862
2635 $self->emit ("popdown"); 2863 $self->_emit ("popdown");
2636 $self->{hover}[1]->() if $self->{hover}; 2864 $self->{hover}[1]->() if $self->{hover};
2637 } 2865 }
2638} 2866}
2639 2867
2640############################################################################# 2868#############################################################################
2641 2869
2642package CFClient::UI::Statusbox; 2870package CFClient::UI::Statusbox;
2643 2871
2644our @ISA = CFClient::UI::VBox::; 2872our @ISA = CFClient::UI::VBox::;
2873
2874sub new {
2875 my $class = shift;
2876
2877 $class->SUPER::new (
2878 fontsize => 0.8,
2879 @_,
2880 )
2881}
2645 2882
2646sub reorder { 2883sub reorder {
2647 my ($self) = @_; 2884 my ($self) = @_;
2648 my $NOW = time; 2885 my $NOW = time;
2649 2886
… …
2668 ? "<b>$item->{count} ×</b> $item->{text}" 2905 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text}; 2906 : $item->{text};
2670 2907
2671 for ($short) { 2908 for ($short) {
2672 s/^\s+//; 2909 s/^\s+//;
2673 s/\012.*/…/s; 2910 s/\s+/ /g;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 } 2911 }
2677 2912
2678 new CFClient::UI::Label 2913 new CFClient::UI::Label
2679 markup => $short, 2914 markup => $short,
2680 tooltip => $item->{tooltip}, 2915 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP, 2916 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67, 2917 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize}, 2918 fontsize => $item->{fontsize} || $self->{fontsize},
2919 max_w => $::WIDTH * 0.44,
2684 color => $item->{color}, 2920 fg => $item->{fg},
2685 can_events => 1, 2921 can_events => 1,
2686 can_hover => 1 2922 can_hover => 1
2687 }; 2923 };
2688 } 2924 }
2689 2925
… …
2694sub add { 2930sub add {
2695 my ($self, $text, %arg) = @_; 2931 my ($self, $text, %arg) = @_;
2696 2932
2697 $text =~ s/^\s+//; 2933 $text =~ s/^\s+//;
2698 $text =~ s/\s+$//; 2934 $text =~ s/\s+$//;
2935
2936 return unless $text;
2699 2937
2700 my $timeout = time + ((delete $arg{timeout}) || 60); 2938 my $timeout = time + ((delete $arg{timeout}) || 60);
2701 2939
2702 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2940 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703 2941
… …
2715 $self->{item}{$group} = { 2953 $self->{item}{$group} = {
2716 id => ++$self->{id}, 2954 id => ++$self->{id},
2717 text => $text, 2955 text => $text,
2718 timeout => $timeout, 2956 timeout => $timeout,
2719 tooltip => $text, 2957 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8], 2958 fg => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0, 2959 pri => 0,
2723 count => 1, 2960 count => 1,
2724 %arg, 2961 %arg,
2725 }; 2962 };
2726 } 2963 }
2727 2964
2728 $self->reorder; 2965 $self->reorder;
2729} 2966}
2730 2967
2968sub reconfigure {
2969 my ($self) = @_;
2970
2971 delete $_->{label}
2972 for values %{ $self->{item} || {} };
2973
2974 $self->reorder;
2975 $self->SUPER::reconfigure;
2976}
2977
2731############################################################################# 2978#############################################################################
2732 2979
2733package CFClient::UI::Root; 2980package CFClient::UI::Root;
2734 2981
2735our @ISA = CFClient::UI::Container::; 2982our @ISA = CFClient::UI::Container::;
… …
2737use CFClient::OpenGL; 2984use CFClient::OpenGL;
2738 2985
2739sub new { 2986sub new {
2740 my $class = shift; 2987 my $class = shift;
2741 2988
2742 $class->SUPER::new ( 2989 my $self = $class->SUPER::new (
2990 visible => 1,
2743 @_, 2991 @_,
2744 ) 2992 );
2993
2994 Scalar::Util::weaken ($self->{root} = $self);
2995
2996 $self
2745} 2997}
2746 2998
2747sub configure { 2999sub configure {
2748 my ($self, $x, $y, $w, $h) = @_; 3000 my ($self, $x, $y, $w, $h) = @_;
2749 3001
2750 $self->{w} = $w; 3002 $self->{w} = $w;
2751 $self->{h} = $h; 3003 $self->{h} = $h;
2752} 3004}
2753 3005
2754sub check_size { 3006sub reconfigure {
2755 my ($self) = @_; 3007 my ($self) = @_;
2756 3008
3009 $self->SUPER::reconfigure;
3010
2757 $self->size_allocate ($self->{w}, $self->{h}) 3011 $self->size_allocate ($self->{w}, $self->{h}, 1)
2758 if $self->{w}; 3012 if $self->{w};
2759} 3013}
2760 3014
2761sub size_request { 3015sub size_request {
2762 my ($self) = @_; 3016 my ($self) = @_;
2763 3017
2764 ($self->{w}, $self->{h}) 3018 ($self->{w}, $self->{h})
2765} 3019}
2766 3020
2767sub size_allocate { 3021sub size_allocate {
2768 my ($self, $w, $h) = @_; 3022 my ($self, $w, $h, $changed) = @_;
2769
2770 my $old_w = $self->{old_w};
2771 my $old_h = $self->{old_h};
2772
2773 if ($old_w && $old_h) {
2774 for my $child ($self->children) {
2775 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783 }
2784 }
2785 3023
2786 for my $child ($self->children) { 3024 for my $child ($self->children) {
2787 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)};
2788 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
2789 $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;
2790 $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
2791 $child->configure ($X, $Y, $W, $H); 3038 $child->configure ($X, $Y, $W, $H);
2792 } 3039 }
2793
2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796} 3040}
2797 3041
2798sub coord2local { 3042sub coord2local {
2799 my ($self, $x, $y) = @_; 3043 my ($self, $x, $y) = @_;
2800 3044
… …
2808} 3052}
2809 3053
2810sub update { 3054sub update {
2811 my ($self) = @_; 3055 my ($self) = @_;
2812 3056
2813 $self->check_size;
2814 $::WANT_REFRESH++; 3057 $::WANT_REFRESH++;
2815} 3058}
2816 3059
2817sub add { 3060sub add {
2818 my ($self, $child) = @_; 3061 my ($self, @children) = @_;
2819 3062
3063 for my $child (@children) {
3064 $child->{is_toplevel} = 1;
3065
2820 # integerise window positions 3066 # integerise window positions
2821 $child->{x} = int $child->{x}; 3067 $child->{x} = int $child->{x};
2822 $child->{y} = int $child->{y}; 3068 $child->{y} = int $child->{y};
3069 }
2823 3070
2824 $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 }
2825} 3084}
2826 3085
2827sub on_refresh { 3086sub on_refresh {
2828 my ($self, $id, $cb) = @_; 3087 my ($self, $id, $cb) = @_;
2829 3088
… …
2842 while ($self->{refresh_hook}) { 3101 while ($self->{refresh_hook}) {
2843 $_->() 3102 $_->()
2844 for values %{delete $self->{refresh_hook}}; 3103 for values %{delete $self->{refresh_hook}};
2845 } 3104 }
2846 3105
2847 if ($self->{check_size}) { 3106 if ($self->{realloc}) {
2848 my @queue = ([], []); 3107 my @queue;
2849 3108
2850 for (;;) { 3109 while () {
2851 if ($self->{check_size}) { 3110 if ($self->{realloc}) {
2852 # heuristic: check containers last 3111 #TODO use array-of-depth approach
2853 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3112
2854 for values %{delete $self->{check_size}} 3113 @queue = sort { $a->{visible} <=> $b->{visible} }
3114 @queue, values %{delete $self->{realloc}};
2855 } 3115 }
2856 3116
2857 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3117 my $widget = pop @queue || last;
2858 3118
3119 $widget->{visible} or last; # do not resize invisible widgets
3120
2859 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3121 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2860 ? @$widget{qw(user_w user_h)} 3122 ? @$widget{qw(def_w def_h)}
2861 : $widget->size_request; 3123 : $widget->size_request;
2862 3124
2863 if (delete $widget->{force_alloc}
2864 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2865 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3125 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2866 3126
2867 $widget->{req_w} = $w; 3127 $widget->{req_w} = $w;
2868 $widget->{req_h} = $h; 3128 $widget->{req_h} = $h;
2869 3129
2870 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3130 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2871 3131
2872 $widget->{parent}->check_size 3132 push @queue, $widget->{parent}
2873 if $widget->{parent}; 3133 if $widget->{parent};
2874 }
2875 } 3134 }
2876 } 3135 }
2877 3136
2878 while ($self->{size_alloc}) { 3137 while (my $size_alloc = delete $self->{size_alloc}) {
2879 for (values %{delete $self->{size_alloc}}) { 3138 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2880 my ($widget, $w, $h) = @$_; 3139 values %$size_alloc;
3140
3141 while () {
3142 my ($widget, $w, $h) = @{ pop @queue or last };
2881 3143
2882 $w = 0 if $w < 0; 3144 $w = 0 if $w < 0;
2883 $h = 0 if $h < 0; 3145 $h = 0 if $h < 0;
2884 3146
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3148
2885 $widget->{w} = $w; 3149 $widget->{w} = $w;
2886 $widget->{h} = $h; 3150 $widget->{h} = $h;
2887 $widget->size_allocate ($w, $h); 3151
2888 $widget->emit (size_allocate => $w, $h); 3152 $widget->emit (size_allocate => $w, $h, $changed);
2889 } 3153 }
2890 } 3154 }
2891 3155
2892 while ($self->{post_alloc_hook}) { 3156 while ($self->{post_alloc_hook}) {
2893 $_->() 3157 $_->()
… …
2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3162 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2899 glClear GL_COLOR_BUFFER_BIT; 3163 glClear GL_COLOR_BUFFER_BIT;
2900 3164
2901 glMatrixMode GL_PROJECTION; 3165 glMatrixMode GL_PROJECTION;
2902 glLoadIdentity; 3166 glLoadIdentity;
2903 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3167 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2904 glMatrixMode GL_MODELVIEW; 3168 glMatrixMode GL_MODELVIEW;
2905 glLoadIdentity; 3169 glLoadIdentity;
2906 3170
2907 $self->_draw; 3171 $self->_draw;
2908} 3172}
… …
2910############################################################################# 3174#############################################################################
2911 3175
2912package CFClient::UI; 3176package CFClient::UI;
2913 3177
2914$ROOT = new CFClient::UI::Root; 3178$ROOT = new CFClient::UI::Root;
2915$TOOLTIP = new CFClient::UI::Tooltip; 3179$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2916 3180
29171 31811
2918 3182

Diff Legend

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