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.198 by root, Fri May 12 02:08:52 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
389 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size
391 unless exists $self->{req_w};
392}
393
394sub check_size {
395 my ($self, $forced) = @_;
396
397 $self->{force_alloc} = 1 if $forced;
398 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399}
400
401sub update {
402 my ($self) = @_;
403
404 $self->{parent}->update
405 if $self->{parent};
406}
407
408sub connect {
409 my ($self, $signal, $cb) = @_;
410
411 push @{ $self->{signal_cb}{$signal} }, $cb;
412}
413
414sub emit {
415 my ($self, $signal, @args) = @_;
416
417 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
418}
419
420sub DESTROY { 564sub DESTROY {
421 my ($self) = @_; 565 my ($self) = @_;
422 566
567 delete $WIDGET{$self+0};
423 #$self->deactivate; 568 #$self->deactivate;
424} 569}
425 570
426############################################################################# 571#############################################################################
427 572
… …
436 my $class = shift; 581 my $class = shift;
437 582
438 # range [value, low, high, page] 583 # range [value, low, high, page]
439 584
440 $class->SUPER::new ( 585 $class->SUPER::new (
441 bg => [0, 0, 0, 0.2], 586 #bg => [0, 0, 0, 0.2],
442 active_bg => [1, 1, 1, 0.5], 587 #active_bg => [1, 1, 1, 0.5],
443 @_ 588 @_
444 ) 589 )
445} 590}
446 591
447sub _draw { 592sub _draw {
448 my ($self) = @_; 593 my ($self) = @_;
449 594
595 my $color = $FOCUS == $self && $self->{active_bg}
596 ? $self->{active_bg}
597 : $self->{bg};
598
599 if ($color && (@$color < 4 || $color->[3])) {
450 my ($w, $h) = @$self{qw(w h)}; 600 my ($w, $h) = @$self{qw(w h)};
451 601
452 glEnable GL_BLEND; 602 glEnable GL_BLEND;
453 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
454 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 604 glColor @$color;
455 605
456 glBegin GL_QUADS; 606 glBegin GL_QUADS;
457 glVertex 0 , 0; 607 glVertex 0 , 0;
458 glVertex 0 , $h; 608 glVertex 0 , $h;
459 glVertex $w, $h; 609 glVertex $w, $h;
460 glVertex $w, 0; 610 glVertex $w, 0;
461 glEnd; 611 glEnd;
462 612
463 glDisable GL_BLEND; 613 glDisable GL_BLEND;
614 }
464} 615}
465 616
466############################################################################# 617#############################################################################
467 618
468package CFClient::UI::Empty; 619package CFClient::UI::Empty;
… …
512 $self->{children} = [ 663 $self->{children} = [
513 sort { $a->{z} <=> $b->{z} } 664 sort { $a->{z} <=> $b->{z} }
514 @{$self->{children}}, @widgets 665 @{$self->{children}}, @widgets
515 ]; 666 ];
516 667
517 $self->check_size (1); 668 $self->realloc;
518 $self->update;
519} 669}
520 670
521sub children { 671sub children {
522 @{ $_[0]{children} } 672 @{ $_[0]{children} }
523} 673}
… …
528 delete $child->{parent}; 678 delete $child->{parent};
529 $child->hide; 679 $child->hide;
530 680
531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532 682
533 $self->check_size; 683 $self->realloc;
534 $self->update;
535} 684}
536 685
537sub clear { 686sub clear {
538 my ($self) = @_; 687 my ($self) = @_;
539 688
… …
543 for (@$children) { 692 for (@$children) {
544 delete $_->{parent}; 693 delete $_->{parent};
545 $_->hide; 694 $_->hide;
546 } 695 }
547 696
548 $self->check_size; 697 $self->realloc;
549 $self->update;
550} 698}
551 699
552sub find_widget { 700sub find_widget {
553 my ($self, $x, $y) = @_; 701 my ($self, $x, $y) = @_;
554 702
… …
607sub size_request { 755sub size_request {
608 $_[0]{children}[0]->size_request 756 $_[0]{children}[0]->size_request
609} 757}
610 758
611sub size_allocate { 759sub size_allocate {
612 my ($self, $w, $h) = @_; 760 my ($self, $w, $h, $changed) = @_;
613 761
614 $self->{children}[0]->configure (0, 0, $w, $h); 762 $self->{children}[0]->configure (0, 0, $w, $h);
615} 763}
616 764
617############################################################################# 765#############################################################################
… …
634 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 782 $ROOT->on_post_alloc ($self => sub { $self->render_child });
635 $self->SUPER::update; 783 $self->SUPER::update;
636} 784}
637 785
638sub size_allocate { 786sub size_allocate {
639 my ($self, $w, $h) = @_; 787 my ($self, $w, $h, $changed) = @_;
640 788
641 $self->SUPER::size_allocate ($w, $h); 789 $self->SUPER::size_allocate ($w, $h, $changed);
642 $self->update; 790 $self->update
791 if $changed;
643} 792}
644 793
645sub _render { 794sub _render {
646 $_[0]{children}[0]->draw; 795 $_[0]{children}[0]->draw;
647} 796}
… …
652 $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 {
653 glClearColor 0, 0, 0, 0; 802 glClearColor 0, 0, 0, 0;
654 glClear GL_COLOR_BUFFER_BIT; 803 glClear GL_COLOR_BUFFER_BIT;
655 804
656 $self->_render; 805 $self->_render;
657# glColorMask 1, 1, 1, 0;
658# glEnable GL_BLEND;
659# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660# glRasterPos 0, 0;
661# glCopyPixels 0, 0, $self->{w}, $self->{h};
662# glDisable GL_BLEND;
663# glColorMask 1, 1, 1, 1;
664 }; 806 };
665} 807}
666 808
667sub _draw { 809sub _draw {
668 my ($self) = @_; 810 my ($self) = @_;
… …
672 my $tex = $self->{texture} 814 my $tex = $self->{texture}
673 or return; 815 or return;
674 816
675 glEnable GL_TEXTURE_2D; 817 glEnable GL_TEXTURE_2D;
676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 818 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677 glColor 0, 0, 0, 1; 819 glColor 1, 1, 1, 1;
678 820
679 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 821 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
680 822
681 glDisable GL_TEXTURE_2D; 823 glDisable GL_TEXTURE_2D;
682} 824}
… …
685 827
686package CFClient::UI::ViewPort; 828package CFClient::UI::ViewPort;
687 829
688our @ISA = CFClient::UI::Window::; 830our @ISA = CFClient::UI::Window::;
689 831
832sub new {
833 my $class = shift;
834
835 $class->SUPER::new (
836 scroll_x => 0,
837 scroll_y => 1,
838 @_,
839 )
840}
841
690sub size_request { 842sub size_request {
691 my ($self) = @_; 843 my ($self) = @_;
692 844
693 @$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)};
694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
695 846
696 @$self{qw(child_w child_h)} 847 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y};
849
850 ($w, $h)
697} 851}
698 852
699sub size_allocate { 853sub size_allocate {
700 my ($self, $w, $h) = @_; 854 my ($self, $w, $h, $changed) = @_;
701 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);
702 $self->update; 860 $self->update;
703} 861}
704 862
705sub set_offset { 863sub set_offset {
706 my ($self, $x, $y) = @_; 864 my ($self, $x, $y) = @_;
… …
757 my $class = shift; 915 my $class = shift;
758 916
759 my $self; 917 my $self;
760 918
761 my $slider = new CFClient::UI::Slider 919 my $slider = new CFClient::UI::Slider
762 vertical => 1, 920 vertical => 1,
763 range => [0, 0, 1, 0.01], # HACK fix 921 range => [0, 0, 1, 0.01], # HACK fix
764 connect_changed => sub { 922 on_changed => sub {
765 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 923 $self->{vp}->set_offset (0, $_[1]);
766 }, 924 },
767 ; 925 ;
768 926
769 $self = $class->SUPER::new ( 927 $self = $class->SUPER::new (
770 vp => (new CFClient::UI::ViewPort), 928 vp => (new CFClient::UI::ViewPort expand => 1),
771 slider => $slider, 929 slider => $slider,
772 @_, 930 @_,
773 ); 931 );
774 932
775 $self->{vp}->add ($self->{scrolled}); 933 $self->{vp}->add ($self->{scrolled});
… …
777 $self->add ($self->{slider}); 935 $self->add ($self->{slider});
778 936
779 $self 937 $self
780} 938}
781 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]);
957}
958
782#TODO# update range on size_allocate depeneing on child 959#TODO# update range on size_allocate depending on child
783# update viewport offset on scroll 960# update viewport offset on scroll
784 961
785############################################################################# 962#############################################################################
786 963
787package CFClient::UI::Frame; 964package CFClient::UI::Frame;
788 965
789our @ISA = CFClient::UI::Bin::; 966our @ISA = CFClient::UI::Bin::;
790 967
791use CFClient::OpenGL; 968use CFClient::OpenGL;
969
970sub new {
971 my $class = shift;
972
973 $class->SUPER::new (
974 bg => undef,
975 @_,
976 )
977}
978
979sub _draw {
980 my ($self) = @_;
981
982 if ($self->{bg}) {
983 my ($w, $h) = @$self{qw(w h)};
984
985 glEnable GL_BLEND;
986 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
987 glColor @{ $self->{bg} };
988
989 glBegin GL_QUADS;
990 glVertex 0 , 0;
991 glVertex 0 , $h;
992 glVertex $w, $h;
993 glVertex $w, 0;
994 glEnd;
995
996 glDisable GL_BLEND;
997 }
998
999 $self->SUPER::_draw;
1000}
792 1001
793############################################################################# 1002#############################################################################
794 1003
795package CFClient::UI::FancyFrame; 1004package CFClient::UI::FancyFrame;
796 1005
… …
803 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);
804 1013
805sub new { 1014sub new {
806 my $class = shift; 1015 my $class = shift;
807 1016
808 # TODO: user_x, user_y, overwrite moveto?
809
810 my $self = $class->SUPER::new ( 1017 my $self = $class->SUPER::new (
811 bg => [1, 1, 1, 1], 1018 bg => [1, 1, 1, 1],
812 border_bg => [1, 1, 1, 1], 1019 border_bg => [1, 1, 1, 1],
813 border => 0.6, 1020 border => 0.6,
1021 is_toplevel => 1,
814 can_events => 1, 1022 can_events => 1,
815 @_ 1023 @_
816 ); 1024 );
817 1025
818 $self->{title} &&= new CFClient::UI::Label 1026 $self->{title} &&= new CFClient::UI::Label
819 align => 0, 1027 align => 0,
… …
838 $h + $self->border * 2, 1046 $h + $self->border * 2,
839 ) 1047 )
840} 1048}
841 1049
842sub size_allocate { 1050sub size_allocate {
843 my ($self, $w, $h) = @_; 1051 my ($self, $w, $h, $changed) = @_;
1052
1053 return unless $changed;
844 1054
845 $h -= List::Util::max 0, $self->border * 2; 1055 $h -= List::Util::max 0, $self->border * 2;
846 $w -= List::Util::max 0, $self->border * 2; 1056 $w -= List::Util::max 0, $self->border * 2;
847 1057
848 $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)
849 if $self->{title}; 1059 if $self->{title};
850 1060
851 $self->child->configure ($self->border, $self->border, $w, $h); 1061 $self->child->configure ($self->border, $self->border, $w, $h);
852} 1062}
853 1063
… …
872 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
873 1083
874 my $dx = $ev->{x} - $ox; 1084 my $dx = $ev->{x} - $ox;
875 my $dy = $ev->{y} - $oy; 1085 my $dy = $ev->{y} - $oy;
876 1086
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
877 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
878 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
879 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1091 $self->move ($self->{user_x}, $self->{user_y});
880 $self->check_size; 1092 $self->realloc;
881 }; 1093 };
882 1094
883 } elsif ($lr ^ $td) { 1095 } elsif ($lr ^ $td) {
884 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1096 my ($ox, $oy) = ($ev->{x}, $ev->{y});
885 my ($bx, $by) = ($self->{x}, $self->{y}); 1097 my ($bx, $by) = ($self->{x}, $self->{y});
… …
887 $self->{motion} = sub { 1099 $self->{motion} = sub {
888 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
889 1101
890 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 ($x, $y) = ($ev->{x}, $ev->{y});
891 1103
892 $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});
893 $self->update; 1108 $self->realloc;
894 }; 1109 };
895 } 1110 }
896} 1111}
897 1112
898sub button_up { 1113sub button_up {
… …
959sub new { 1174sub new {
960 my $class = shift; 1175 my $class = shift;
961 1176
962 $class->SUPER::new ( 1177 $class->SUPER::new (
963 col_expand => [], 1178 col_expand => [],
964 @_ 1179 @_,
965 ) 1180 )
1181}
1182
1183sub children {
1184 grep $_, map @$_, grep $_, @{ $_[0]{children} }
966} 1185}
967 1186
968sub add { 1187sub add {
969 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
970 1189
971 $child->set_parent ($self); 1190 $child->set_parent ($self);
972 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
973 1192
974 $child->check_size; 1193 $self->realloc;
975} 1194}
976 1195
977sub children {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} }
979}
980
981# 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?
982sub clear { 1197sub clear {
983 my ($self) = @_; 1198 my ($self) = @_;
984 1199
985 my @children = $self->children; 1200 my @children = $self->children;
986 delete $self->{children}; 1201 delete $self->{children};
… …
988 for (@children) { 1203 for (@children) {
989 delete $_->{parent}; 1204 delete $_->{parent};
990 $_->hide; 1205 $_->hide;
991 } 1206 }
992 1207
993 $self->update; 1208 $self->realloc;
994} 1209}
995 1210
996sub get_wh { 1211sub get_wh {
997 my ($self) = @_; 1212 my ($self) = @_;
998 1213
… …
1025 (sum @$hs), 1240 (sum @$hs),
1026 ) 1241 )
1027} 1242}
1028 1243
1029sub size_allocate { 1244sub size_allocate {
1030 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1031 1246
1032 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1033 1248
1034 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
1035 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
1036 1251
1037 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
1038 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
1039 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
1040 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1094 } 1309 }
1095} 1310}
1096 1311
1097############################################################################# 1312#############################################################################
1098 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
1099package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1100 1375
1101# TODO: wrap into common Box base class
1102
1103our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1104 1377
1105sub size_request { 1378sub new {
1106 my ($self) = @_; 1379 my $class = shift;
1107 1380
1108 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1109 1382 vertical => 0,
1110 ( 1383 @_,
1111 (List::Util::sum map $_->[0], @alloc),
1112 (List::Util::max map $_->[1], @alloc),
1113 ) 1384 )
1114} 1385}
1115 1386
1116sub size_allocate {
1117 my ($self, $w, $h) = @_;
1118
1119 ($h, $w) = ($w, $h);
1120
1121 my $children = $self->{children};
1122
1123 my @h = map $_->{req_w}, @$children;
1124
1125 my $req_h = List::Util::sum @h;
1126
1127 if ($req_h > $h) {
1128 # ah well, not enough space
1129 $_ *= $h / $req_h for @h;
1130 } else {
1131 my $exp = List::Util::sum map $_->{expand}, @$children;
1132 $exp ||= 1;
1133
1134 for (0 .. $#$children) {
1135 my $child = $children->[$_];
1136
1137 my $alloc_h = $h[$_];
1138 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1139 $h[$_] = $alloc_h;
1140 }
1141 }
1142
1143 CFClient::UI::harmonize \@h;
1144
1145 my $y = 0;
1146 for (0 .. $#$children) {
1147 my $child = $children->[$_];
1148 my $h = $h[$_];
1149 $child->configure ($y, 0, $h, $w);
1150
1151 $y += $h;
1152 }
1153
1154 1
1155}
1156
1157############################################################################# 1387#############################################################################
1158 1388
1159package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1160 1390
1161# TODO: wrap into common Box base class
1162
1163our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1164 1392
1165sub size_request { 1393sub new {
1166 my ($self) = @_; 1394 my $class = shift;
1167 1395
1168 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1169 1397 vertical => 1,
1170 ( 1398 @_,
1171 (List::Util::max map $_->[0], @alloc),
1172 (List::Util::sum map $_->[1], @alloc),
1173 ) 1399 )
1174} 1400}
1175 1401
1176sub size_allocate {
1177 my ($self, $w, $h) = @_;
1178
1179 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1180
1181 my $children = $self->{children};
1182
1183 my @h = map $_->{req_h}, @$children;
1184
1185 my $req_h = List::Util::sum @h;
1186
1187 if ($req_h > $h) {
1188 # ah well, not enough space
1189 $_ *= $h / $req_h for @h;
1190 } else {
1191 my $exp = List::Util::sum map $_->{expand}, @$children;
1192 $exp ||= 1;
1193
1194 for (0 .. $#$children) {
1195 my $child = $children->[$_];
1196
1197 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1198 }
1199 }
1200
1201 CFClient::UI::harmonize \@h;
1202
1203 my $y = 0;
1204 for (0 .. $#$children) {
1205 my $child = $children->[$_];
1206 my $h = $h[$_];
1207 $child->configure (0, $y, $w, $h);
1208
1209 $y += $h;
1210 }
1211
1212 1
1213}
1214
1215############################################################################# 1402#############################################################################
1216 1403
1217package CFClient::UI::Label; 1404package CFClient::UI::Label;
1218 1405
1219our @ISA = CFClient::UI::Base::; 1406our @ISA = CFClient::UI::DrawBG::;
1220 1407
1221use CFClient::OpenGL; 1408use CFClient::OpenGL;
1222 1409
1223sub new { 1410sub new {
1224 my ($class, %arg) = @_; 1411 my ($class, %arg) = @_;
1225 1412
1226 my $self = $class->SUPER::new ( 1413 my $self = $class->SUPER::new (
1227 fg => [1, 1, 1], 1414 fg => [1, 1, 1],
1415 #bg => none
1416 #active_bg => none
1228 #font => default_font 1417 #font => default_font
1229 #text => initial text 1418 #text => initial text
1230 #markup => initial narkup 1419 #markup => initial narkup
1420 #max_w => maximum pixel width
1421 ellipsise => 3, # end
1231 layout => (new CFClient::Layout), 1422 layout => (new CFClient::Layout),
1232 fontsize => 1, 1423 fontsize => 1,
1233 align => -1, 1424 align => -1,
1234 valign => -1, 1425 valign => -1,
1235 padding => 2, 1426 padding => 2,
… …
1250 } 1441 }
1251 1442
1252 $self 1443 $self
1253} 1444}
1254 1445
1255sub escape { 1446sub escape($) {
1256 local $_ = $_[1]; 1447 local $_ = $_[0];
1257 1448
1258 s/&/&amp;/g; 1449 s/&/&amp;/g;
1259 s/>/&gt;/g; 1450 s/>/&gt;/g;
1260 s/</&lt;/g; 1451 s/</&lt;/g;
1261 1452
1262 $_[1] 1453 $_
1263} 1454}
1264 1455
1265sub update { 1456sub update {
1266 my ($self) = @_; 1457 my ($self) = @_;
1267 1458
… …
1276 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1277 1468
1278 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1279 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1280 1471
1472 $self->realloc;
1281 $self->update; 1473 $self->update;
1282 $self->check_size;
1283} 1474}
1284 1475
1285sub set_markup { 1476sub set_markup {
1286 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1287 1478
… …
1291 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1292 1483
1293 $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;
1294 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1295 1486
1487 $self->realloc;
1296 $self->update; 1488 $self->update;
1297 $self->check_size;
1298} 1489}
1299 1490
1300sub size_request { 1491sub size_request {
1301 my ($self) = @_; 1492 my ($self) = @_;
1302 1493
1303 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1494 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $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});
1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306 1499
1307 my ($w, $h) = $self->{layout}->size; 1500 my ($w, $h) = $self->{layout}->size;
1308 1501
1309 if (exists $self->{template}) { 1502 if (exists $self->{template}) {
… …
1321 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1322 ) 1515 )
1323} 1516}
1324 1517
1325sub size_allocate { 1518sub size_allocate {
1326 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1327 1520
1328 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1329} 1523}
1330 1524
1331sub set_fontsize { 1525sub set_fontsize {
1332 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1333 1527
1334 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1335 delete $self->{texture}; 1529 delete $self->{texture};
1336 1530
1337 $self->update; 1531 $self->realloc;
1338 $self->check_size;
1339} 1532}
1340 1533
1341sub _draw { 1534sub _draw {
1342 my ($self) = @_; 1535 my ($self) = @_;
1536
1537 $self->SUPER::_draw; # draw background, if applicable
1343 1538
1344 my $tex = $self->{texture} ||= do { 1539 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}}); 1540 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1541 $self->{layout}->set_font ($self->{font}) if $self->{font};
1347 $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});
1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1546
1350 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1547 my $tex = new_from_layout CFClient::Texture $self->{layout};
1351 1548
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5; 1551 : ($self->{w} - $tex->{w}) * 0.5);
1355 1552
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5; 1555 : ($self->{h} - $tex->{h}) * 0.5);
1359 1556
1360 $tex 1557 $tex
1361 }; 1558 };
1362 1559
1363 glEnable GL_TEXTURE_2D; 1560 glEnable GL_TEXTURE_2D;
… …
1391 active_fg => [0, 0, 0], 1588 active_fg => [0, 0, 0],
1392 can_hover => 1, 1589 can_hover => 1,
1393 can_focus => 1, 1590 can_focus => 1,
1394 valign => 0, 1591 valign => 0,
1395 can_events => 1, 1592 can_events => 1,
1593 #text => ...
1396 @_ 1594 @_
1397 ) 1595 )
1398} 1596}
1399 1597
1400sub _set_text { 1598sub _set_text {
… …
1410 $self->{text} = $text; 1608 $self->{text} = $text;
1411 1609
1412 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1413 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1414 1612
1415 $self->emit (changed => $self->{text}); 1613 $self->_emit (changed => $self->{text});
1416} 1614}
1417 1615
1418sub set_text { 1616sub set_text {
1419 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1420 1618
1421 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1422 $self->_set_text ($text); 1620 $self->_set_text ($text);
1423 $self->check_size; 1621
1424 $self->update; 1622 $self->realloc;
1425} 1623}
1426 1624
1427sub get_text { 1625sub get_text {
1428 $_[0]{text} 1626 $_[0]{text}
1429} 1627}
… …
1432 my ($self) = @_; 1630 my ($self) = @_;
1433 1631
1434 my ($w, $h) = $self->SUPER::size_request; 1632 my ($w, $h) = $self->SUPER::size_request;
1435 1633
1436 ($w + 1, $h) # add 1 for cursor 1634 ($w + 1, $h) # add 1 for cursor
1437}
1438
1439sub size_allocate {
1440 my ($self, $w, $h) = @_;
1441
1442 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1443} 1635}
1444 1636
1445sub key_down { 1637sub key_down {
1446 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1447 1639
… …
1449 my $sym = $ev->{sym}; 1641 my $sym = $ev->{sym};
1450 my $uni = $ev->{unicode}; 1642 my $uni = $ev->{unicode};
1451 1643
1452 my $text = $self->get_text; 1644 my $text = $self->get_text;
1453 1645
1454 if ($sym == 8) { 1646 if ($uni == 8) {
1455 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1647 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456 } elsif ($sym == 127) { 1648 } elsif ($uni == 127) {
1457 substr $text, $self->{cursor}, 1, ""; 1649 substr $text, $self->{cursor}, 1, "";
1458 } elsif ($sym == CFClient::SDLK_LEFT) { 1650 } elsif ($sym == CFClient::SDLK_LEFT) {
1459 --$self->{cursor} if $self->{cursor}; 1651 --$self->{cursor} if $self->{cursor};
1460 } elsif ($sym == CFClient::SDLK_RIGHT) { 1652 } elsif ($sym == CFClient::SDLK_RIGHT) {
1461 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1653 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1462 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1463 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1464 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1465 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1466 } elsif ($sym == 27) { 1658 } elsif ($uni == 27) {
1467 $self->emit ('escape'); 1659 $self->_emit ('escape');
1468 } elsif ($uni) { 1660 } elsif ($uni) {
1469 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1470 } 1662 }
1471 1663
1472 $self->_set_text ($text); 1664 $self->_set_text ($text);
1473 $self->update; 1665
1666 $self->realloc;
1474} 1667}
1475 1668
1476sub focus_in { 1669sub focus_in {
1477 my ($self) = @_; 1670 my ($self) = @_;
1478 1671
… …
1558 if ($sym == 13) { 1751 if ($sym == 13) {
1559 unshift @{$self->{history}}, 1752 unshift @{$self->{history}},
1560 my $txt = $self->get_text; 1753 my $txt = $self->get_text;
1561 $self->{history_pointer} = -1; 1754 $self->{history_pointer} = -1;
1562 $self->{history_saveback} = ''; 1755 $self->{history_saveback} = '';
1563 $self->emit (activate => $txt); 1756 $self->_emit (activate => $txt);
1564 $self->update; 1757 $self->update;
1565 1758
1566 } elsif ($sym == CFClient::SDLK_UP) { 1759 } elsif ($sym == CFClient::SDLK_UP) {
1567 if ($self->{history_pointer} < 0) { 1760 if ($self->{history_pointer} < 0) {
1568 $self->{history_saveback} = $self->get_text; 1761 $self->{history_saveback} = $self->get_text;
… …
1607 my $class = shift; 1800 my $class = shift;
1608 1801
1609 $class->SUPER::new ( 1802 $class->SUPER::new (
1610 padding => 4, 1803 padding => 4,
1611 fg => [1, 1, 1], 1804 fg => [1, 1, 1],
1612 bg => [1, 1, 1, 0.2],
1613 active_fg => [0, 0, 1], 1805 active_fg => [0, 0, 1],
1614 can_hover => 1, 1806 can_hover => 1,
1615 align => 0, 1807 align => 0,
1616 valign => 0, 1808 valign => 0,
1617 can_events => 1, 1809 can_events => 1,
1618 @_ 1810 @_
1619 ) 1811 )
1620} 1812}
1621 1813
1814sub activate { }
1815
1622sub button_up { 1816sub button_up {
1623 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1624 1818
1819 $self->emit ("activate")
1625 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1626 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1627 $self->emit ("activate");
1628 }
1629} 1822}
1630 1823
1631sub _draw { 1824sub _draw {
1632 my ($self) = @_; 1825 my ($self) = @_;
1633 1826
… …
1665 1858
1666 $class->SUPER::new ( 1859 $class->SUPER::new (
1667 padding => 2, 1860 padding => 2,
1668 fg => [1, 1, 1], 1861 fg => [1, 1, 1],
1669 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],
1670 state => 0, 1865 state => 0,
1671 can_hover => 1, 1866 can_hover => 1,
1672 @_ 1867 @_
1673 ) 1868 )
1674} 1869}
… …
1683 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1684 1879
1685 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1686 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1687 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1688 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1689 } 1884 }
1690} 1885}
1691 1886
1692sub _draw { 1887sub _draw {
1693 my ($self) = @_; 1888 my ($self) = @_;
… …
1958 qw(s1_slider.png s1_slider_bg.png); 2153 qw(s1_slider.png s1_slider_bg.png);
1959 2154
1960sub new { 2155sub new {
1961 my $class = shift; 2156 my $class = shift;
1962 2157
1963 # range [value, low, high, page] 2158 # range [value, low, high, page, unit]
1964 2159
1965 # TODO: 0-width page 2160 # TODO: 0-width page
1966 # TODO: req_w/h are wrong with vertical 2161 # TODO: req_w/h are wrong with vertical
1967 # TODO: calculations are off 2162 # TODO: calculations are off
1968 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
1969 fg => [1, 1, 1], 2164 fg => [1, 1, 1],
1970 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],
1971 range => [0, 0, 100, 10], 2168 range => [0, 0, 100, 10, 0],
1972 req_w => $::WIDTH / 80, 2169 req_w => $::WIDTH / 80,
1973 req_h => $::WIDTH / 80, 2170 req_h => $::WIDTH / 80,
1974 vertical => 0, 2171 vertical => 0,
1975 can_hover => 1, 2172 can_hover => 1,
1976 inner_pad => 5, 2173 inner_pad => 0.02,
1977 @_ 2174 @_
1978 ); 2175 );
1979 2176
2177 $self->set_value ($self->{range}[0]);
2178 $self->update;
2179
1980 $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 }
1981} 2215}
1982 2216
1983sub size_request { 2217sub size_request {
1984 my ($self) = @_; 2218 my ($self) = @_;
1985 2219
… …
1991 2225
1992sub button_down { 2226sub button_down {
1993 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
1994 2228
1995 $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
1996 $self->mouse_motion ($ev, $x, $y); 2233 $self->mouse_motion ($ev, $x, $y);
1997} 2234}
1998 2235
1999sub mouse_motion { 2236sub mouse_motion {
2000 my ($self, $ev, $x, $y) = @_; 2237 my ($self, $ev, $x, $y) = @_;
2001 2238
2002 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
2003 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2256 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100;
2004 2258
2005 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2259 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2006 2260
2007 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2261 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2008 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2262 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2009 2263
2010 $x -= $inner_pad_px; # substract the padding 2264 $value = ($value - $lo) / $range;
2011 $x = $x * ($hi - $lo) / $inner_w + $lo; 2265 $value = $value * $self->{scale} + $self->{offset};
2012 $x = $lo if $x < $lo;
2013 $x = $hi - $page if $x > $hi - $page;
2014 $self->{range}[0] = $x;
2015 2266
2016 $self->emit (changed => $x); 2267 $self->{knob_x} = $value - $knob_w * 0.5;
2017 $self->update; 2268 $self->{knob_w} = $knob_w;
2018 } 2269 });
2019}
2020 2270
2021# the inner_* stuff is for generating a padding for the slider handle, 2271 $self->SUPER::update;
2022# so that the handle doesn't leave the texture. This calculation isn't 100%
2023# correct propably, but it does the job for now
2024sub _calc_inner_pad_px {
2025 my ($self, $w) = @_;
2026 ($w / 100) * $self->{inner_pad} # % to pixels
2027} 2272}
2028 2273
2029sub _draw { 2274sub _draw {
2030 my ($self) = @_; 2275 my ($self) = @_;
2031 2276
2032 $self->SUPER::_draw (); 2277 $self->SUPER::_draw ();
2033 2278
2034 my ($w, $h) = @$self{qw(w h)}; 2279 glScale $self->{w}, $self->{h};
2035 2280
2036 if ($self->{vertical}) { 2281 if ($self->{vertical}) {
2037 # draw a vertical slider like a rotated horizontal slider 2282 # draw a vertical slider like a rotated horizontal slider
2038 2283
2284 glTranslate 1, 0, 0;
2039 glRotate 90, 0, 0, 1; 2285 glRotate 90, 0, 0, 1;
2040 glTranslate 0, -$self->{w}, 0;
2041
2042 ($w, $h) = ($h, $w);
2043 } 2286 }
2044 2287
2045 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2288 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2289 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047 2290
2048 my ($value, $lo, $hi, $page) = @{$self->{range}};
2049
2050 $hi = $value + 1 if $lo == $hi;
2051
2052 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2053 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2054
2055 $page = int $page * $inner_w / ($hi - $lo);
2056 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2057
2058 $w -= $page;
2059 $page &= ~1;
2060 glTranslate $page * 0.5, 0, 0;
2061 $page ||= 2;
2062
2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2065
2066 glEnable GL_TEXTURE_2D; 2291 glEnable GL_TEXTURE_2D;
2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068 2293
2069 # draw background 2294 # draw background
2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2295 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071 2296
2072 # draw handle 2297 # draw handle
2073 $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);
2074 2299
2075 glDisable GL_TEXTURE_2D; 2300 glDisable GL_TEXTURE_2D;
2076} 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 (@_) }
2077 2343
2078############################################################################# 2344#############################################################################
2079 2345
2080package CFClient::UI::TextView; 2346package CFClient::UI::TextView;
2081 2347
… …
2111 2377
2112 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2113 $self->reflow; 2379 $self->reflow;
2114} 2380}
2115 2381
2116sub text_height {
2117 my ($self, $text) = @_;
2118
2119 my $layout = $self->{layout};
2120
2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2122 $layout->set_width ($self->{children}[0]{w});
2123 $layout->set_markup ($text);
2124
2125 ($layout->size)[1]
2126}
2127
2128sub reflow {
2129 my ($self) = @_;
2130
2131 $self->{need_reflow}++;
2132 $self->update;
2133}
2134
2135sub size_allocate { 2382sub size_allocate {
2136 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2137 2384
2138 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2139 2388
2140 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2141 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2142 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2143 2392
2144 $self->reflow; 2393 $self->reflow;
2145} 2394}
2146 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
2147sub add_paragraph { 2430sub add_paragraph {
2148 my ($self, $color, $text) = @_; 2431 my ($self, $color, $text, $indent) = @_;
2149 2432
2150 #TODO: intelligently "reformat" paragraph 2433 for my $line (split /\n/, $text) {
2151 2434 my ($w, $h) = $self->text_size ($line);
2152 my $height = $self->text_height ($text);
2153
2154 $self->{height} += $height; 2435 $self->{height} += $h;
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2437 }
2155 2438
2156 push @{$self->{par}}, [$height, $color, $text];
2157
2158 $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]);
2159 $self->{children}[1]->update;
2160} 2440}
2161 2441
2162sub update { 2442sub update {
2163 my ($self) = @_; 2443 my ($self) = @_;
2164 2444
… …
2167 return unless $self->{h} > 0; 2447 return unless $self->{h} > 0;
2168 2448
2169 delete $self->{texture}; 2449 delete $self->{texture};
2170 2450
2171 $ROOT->on_post_alloc ($self, sub { 2451 $ROOT->on_post_alloc ($self, sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453
2172 if (delete $self->{need_reflow}) { 2454 if (delete $self->{need_reflow}) {
2173 my $height = 0; 2455 my $height = 0;
2174 2456
2175 $height += $_->[0] = $self->text_height ($_->[2]) 2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2176 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 }
2177 2472
2178 $self->{height} = $height; 2473 $self->{height} = $height;
2179 2474
2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2181 2476
2182 delete $self->{texture}; 2477 delete $self->{texture};
2183 } 2478 }
2184 2479
2185 $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 {
2186 glClearColor 0, 0, 0, 0; 2481 glClearColor 0.5, 0.5, 0.5, 0;
2187 glClear GL_COLOR_BUFFER_BIT; 2482 glClear GL_COLOR_BUFFER_BIT;
2188 2483
2189 glEnable GL_TEXTURE_2D;
2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2191
2192 my $top = int $self->{children}[1]{range}[0]; 2484 my $top = int $self->{children}[1]{range}[0];
2193 2485
2194 my $y0 = $top; 2486 my $y0 = $top;
2195 my $y1 = $top + $self->{h}; 2487 my $y1 = $top + $H;
2196 2488
2197 my $y = 0; 2489 my $y = 0;
2198 2490
2199 my $layout = $self->{layout}; 2491 my $layout = $self->{layout};
2200 2492
2201 $layout->set_font ($self->{font}) if $self->{font}; 2493 $layout->set_font ($self->{font}) if $self->{font};
2202 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
2203 for my $par (@{$self->{par}}) { 2499 for my $par (@{$self->{par}}) {
2204 my $h = $par->[0]; 2500 my $h = $par->[1];
2205 2501
2206 if ($y0 < $y + $h && $y < $y1) { 2502 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] }); 2503 $layout->set_foreground (@{ $par->[2] });
2504 $layout->set_width ($W - $par->[3]);
2208 $layout->set_markup ($par->[2]); 2505 $layout->set_markup ($par->[4]);
2209 2506
2210 my ($W, $H) = $layout->size; 2507 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2211 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;
2212 } 2511 }
2213 2512
2214 $y += $h; 2513 $y += $h;
2215 } 2514 }
2216 2515
2217 glDisable GL_TEXTURE_2D; 2516 glDisable GL_BLEND;
2218 }; 2517 };
2219 }); 2518 });
2220} 2519}
2221 2520
2222sub _draw { 2521sub _draw {
2223 my ($self) = @_; 2522 my ($self) = @_;
2224 2523
2225 glEnable GL_TEXTURE_2D; 2524 glEnable GL_TEXTURE_2D;
2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227 glColor 1, 1, 1, 1; 2526 glColor 1, 1, 1, 1;
2228 $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});
2229 glDisable GL_TEXTURE_2D; 2528 glDisable GL_TEXTURE_2D;
2230 2529
2231 $self->{children}[1]->draw; 2530 $self->{children}[1]->draw;
2232 2531
2233} 2532}
… …
2282 2581
2283sub new { 2582sub new {
2284 my $class = shift; 2583 my $class = shift;
2285 2584
2286 my $self = $class->SUPER::new ( 2585 my $self = $class->SUPER::new (
2287 state => 0, 2586 state => 0,
2288 connect_activate => \&toggle_flopper, 2587 on_activate => \&toggle_flopper,
2289 @_ 2588 @_
2290 ); 2589 );
2291 2590
2292 if ($self->{state}) {
2293 $self->{state} = 0;
2294 $self->toggle_flopper;
2295 }
2296
2297 $self 2591 $self
2298} 2592}
2299 2593
2300sub toggle_flopper { 2594sub toggle_flopper {
2301 my ($self) = @_; 2595 my ($self) = @_;
2302 2596
2303 # TODO: use animation 2597 $self->{other}->toggle_visibility;
2304 if ($self->{state} = !$self->{state}) {
2305 $CFClient::UI::ROOT->add ($self->{other});
2306 $self->{other}->move ($self->coord2global (0, $self->{h}));
2307 $self->emit ("open");
2308 } else {
2309 $CFClient::UI::ROOT->remove ($self->{other});
2310 $self->emit ("close");
2311 }
2312
2313 $self->emit (changed => $self->{state});
2314} 2598}
2315 2599
2316############################################################################# 2600#############################################################################
2317 2601
2318package CFClient::UI::Tooltip; 2602package CFClient::UI::Tooltip;
… …
2332 2616
2333sub set_tooltip_from { 2617sub set_tooltip_from {
2334 my ($self, $widget) = @_; 2618 my ($self, $widget) = @_;
2335 2619
2336 $self->add (new CFClient::UI::Label 2620 $self->add (new CFClient::UI::Label
2337 markup => $widget->{tooltip}, 2621 markup => $widget->{tooltip},
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8, 2623 fontsize => 0.8,
2340 fg => [0, 0, 0, 1], 2624 fg => [0, 0, 0, 1],
2625 ellipsise => 0,
2341 font => ($widget->{tooltip_font} || $::FONT_PROP), 2626 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 ); 2627 );
2343} 2628}
2344 2629
2345sub size_request { 2630sub size_request {
2346 my ($self) = @_; 2631 my ($self) = @_;
… …
2349 2634
2350 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2351} 2636}
2352 2637
2353sub size_allocate { 2638sub size_allocate {
2354 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2355 2640
2641 return unless $changed;
2642
2356 $self->SUPER::size_allocate ($w - 4, $h - 4); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2357} 2644}
2358 2645
2359sub _draw { 2646sub _draw {
2360 my ($self) = @_; 2647 my ($self) = @_;
2361 2648
… …
2378 glVertex $w, $h; 2665 glVertex $w, $h;
2379 glVertex $w, 0; 2666 glVertex $w, 0;
2380 glEnd; 2667 glEnd;
2381 2668
2382 glTranslate 2 - 0.375, 2 - 0.375; 2669 glTranslate 2 - 0.375, 2 - 0.375;
2670
2383 $self->SUPER::_draw; 2671 $self->SUPER::_draw;
2384} 2672}
2385 2673
2386############################################################################# 2674#############################################################################
2387 2675
… …
2392use CFClient::OpenGL; 2680use CFClient::OpenGL;
2393 2681
2394sub new { 2682sub new {
2395 my $class = shift; 2683 my $class = shift;
2396 2684
2397 $class->SUPER::new ( 2685 my $self = $class->SUPER::new (
2398 aspect => 1, 2686 aspect => 1,
2687 can_events => 0,
2399 @_, 2688 @_,
2400 ) 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
2401} 2706}
2402 2707
2403sub size_request { 2708sub size_request {
2404 (32, 8) 2709 (32, 8)
2405} 2710}
2406 2711
2712sub update {
2713 my ($self) = @_;
2714
2715 return unless $self->{visible};
2716
2717 $self->SUPER::update;
2718}
2719
2407sub _draw { 2720sub _draw {
2408 my ($self) = @_; 2721 my ($self) = @_;
2409 2722
2410 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
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2734 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2412 2735
2413 # TODO animation
2414 if ($tex) { 2736 if ($tex) {
2415 glEnable GL_TEXTURE_2D; 2737 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1; 2739 glColor 1, 1, 1, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2740 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2420 } 2742 }
2421} 2743}
2422 2744
2423############################################################################# 2745sub DESTROY {
2746 my ($self) = @_;
2424 2747
2748 $self->{timer}->cancel
2749 if $self->{timer};
2750
2751 $self->SUPER::DESTROY;
2752}
2753
2754#############################################################################
2755
2425package CFClient::UI::InventoryItem; 2756package CFClient::UI::Inventory;
2426 2757
2427our @ISA = CFClient::UI::HBox::; 2758our @ISA = CFClient::UI::ScrolledWindow::;
2428 2759
2429sub new { 2760sub new {
2430 my $class = shift; 2761 my $class = shift;
2431 2762
2432 my %args = @_;
2433
2434 my $item = delete $args{item};
2435
2436 my $desc = $item->{nrof} < 2
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440
2441 my $self = $class->SUPER::new ( 2763 my $self = $class->SUPER::new (
2442 can_hover => 1, 2764 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2443 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 # todo: maybe put examine on 1? but should just be a tooltip :(
2450 if ($ev->{button} == 1) {
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2452 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new (
2456 items => [
2457 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465 ],
2466 )->popup ($ev);
2467 }
2468
2469 1
2470 },
2471 %args
2472 );
2473
2474 $self->add (new CFClient::UI::Face
2475 can_events => 0,
2476 face => $item->{face},
2477 anim => $item->{anim},
2478 animspeed => $item->{animspeed},
2479 );
2480
2481 $self->add (new CFClient::UI::Label
2482 can_events => 0,
2483 text => $desc,
2484 );
2485
2486 $self
2487}
2488
2489#############################################################################
2490
2491package CFClient::UI::Inventory;
2492
2493our @ISA = CFClient::UI::ScrolledWindow::;
2494
2495sub new {
2496 my $class = shift;
2497
2498 my $self = $class->SUPER::new (
2499 scrolled => (new CFClient::UI::VBox),
2500 @_, 2765 @_,
2501 ); 2766 );
2502 2767
2503 $self 2768 $self
2504} 2769}
… …
2507 my ($self, $items) = @_; 2772 my ($self, $items) = @_;
2508 2773
2509 $self->{scrolled}->clear; 2774 $self->{scrolled}->clear;
2510 return unless $items; 2775 return unless $items;
2511 2776
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2777 my @items = sort {
2778 ($a->{type} <=> $b->{type})
2779 or ($a->{name} cmp $b->{name})
2780 } @$items;
2513 2781
2514 $self->{real_items} = \@items; 2782 $self->{real_items} = \@items;
2515 2783
2784 my $row = 0;
2516 for my $item (@items) { 2785 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2 2786 CFClient::Item::update_widgets $item;
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520 2787
2521 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2788 $self->{scrolled}->add (0, $row, $item->{face_widget});
2522 } 2789 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2790 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2523 2791
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2792 $row++;
2525} 2793 }
2526
2527sub size_request {
2528 my ($self) = @_;
2529 ($self->{req_w}, $self->{req_h});
2530} 2794}
2531 2795
2532############################################################################# 2796#############################################################################
2533 2797
2534package CFClient::UI::Menu; 2798package CFClient::UI::Menu;
… …
2569 2833
2570# 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)
2571sub popup { 2835sub popup {
2572 my ($self, $ev) = @_; 2836 my ($self, $ev) = @_;
2573 2837
2574 $self->emit ("popdown"); 2838 $self->_emit ("popdown");
2575 2839
2576 # maybe save $GRAB? must be careful about events... 2840 # maybe save $GRAB? must be careful about events...
2577 $GRAB = $self; 2841 $GRAB = $self;
2578 $self->{button} = $ev->{button}; 2842 $self->{button} = $ev->{button};
2579 2843
… …
2594 2858
2595 if ($ev->{button} == $self->{button}) { 2859 if ($ev->{button} == $self->{button}) {
2596 undef $GRAB; 2860 undef $GRAB;
2597 $self->hide; 2861 $self->hide;
2598 2862
2599 $self->emit ("popdown"); 2863 $self->_emit ("popdown");
2600 $self->{hover}[1]->() if $self->{hover}; 2864 $self->{hover}[1]->() if $self->{hover};
2601 } 2865 }
2602} 2866}
2603 2867
2604############################################################################# 2868#############################################################################
2605 2869
2606package CFClient::UI::Statusbox; 2870package CFClient::UI::Statusbox;
2607 2871
2608our @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}
2609 2882
2610sub reorder { 2883sub reorder {
2611 my ($self) = @_; 2884 my ($self) = @_;
2612 my $NOW = time; 2885 my $NOW = time;
2613 2886
… …
2632 ? "<b>$item->{count} ×</b> $item->{text}" 2905 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text}; 2906 : $item->{text};
2634 2907
2635 for ($short) { 2908 for ($short) {
2636 s/^\s+//; 2909 s/^\s+//;
2637 s/\012.*/…/s; 2910 s/\s+/ /g;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 } 2911 }
2641 2912
2642 new CFClient::UI::Label 2913 new CFClient::UI::Label
2643 markup => $short, 2914 markup => $short,
2644 tooltip => $item->{tooltip}, 2915 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP, 2916 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67, 2917 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize}, 2918 fontsize => $item->{fontsize} || $self->{fontsize},
2919 max_w => $::WIDTH * 0.44,
2648 color => $item->{color}, 2920 fg => $item->{fg},
2649 can_events => 1, 2921 can_events => 1,
2650 can_hover => 1 2922 can_hover => 1
2651 }; 2923 };
2652 } 2924 }
2653 2925
… …
2658sub add { 2930sub add {
2659 my ($self, $text, %arg) = @_; 2931 my ($self, $text, %arg) = @_;
2660 2932
2661 $text =~ s/^\s+//; 2933 $text =~ s/^\s+//;
2662 $text =~ s/\s+$//; 2934 $text =~ s/\s+$//;
2935
2936 return unless $text;
2663 2937
2664 my $timeout = time + ((delete $arg{timeout}) || 60); 2938 my $timeout = time + ((delete $arg{timeout}) || 60);
2665 2939
2666 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2940 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667 2941
… …
2679 $self->{item}{$group} = { 2953 $self->{item}{$group} = {
2680 id => ++$self->{id}, 2954 id => ++$self->{id},
2681 text => $text, 2955 text => $text,
2682 timeout => $timeout, 2956 timeout => $timeout,
2683 tooltip => $text, 2957 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8], 2958 fg => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0, 2959 pri => 0,
2687 count => 1, 2960 count => 1,
2688 %arg, 2961 %arg,
2689 }; 2962 };
2690 } 2963 }
2691 2964
2692 $self->reorder; 2965 $self->reorder;
2693} 2966}
2694 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
2695############################################################################# 2978#############################################################################
2696 2979
2697package CFClient::UI::Root; 2980package CFClient::UI::Root;
2698 2981
2699our @ISA = CFClient::UI::Container::; 2982our @ISA = CFClient::UI::Container::;
… …
2701use CFClient::OpenGL; 2984use CFClient::OpenGL;
2702 2985
2703sub new { 2986sub new {
2704 my $class = shift; 2987 my $class = shift;
2705 2988
2706 $class->SUPER::new ( 2989 my $self = $class->SUPER::new (
2990 visible => 1,
2707 @_, 2991 @_,
2708 ) 2992 );
2993
2994 Scalar::Util::weaken ($self->{root} = $self);
2995
2996 $self
2709} 2997}
2710 2998
2711sub configure { 2999sub configure {
2712 my ($self, $x, $y, $w, $h) = @_; 3000 my ($self, $x, $y, $w, $h) = @_;
2713 3001
2714 $self->{w} = $w; 3002 $self->{w} = $w;
2715 $self->{h} = $h; 3003 $self->{h} = $h;
2716} 3004}
2717 3005
2718sub check_size { 3006sub reconfigure {
2719 my ($self) = @_; 3007 my ($self) = @_;
2720 3008
3009 $self->SUPER::reconfigure;
3010
2721 $self->size_allocate ($self->{w}, $self->{h}) 3011 $self->size_allocate ($self->{w}, $self->{h}, 1)
2722 if $self->{w}; 3012 if $self->{w};
2723} 3013}
2724 3014
2725sub size_request { 3015sub size_request {
2726 my ($self) = @_; 3016 my ($self) = @_;
2727 3017
2728 ($self->{w}, $self->{h}) 3018 ($self->{w}, $self->{h})
2729} 3019}
2730 3020
2731sub size_allocate { 3021sub size_allocate {
2732 my ($self, $w, $h) = @_; 3022 my ($self, $w, $h, $changed) = @_;
2733
2734 my $old_w = $self->{old_w};
2735 my $old_h = $self->{old_h};
2736
2737 if ($old_w && $old_h) {
2738 for my $child ($self->children) {
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749 3023
2750 for my $child ($self->children) { 3024 for my $child ($self->children) {
2751 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)};
2752 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
2753 $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;
2754 $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
2755 $child->configure ($X, $Y, $W, $H); 3038 $child->configure ($X, $Y, $W, $H);
2756 } 3039 }
2757
2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760} 3040}
2761 3041
2762sub coord2local { 3042sub coord2local {
2763 my ($self, $x, $y) = @_; 3043 my ($self, $x, $y) = @_;
2764 3044
… …
2772} 3052}
2773 3053
2774sub update { 3054sub update {
2775 my ($self) = @_; 3055 my ($self) = @_;
2776 3056
2777 $self->check_size;
2778 $::WANT_REFRESH++; 3057 $::WANT_REFRESH++;
2779} 3058}
2780 3059
2781sub add { 3060sub add {
2782 my ($self, $child) = @_; 3061 my ($self, @children) = @_;
2783 3062
3063 for my $child (@children) {
3064 $child->{is_toplevel} = 1;
3065
2784 # integerise window positions 3066 # integerise window positions
2785 $child->{x} = int $child->{x}; 3067 $child->{x} = int $child->{x};
2786 $child->{y} = int $child->{y}; 3068 $child->{y} = int $child->{y};
3069 }
2787 3070
2788 $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 }
2789} 3084}
2790 3085
2791sub on_refresh { 3086sub on_refresh {
2792 my ($self, $id, $cb) = @_; 3087 my ($self, $id, $cb) = @_;
2793 3088
… …
2806 while ($self->{refresh_hook}) { 3101 while ($self->{refresh_hook}) {
2807 $_->() 3102 $_->()
2808 for values %{delete $self->{refresh_hook}}; 3103 for values %{delete $self->{refresh_hook}};
2809 } 3104 }
2810 3105
2811 if ($self->{check_size}) { 3106 if ($self->{realloc}) {
2812 my @queue = ([], []); 3107 my @queue;
2813 3108
2814 for (;;) { 3109 while () {
2815 if ($self->{check_size}) { 3110 if ($self->{realloc}) {
2816 # heuristic: check containers last 3111 #TODO use array-of-depth approach
2817 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3112
2818 for values %{delete $self->{check_size}} 3113 @queue = sort { $a->{visible} <=> $b->{visible} }
3114 @queue, values %{delete $self->{realloc}};
2819 } 3115 }
2820 3116
2821 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3117 my $widget = pop @queue || last;
2822 3118
3119 $widget->{visible} or last; # do not resize invisible widgets
3120
2823 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3121 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2824 ? @$widget{qw(user_w user_h)} 3122 ? @$widget{qw(def_w def_h)}
2825 : $widget->size_request; 3123 : $widget->size_request;
2826 3124
2827 if (delete $widget->{force_alloc}
2828 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2829 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#
2830 3126
2831 $widget->{req_w} = $w; 3127 $widget->{req_w} = $w;
2832 $widget->{req_h} = $h; 3128 $widget->{req_h} = $h;
2833 3129
2834 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3130 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2835 3131
2836 $widget->{parent}->check_size 3132 push @queue, $widget->{parent}
2837 if $widget->{parent}; 3133 if $widget->{parent};
2838 }
2839 } 3134 }
2840 } 3135 }
2841 3136
2842 while ($self->{size_alloc}) { 3137 while (my $size_alloc = delete $self->{size_alloc}) {
2843 for (values %{delete $self->{size_alloc}}) { 3138 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2844 my ($widget, $w, $h) = @$_; 3139 values %$size_alloc;
3140
3141 while () {
3142 my ($widget, $w, $h) = @{ pop @queue or last };
2845 3143
2846 $w = 0 if $w < 0; 3144 $w = 0 if $w < 0;
2847 $h = 0 if $h < 0; 3145 $h = 0 if $h < 0;
2848 3146
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3148
2849 $widget->{w} = $w; 3149 $widget->{w} = $w;
2850 $widget->{h} = $h; 3150 $widget->{h} = $h;
2851 $widget->size_allocate ($w, $h); 3151
2852 $widget->emit (size_allocate => $w, $h); 3152 $widget->emit (size_allocate => $w, $h, $changed);
2853 } 3153 }
2854 } 3154 }
2855 3155
2856 while ($self->{post_alloc_hook}) { 3156 while ($self->{post_alloc_hook}) {
2857 $_->() 3157 $_->()
… …
2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3162 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2863 glClear GL_COLOR_BUFFER_BIT; 3163 glClear GL_COLOR_BUFFER_BIT;
2864 3164
2865 glMatrixMode GL_PROJECTION; 3165 glMatrixMode GL_PROJECTION;
2866 glLoadIdentity; 3166 glLoadIdentity;
2867 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3167 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2868 glMatrixMode GL_MODELVIEW; 3168 glMatrixMode GL_MODELVIEW;
2869 glLoadIdentity; 3169 glLoadIdentity;
2870 3170
2871 $self->_draw; 3171 $self->_draw;
2872} 3172}
… …
2874############################################################################# 3174#############################################################################
2875 3175
2876package CFClient::UI; 3176package CFClient::UI;
2877 3177
2878$ROOT = new CFClient::UI::Root; 3178$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip; 3179$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2880 3180
28811 31811
2882 3182

Diff Legend

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