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

Diff Legend

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