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

Diff Legend

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