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.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 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
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $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 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
152sub rescale_widgets { 171sub rescale_widgets {
153 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
154 173
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
165 } 189 }
166 } 190 }
167 191
168 reconfigure_widgets; 192 reconfigure_widgets;
169} 193}
… …
178 202
179sub new { 203sub new {
180 my $class = shift; 204 my $class = shift;
181 205
182 my $self = bless { 206 my $self = bless {
183 x => 0, 207 x => "center",
184 y => 0, 208 y => "center",
185 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
186 can_events => 1, 212 can_events => 1,
187 @_ 213 @_
188 }, $class; 214 }, $class;
189 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
190 for (keys %$self) { 218 for (keys %$self) {
191 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
193 } 221 }
194 } 222 }
195 223
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
197 235
198 $self 236 $self
199} 237}
200 238
201sub destroy { 239sub destroy {
… …
205 %$self = (); 243 %$self = ();
206} 244}
207 245
208sub show { 246sub show {
209 my ($self) = @_; 247 my ($self) = @_;
248
210 return if $self->{parent}; 249 return if $self->{parent};
211 250
212 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
213} 252}
214 253
215sub show_centered { 254sub set_visible {
216 my ($self) = @_; 255 my ($self) = @_;
256
217 return if $self->{parent}; 257 return if $self->{visible};
218 258
219 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
220 261
221 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 263
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
224 }, 265
225 ); 266 $_->set_visible for $self->children;
226} 267}
227 268
228sub set_invisible { 269sub set_invisible {
229 my ($self) = @_; 270 my ($self) = @_;
230 271
231 # broken show/hide model 272 return unless $self->{visible};
232 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
233 delete $self->{visible}; 277 delete $self->{visible};
234 278
235 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
237 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
238 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
239} 305}
240 306
241sub hide { 307sub hide {
242 my ($self) = @_; 308 my ($self) = @_;
243 309
… …
245 311
246 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
247 if $self->{parent}; 313 if $self->{parent};
248} 314}
249 315
250sub move { 316sub move_abs {
251 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
252 318
253 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
254 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
255 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
256 322
257 $self->update; 323 $self->update;
258} 324}
259 325
260sub set_size { 326sub set_size {
261 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
262 328
263 $self->{user_w} = $w; 329 $self->{force_w} = $w;
264 $self->{user_h} = $h; 330 $self->{force_h} = $h;
265 331
266 $self->check_size; 332 $self->realloc;
267} 333}
268 334
269sub size_request { 335sub size_request {
270 require Carp; 336 require Carp;
271 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
273 339
274sub configure { 340sub configure {
275 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
276 342
277 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
278 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
279 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
280 348
281 # use alignment to adjust x, y 349 # use alignment to adjust x, y
282 350
283 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
284 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
285
286 ($w, $h) = ($w2, $h2);
287 } 353 }
288 354
289 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
290 $self->{x} = $x; 356 $self->{x} = $x;
291 $self->{y} = $y; 357 $self->{y} = $y;
292 $self->update; 358 $self->update;
293 } 359 }
294 360
295 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
296 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
297 } 368 }
298} 369}
299 370
300sub size_allocate { 371sub size_allocate {
301 # nothing to be done 372 # nothing to be done
302} 373}
303 374
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
311sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
312} 381}
313 382
314sub set_max_size { 383sub set_max_size {
315 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
316 385
… …
318 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
319} 388}
320 389
321sub set_tooltip { 390sub set_tooltip {
322 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
323 397
324 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
325 399
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
370 444
371 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
372 unless $FOCUS; 446 unless $FOCUS;
373} 447}
374 448
375sub mouse_motion { } 449sub mouse_motion { 0 }
376sub button_up { } 450sub button_up { 0 }
377sub key_down { } 451sub key_down { 0 }
378sub key_up { } 452sub key_up { 0 }
379 453
380sub button_down { 454sub button_down {
381 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
382 456
383 $self->focus_in; 457 $self->focus_in;
384}
385 458
386sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
387sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
388sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
389sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
390sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
391 535
392sub draw { 536sub draw {
393 my ($self) = @_; 537 my ($self) = @_;
394 538
395 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
396 550
397 glPushMatrix; 551 glPushMatrix;
398 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
399 $self->_draw; 553 $self->_draw;
400 glPopMatrix; 554 glPopMatrix;
… …
412 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
413 glEnd; 567 glEnd;
414 glDisable GL_BLEND; 568 glDisable GL_BLEND;
415 } 569 }
416 570
417 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
418 glPushMatrix; 572 glPushMatrix;
419 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 576 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
424 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
425 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
426 glEnd; 580 glEnd;
427 glPopMatrix; 581 glPopMatrix;
428 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
429 } 583 }
430} 584}
431 585
432sub _draw { 586sub _draw {
433 my ($self) = @_; 587 my ($self) = @_;
434 588
435 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
436}
437
438sub find_widget {
439 my ($self, $x, $y) = @_;
440
441 return () unless $self->{can_events};
442
443 return $self
444 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
445 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
446
447 ()
448}
449
450sub set_parent {
451 my ($self, $parent) = @_;
452
453 Scalar::Util::weaken ($self->{parent} = $parent);
454
455 # TODO: req_w _does_change after ->reconfigure
456 $self->check_size
457 unless exists $self->{req_w};
458
459 $self->show;
460}
461
462sub check_size {
463 my ($self, $forced) = @_;
464
465 $self->{force_alloc} = 1 if $forced;
466 $CFClient::UI::ROOT->{check_size}{$self} = $self;
467}
468
469sub update {
470 my ($self) = @_;
471
472 $self->{parent}->update
473 if $self->{parent};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493} 590}
494 591
495sub DESTROY { 592sub DESTROY {
496 my ($self) = @_; 593 my ($self) = @_;
497 594
… …
555 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
556 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
557} 654}
558 655
559sub size_request { 656sub size_request {
560 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
561} 660}
562 661
563sub draw { } 662sub draw { }
564 663
565############################################################################# 664#############################################################################
… …
569our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
570 669
571sub new { 670sub new {
572 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
573 672
574 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
575 674
576 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
577 children => [], 676 children => [],
578 can_events => 0, 677 can_events => 0,
579 %arg, 678 %arg,
580 ); 679 );
680
581 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
582 683
583 $self 684 $self
584} 685}
585 686
586sub add { 687sub add {
… …
594 $self->{children} = [ 695 $self->{children} = [
595 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
596 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
597 ]; 698 ];
598 699
599 $self->check_size (1); 700 $self->realloc;
600 $self->update;
601} 701}
602 702
603sub children { 703sub children {
604 @{ $_[0]{children} } 704 @{ $_[0]{children} }
605} 705}
… …
610 delete $child->{parent}; 710 delete $child->{parent};
611 $child->hide; 711 $child->hide;
612 712
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 714
615 $self->check_size; 715 $self->realloc;
616 $self->update;
617} 716}
618 717
619sub clear { 718sub clear {
620 my ($self) = @_; 719 my ($self) = @_;
621 720
… …
625 for (@$children) { 724 for (@$children) {
626 delete $_->{parent}; 725 delete $_->{parent};
627 $_->hide; 726 $_->hide;
628 } 727 }
629 728
630 $self->check_size; 729 $self->realloc;
631 $self->update;
632} 730}
633 731
634sub find_widget { 732sub find_widget {
635 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
636 734
637 $x -= $self->{x}; 735 $x -= $self->{x};
638 $y -= $self->{y}; 736 $y -= $self->{y};
639 737
640 my $res; 738 my $res;
641 739
642 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
643 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
644 and return $res; 742 and return $res;
645 } 743 }
646 744
647 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
696 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
697} 795}
698 796
699############################################################################# 797#############################################################################
700 798
799# back-buffered drawing area
800
701package CFClient::UI::Window; 801package CFClient::UI::Window;
702 802
703our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
704 804
705use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
723 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
724 $self->update; 824 $self->update;
725} 825}
726 826
727sub _render { 827sub _render {
828 my ($self) = @_;
829
728 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
729} 831}
730 832
731sub render_child { 833sub render_child {
732 my ($self) = @_; 834 my ($self) = @_;
733 835
734 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
735 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
736 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
737 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
738 $self->_render; 847 $self->_render;
739 }; 848 };
740} 849}
741 850
742sub _draw { 851sub _draw {
743 my ($self) = @_; 852 my ($self) = @_;
744 853
745 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
746 855
747 my $tex = $self->{texture} 856 my $tex = $self->{texture}
748 or return; 857 or return;
749 858
750 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
… …
760 869
761package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
762 871
763our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
764 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
765sub size_request { 884sub size_request {
766 my ($self) = @_; 885 my ($self) = @_;
767 886
768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
769 888
770 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
771} 893}
772 894
773sub size_allocate { 895sub size_allocate {
774 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
775 897
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 898 my $child = $self->child;
777# $w = $self->{w}; 899
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902
778 $self->child->configure (0, 0, $cw, $ch); 903 $self->child->configure (0, 0, $w, $h);
779 $self->update; 904 $self->update;
780} 905}
781 906
782sub set_offset { 907sub set_offset {
783 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
… …
817} 942}
818 943
819sub _render { 944sub _render {
820 my ($self) = @_; 945 my ($self) = @_;
821 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
822 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
823 951
824 $self->SUPER::_render; 952 $self->SUPER::_render;
825} 953}
826 954
… …
829package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
830 958
831our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
832 960
833sub new { 961sub new {
834 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
835 965
836 my $self; 966 my $self;
837 967
838 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
839 vertical => 1, 969 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 971 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 972 $self->{vp}->set_offset (0, $_[1]);
843 }, 973 },
844 ; 974 ;
845 975
846 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
847 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
848 slider => $slider, 978 slider => $slider,
849 @_, 979 %arg,
850 ); 980 );
851 981
852 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
855 984
856 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
992}
993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857} 1002}
858 1003
859sub size_allocate { 1004sub size_allocate {
860 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
861 1006
… …
914 1059
915our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
916 1061
917use CFClient::OpenGL; 1062use CFClient::OpenGL;
918 1063
919my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
921 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922 1071
923sub new { 1072sub new {
924 my $class = shift; 1073 my ($class, %arg) = @_;
925 1074
926 # TODO: user_x, user_y, overwrite moveto? 1075 my $title = delete $arg{title};
927 1076
928 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1080 border => 0.6,
932 is_toplevel => 1,
933 can_events => 1, 1081 can_events => 1,
934 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
935 ); 1085 );
936 1086
937 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
938 align => 0, 1088 align => 0,
939 valign => 1, 1089 valign => 1,
940 text => $self->{title}, 1090 text => $title,
941 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
942 1093
943 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
944} 1102}
945 1103
946sub border { 1104sub border {
947 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
948} 1106}
949 1107
950sub size_request { 1108sub size_request {
951 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
952 1113
953 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
954 1115
955 ( 1116 (
956 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
959} 1120}
960 1121
961sub size_allocate { 1122sub size_allocate {
962 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
963 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
964 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
965 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
966 1135
967 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
968 if $self->{title};
969
970 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
971} 1137}
972 1138
973sub button_down { 1139sub button_down {
974 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
975 1141
… …
991 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
992 1158
993 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
995 1161
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
1165 $self->realloc;
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999 $self->check_size;
1000 }; 1167 };
1001 1168
1002 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1006 $self->{motion} = sub { 1173 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1008 1175
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1177
1011 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012 $self->update;
1013 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
1014 } 1184 1
1015} 1185}
1016 1186
1017sub button_up { 1187sub button_up {
1018 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
1019 1189
1020 delete $self->{motion}; 1190 !!delete $self->{motion}
1021} 1191}
1022 1192
1023sub mouse_motion { 1193sub mouse_motion {
1024 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
1025 1195
1026 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
1027} 1199}
1028 1200
1029sub _draw { 1201sub _draw {
1030 my ($self) = @_; 1202 my ($self) = @_;
1031 1203
1204 my $child = $self->{children}[0];
1205
1032 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
1033 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
1034 1208
1035 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
1036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037 1211
1038 my $border = $self->border; 1212 my $border = $self->border;
1039 1213
1040 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
1041 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1042 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045 1219
1046 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047 my $bg = $tex[0]; 1221 glColor @{ $self->{bg} };
1048 1222
1049 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
1224 # solve this better(?)
1050 my $rep_x = $cw / $bg->{w}; 1225 $bg->{s} = $cw / $bg->{w};
1051 my $rep_y = $ch / $bg->{h}; 1226 $bg->{t} = $ch / $bg->{h};
1052
1053 glColor @{ $self->{bg} };
1054
1055 $bg->{s} = $rep_x;
1056 $bg->{t} = $rep_y;
1057 $bg->{wrap_mode} = 1;
1058 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059 } 1228 }
1060 1229
1061 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
1062 1231
1063 $self->{title}->draw if $self->{title};
1064
1065 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
1066} 1238}
1067 1239
1068############################################################################# 1240#############################################################################
1069 1241
1070package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
1078sub new { 1250sub new {
1079 my $class = shift; 1251 my $class = shift;
1080 1252
1081 $class->SUPER::new ( 1253 $class->SUPER::new (
1082 col_expand => [], 1254 col_expand => [],
1083 @_ 1255 @_,
1084 ) 1256 )
1257}
1258
1259sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1261}
1086 1262
1087sub add { 1263sub add {
1088 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
1089 1265
1090 $child->set_parent ($self); 1266 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
1092 1268
1093 $child->check_size; 1269 $self->realloc;
1094} 1270}
1095 1271
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# TODO: move to container class maybe? send childs a signal on removal? 1272# TODO: move to container class maybe? send children a signal on removal?
1101sub clear { 1273sub clear {
1102 my ($self) = @_; 1274 my ($self) = @_;
1103 1275
1104 my @children = $self->children; 1276 my @children = $self->children;
1105 delete $self->{children}; 1277 delete $self->{children};
… …
1107 for (@children) { 1279 for (@children) {
1108 delete $_->{parent}; 1280 delete $_->{parent};
1109 $_->hide; 1281 $_->hide;
1110 } 1282 }
1111 1283
1112 $self->update; 1284 $self->realloc;
1113} 1285}
1114 1286
1115sub get_wh { 1287sub get_wh {
1116 my ($self) = @_; 1288 my ($self) = @_;
1117 1289
… …
1148sub size_allocate { 1320sub size_allocate {
1149 my ($self, $w, $h) = @_; 1321 my ($self, $w, $h) = @_;
1150 1322
1151 my ($ws, $hs) = $self->get_wh; 1323 my ($ws, $hs) = $self->get_wh;
1152 1324
1153 my $req_w = sum @$ws; 1325 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1326 my $req_h = (sum @$hs) || 1;
1155 1327
1156 # TODO: nicer code && do row_expand 1328 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1329 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1330 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1331 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1385 }
1214} 1386}
1215 1387
1216############################################################################# 1388#############################################################################
1217 1389
1218package CFClient::UI::HBox; 1390package CFClient::UI::Box;
1219
1220# TODO: wrap into common Box base class
1221 1391
1222our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Container::;
1223 1393
1224sub size_request { 1394sub size_request {
1225 my ($self) = @_; 1395 my ($self) = @_;
1226 1396
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $self->{vertical}
1228 1398 ? (
1229 ( 1399 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1230 (List::Util::sum map $_->[0], @alloc), 1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231 (List::Util::max map $_->[1], @alloc), 1401 )
1232 ) 1402 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 )
1233} 1406}
1234 1407
1235sub size_allocate { 1408sub size_allocate {
1236 my ($self, $w, $h) = @_; 1409 my ($self, $w, $h) = @_;
1237 1410
1238 ($h, $w) = ($w, $h); 1411 my $space = $self->{vertical} ? $h : $w;
1239
1240 my $children = $self->{children}; 1412 my $children = $self->{children};
1241 1413
1242 my @h = map $_->{req_w}, @$children; 1414 my @req;
1243 1415
1244 my $req_h = List::Util::sum @h; 1416 if ($self->{homogeneous}) {
1245 1417 @req = ($space / (@$children || 1)) x @$children;
1246 if ($req_h > $h) {
1247 # ah well, not enough space
1248 $_ *= $h / $req_h for @h;
1249 } else { 1418 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1420 my $req = List::Util::sum @req;
1421
1422 if ($req > $space) {
1423 # ah well, not enough space
1424 $_ *= $space / $req for @req;
1425 } else {
1250 my $exp = List::Util::sum map $_->{expand}, @$children; 1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251 $exp ||= 1;
1252 1427
1428 $space = ($space - $req) / $expand; # remaining space to give away
1429
1430 $req[$_] += $space * $children->[$_]{expand}
1253 for (0 .. $#$children) { 1431 for 0 .. $#$children;
1254 my $child = $children->[$_];
1255
1256 my $alloc_h = $h[$_];
1257 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1258 $h[$_] = $alloc_h;
1259 } 1432 }
1260 } 1433 }
1261 1434
1262 CFClient::UI::harmonize \@h; 1435 CFClient::UI::harmonize \@req;
1263 1436
1264 my $y = 0; 1437 my $pos = 0;
1265 for (0 .. $#$children) { 1438 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_]; 1439 my $alloc = $req[$_];
1268 $child->configure ($y, 0, $h, $w); 1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269 1441
1270 $y += $h; 1442 $pos += $alloc;
1271 } 1443 }
1272 1444
1273 1 1445 1
1274} 1446}
1275 1447
1276############################################################################# 1448#############################################################################
1277 1449
1450package CFClient::UI::HBox;
1451
1452our @ISA = CFClient::UI::Box::;
1453
1454sub new {
1455 my $class = shift;
1456
1457 $class->SUPER::new (
1458 vertical => 0,
1459 @_,
1460 )
1461}
1462
1463#############################################################################
1464
1278package CFClient::UI::VBox; 1465package CFClient::UI::VBox;
1279 1466
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1467our @ISA = CFClient::UI::Box::;
1283 1468
1284sub size_request { 1469sub new {
1285 my ($self) = @_; 1470 my $class = shift;
1286 1471
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1472 $class->SUPER::new (
1288 1473 vertical => 1,
1289 ( 1474 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1475 )
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1300 my $children = $self->{children};
1301
1302 my @h = map $_->{req_h}, @$children;
1303
1304 my $req_h = List::Util::sum @h;
1305
1306 if ($req_h > $h) {
1307 # ah well, not enough space
1308 $_ *= $h / $req_h for @h;
1309 } else {
1310 my $exp = List::Util::sum map $_->{expand}, @$children;
1311 $exp ||= 1;
1312
1313 for (0 .. $#$children) {
1314 my $child = $children->[$_];
1315
1316 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1317 }
1318 }
1319
1320 CFClient::UI::harmonize \@h;
1321
1322 my $y = 0;
1323 for (0 .. $#$children) {
1324 my $child = $children->[$_];
1325 my $h = $h[$_];
1326 $child->configure (0, $y, $w, $h);
1327
1328 $y += $h;
1329 }
1330
1331 1
1332} 1476}
1333 1477
1334############################################################################# 1478#############################################################################
1335 1479
1336package CFClient::UI::Label; 1480package CFClient::UI::Label;
… …
1353 ellipsise => 3, # end 1497 ellipsise => 3, # end
1354 layout => (new CFClient::Layout), 1498 layout => (new CFClient::Layout),
1355 fontsize => 1, 1499 fontsize => 1,
1356 align => -1, 1500 align => -1,
1357 valign => -1, 1501 valign => -1,
1358 padding => 2, 1502 padding_x => 2,
1503 padding_y => 2,
1359 can_events => 0, 1504 can_events => 0,
1360 %arg 1505 %arg
1361 ); 1506 );
1362 1507
1363 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1399 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1400 1545
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1403 1548
1549 $self->realloc;
1404 $self->update; 1550 $self->update;
1405 $self->check_size;
1406} 1551}
1407 1552
1408sub set_markup { 1553sub set_markup {
1409 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1410 1555
… …
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415 1560
1416 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1418 1563
1564 $self->realloc;
1419 $self->update; 1565 $self->update;
1420 $self->check_size;
1421} 1566}
1422 1567
1423sub size_request { 1568sub size_request {
1424 my ($self) = @_; 1569 my ($self) = @_;
1425 1570
… …
1439 1584
1440 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1441 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1442 } 1587 }
1443 1588
1444 ( 1589 ($w, $h)
1445 $w + $self->{padding} * 2,
1446 $h + $self->{padding} * 2,
1447 )
1448} 1590}
1449 1591
1450sub size_allocate { 1592sub size_allocate {
1451 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1452 1594
1595 delete $self->{ox};
1596
1453 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1454} 1599}
1455 1600
1456sub set_fontsize { 1601sub set_fontsize {
1457 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1458 1603
1459 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1460 delete $self->{texture}; 1605 delete $self->{texture};
1461 1606
1462 $self->update; 1607 $self->realloc;
1463 $self->check_size;
1464} 1608}
1465 1609
1466sub _draw { 1610sub _draw {
1467 my ($self) = @_; 1611 my ($self) = @_;
1468 1612
… …
1474 $self->{layout}->set_width ($self->{w}); 1618 $self->{layout}->set_width ($self->{w});
1475 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1619 $self->{layout}->set_ellipsise ($self->{ellipsise});
1476 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478 1622
1479 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1480 1625
1626 unless (exists $self->{ox}) {
1481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483 : ($self->{w} - $tex->{w}) * 0.5); 1629 : ($self->{w} - $tex->{w}) * 0.5);
1484 1630
1485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487 : ($self->{h} - $tex->{h}) * 0.5); 1633 : ($self->{h} - $tex->{h}) * 0.5);
1488
1489 $tex
1490 }; 1634 };
1491 1635
1492 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1638
… …
1532 1676
1533 delete $self->{cur_h}; 1677 delete $self->{cur_h};
1534 1678
1535 return if $self->{text} eq $text; 1679 return if $self->{text} eq $text;
1536 1680
1537 delete $self->{texture};
1538
1539 $self->{last_activity} = $::NOW; 1681 $self->{last_activity} = $::NOW;
1540 $self->{text} = $text; 1682 $self->{text} = $text;
1541 1683
1542 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1543 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1544 1686
1545 $self->_emit (changed => $self->{text}); 1687 $self->_emit (changed => $self->{text});
1688 $self->update;
1546} 1689}
1547 1690
1548sub set_text { 1691sub set_text {
1549 my ($self, $text) = @_; 1692 my ($self, $text) = @_;
1550 1693
1551 $self->{cursor} = length $text; 1694 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1695 $self->_set_text ($text);
1553 $self->update; 1696
1554 $self->check_size; 1697 $self->realloc;
1555} 1698}
1556 1699
1557sub get_text { 1700sub get_text {
1558 $_[0]{text} 1701 $_[0]{text}
1559} 1702}
… …
1562 my ($self) = @_; 1705 my ($self) = @_;
1563 1706
1564 my ($w, $h) = $self->SUPER::size_request; 1707 my ($w, $h) = $self->SUPER::size_request;
1565 1708
1566 ($w + 1, $h) # add 1 for cursor 1709 ($w + 1, $h) # add 1 for cursor
1567}
1568
1569sub size_allocate {
1570 my ($self, $w, $h) = @_;
1571
1572 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573} 1710}
1574 1711
1575sub key_down { 1712sub key_down {
1576 my ($self, $ev) = @_; 1713 my ($self, $ev) = @_;
1577 1714
… …
1595 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1596 } elsif ($uni == 27) { 1733 } elsif ($uni == 27) {
1597 $self->_emit ('escape'); 1734 $self->_emit ('escape');
1598 } elsif ($uni) { 1735 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1736 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else {
1738 return 0;
1600 } 1739 }
1601 1740
1602 $self->_set_text ($text); 1741 $self->_set_text ($text);
1603 $self->update; 1742
1604 $self->check_size; 1743 $self->realloc;
1744
1745 1
1605} 1746}
1606 1747
1607sub focus_in { 1748sub focus_in {
1608 my ($self) = @_; 1749 my ($self) = @_;
1609 1750
… …
1624 utf8::encode $text; 1765 utf8::encode $text;
1625 $self->{cursor} = length substr $text, 0, $idx; 1766 $self->{cursor} = length substr $text, 0, $idx;
1626 1767
1627 $self->_set_text ($self->{text}); 1768 $self->_set_text ($self->{text});
1628 $self->update; 1769 $self->update;
1770
1771 1
1629} 1772}
1630 1773
1631sub mouse_motion { 1774sub mouse_motion {
1632 my ($self, $ev, $x, $y) = @_; 1775 my ($self, $ev, $x, $y) = @_;
1633# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1776# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1777
1778 0
1634} 1779}
1635 1780
1636sub _draw { 1781sub _draw {
1637 my ($self) = @_; 1782 my ($self) = @_;
1638 1783
… …
1715 } else { 1860 } else {
1716 $self->set_text ($self->{history_saveback}); 1861 $self->set_text ($self->{history_saveback});
1717 } 1862 }
1718 1863
1719 } else { 1864 } else {
1720 $self->SUPER::key_down ($ev); 1865 return $self->SUPER::key_down ($ev)
1866 }
1867
1721 } 1868 1
1722
1723} 1869}
1724 1870
1725############################################################################# 1871#############################################################################
1726 1872
1727package CFClient::UI::Button; 1873package CFClient::UI::Button;
… …
1736 1882
1737sub new { 1883sub new {
1738 my $class = shift; 1884 my $class = shift;
1739 1885
1740 $class->SUPER::new ( 1886 $class->SUPER::new (
1741 padding => 4, 1887 padding_x => 4,
1888 padding_y => 4,
1742 fg => [1, 1, 1], 1889 fg => [1, 1, 1],
1743 active_fg => [0, 0, 1], 1890 active_fg => [0, 0, 1],
1744 can_hover => 1, 1891 can_hover => 1,
1745 align => 0, 1892 align => 0,
1746 valign => 0, 1893 valign => 0,
… …
1755 my ($self, $ev, $x, $y) = @_; 1902 my ($self, $ev, $x, $y) = @_;
1756 1903
1757 $self->emit ("activate") 1904 $self->emit ("activate")
1758 if $x >= 0 && $x < $self->{w} 1905 if $x >= 0 && $x < $self->{w}
1759 && $y >= 0 && $y < $self->{h}; 1906 && $y >= 0 && $y < $self->{h};
1907
1908 1
1760} 1909}
1761 1910
1762sub _draw { 1911sub _draw {
1763 my ($self) = @_; 1912 my ($self) = @_;
1764 1913
… …
1793 1942
1794sub new { 1943sub new {
1795 my $class = shift; 1944 my $class = shift;
1796 1945
1797 $class->SUPER::new ( 1946 $class->SUPER::new (
1798 padding => 2, 1947 padding_x => 2,
1948 padding_y => 2,
1799 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1800 active_fg => [1, 1, 0], 1950 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2], 1951 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5], 1952 active_bg => [1, 1, 1, 0.5],
1803 state => 0, 1953 state => 0,
… …
1807} 1957}
1808 1958
1809sub size_request { 1959sub size_request {
1810 my ($self) = @_; 1960 my ($self) = @_;
1811 1961
1812 ($self->{padding} * 2 + 6) x 2 1962 (6) x 2
1813} 1963}
1814 1964
1815sub button_down { 1965sub button_down {
1816 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1817 1967
1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820 $self->{state} = !$self->{state}; 1970 $self->{state} = !$self->{state};
1821 $self->_emit (changed => $self->{state}); 1971 $self->_emit (changed => $self->{state});
1972 } else {
1973 return 0
1974 }
1975
1822 } 1976 1
1823} 1977}
1824 1978
1825sub _draw { 1979sub _draw {
1826 my ($self) = @_; 1980 my ($self) = @_;
1827 1981
1828 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1829 1983
1830 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1984 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831 1985
1832 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1986 my ($w, $h) = @$self{qw(w h)};
1987
1988 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833 1989
1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1990 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835 1991
1836 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1992 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837 1993
… …
2102 fg => [1, 1, 1], 2258 fg => [1, 1, 1],
2103 active_fg => [0, 0, 0], 2259 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2], 2260 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5], 2261 active_bg => [1, 1, 1, 0.5],
2106 range => [0, 0, 100, 10, 0], 2262 range => [0, 0, 100, 10, 0],
2107 req_w => $::WIDTH / 80, 2263 min_w => $::WIDTH / 80,
2108 req_h => $::WIDTH / 80, 2264 min_h => $::WIDTH / 80,
2109 vertical => 0, 2265 vertical => 0,
2110 can_hover => 1, 2266 can_hover => 1,
2111 inner_pad => 0.02, 2267 inner_pad => 0.02,
2112 @_ 2268 @_
2113 ); 2269 );
… …
2116 $self->update; 2272 $self->update;
2117 2273
2118 $self 2274 $self
2119} 2275}
2120 2276
2277sub changed { }
2278
2121sub set_range { 2279sub set_range {
2122 my ($self, $range) = @_; 2280 my ($self, $range) = @_;
2123 2281
2124 $self->{range} = $range; 2282 ($range, $self->{range}) = ($self->{range}, $range);
2125 2283
2126 $self->update; 2284 $self->update
2285 if "@$range" ne "@{$self->{range}}";
2127} 2286}
2128 2287
2129sub set_value { 2288sub set_value {
2130 my ($self, $value) = @_; 2289 my ($self, $value) = @_;
2131 2290
… …
2150} 2309}
2151 2310
2152sub size_request { 2311sub size_request {
2153 my ($self) = @_; 2312 my ($self) = @_;
2154 2313
2155 my $w = $self->{req_w}; 2314 ($self->{req_w}, $self->{req_h})
2156 my $h = $self->{req_h};
2157
2158 $self->{vertical} ? ($h, $w) : ($w, $h)
2159} 2315}
2160 2316
2161sub button_down { 2317sub button_down {
2162 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
2163 2319
2164 $self->SUPER::button_down ($ev, $x, $y); 2320 $self->SUPER::button_down ($ev, $x, $y);
2165 2321
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167 2323
2168 $self->mouse_motion ($ev, $x, $y); 2324 $self->mouse_motion ($ev, $x, $y)
2169} 2325}
2170 2326
2171sub mouse_motion { 2327sub mouse_motion {
2172 my ($self, $ev, $x, $y) = @_; 2328 my ($self, $ev, $x, $y) = @_;
2173 2329
… …
2177 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2333 my (undef, $lo, $hi, $page) = @{$self->{range}};
2178 2334
2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2335 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180 2336
2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2337 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2338 } else {
2339 return 0;
2340 }
2341
2182 } 2342 1
2183} 2343}
2184 2344
2185sub update { 2345sub update {
2186 my ($self) = @_; 2346 my ($self) = @_;
2187 2347
2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2348 delete $self->{knob_w};
2349 $self->SUPER::update;
2350}
2351
2352sub _draw {
2353 my ($self) = @_;
2354
2355 unless ($self->{knob_w}) {
2189 $self->set_value ($self->{range}[0]); 2356 $self->set_value ($self->{range}[0]);
2190 2357
2191 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2358 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100; 2359 my $range = ($hi - $page - $lo) || 1e-100;
2193 2360
… …
2199 $value = ($value - $lo) / $range; 2366 $value = ($value - $lo) / $range;
2200 $value = $value * $self->{scale} + $self->{offset}; 2367 $value = $value * $self->{scale} + $self->{offset};
2201 2368
2202 $self->{knob_x} = $value - $knob_w * 0.5; 2369 $self->{knob_x} = $value - $knob_w * 0.5;
2203 $self->{knob_w} = $knob_w; 2370 $self->{knob_w} = $knob_w;
2204 }); 2371 }
2205
2206 $self->SUPER::update;
2207}
2208
2209sub _draw {
2210 my ($self) = @_;
2211 2372
2212 $self->SUPER::_draw (); 2373 $self->SUPER::_draw ();
2213 2374
2214 glScale $self->{w}, $self->{h}; 2375 glScale $self->{w}, $self->{h};
2215 2376
… …
2514 2675
2515sub new { 2676sub new {
2516 my $class = shift; 2677 my $class = shift;
2517 2678
2518 my $self = $class->SUPER::new ( 2679 my $self = $class->SUPER::new (
2519 state => 0, 2680 state => 0,
2520 connect_activate => \&toggle_flopper, 2681 on_activate => \&toggle_flopper,
2521 @_ 2682 @_
2522 ); 2683 );
2523 2684
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2685 $self
2530} 2686}
2531 2687
2532sub toggle_flopper { 2688sub toggle_flopper {
2533 my ($self) = @_; 2689 my ($self) = @_;
2534 2690
2535 # TODO: use animation 2691 $self->{other}->toggle_visibility;
2536 if ($self->{state} = !$self->{state}) {
2537 $CFClient::UI::ROOT->add ($self->{other});
2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2539 $self->_emit ("open");
2540 } else {
2541 $CFClient::UI::ROOT->remove ($self->{other});
2542 $self->_emit ("close");
2543 }
2544
2545 $self->_emit (changed => $self->{state});
2546} 2692}
2547 2693
2548############################################################################# 2694#############################################################################
2549 2695
2550package CFClient::UI::Tooltip; 2696package CFClient::UI::Tooltip;
… …
2563} 2709}
2564 2710
2565sub set_tooltip_from { 2711sub set_tooltip_from {
2566 my ($self, $widget) = @_; 2712 my ($self, $widget) = @_;
2567 2713
2714 my $tooltip = $widget->{tooltip};
2715
2716 if ($ENV{CFPLUS_DEBUG} & 2) {
2717 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}";
2721 }
2722
2568 $self->add (new CFClient::UI::Label 2723 $self->add (new CFClient::UI::Label
2569 markup => $widget->{tooltip}, 2724 markup => $tooltip,
2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571 fontsize => 0.8, 2726 fontsize => 0.8,
2572 fg => [0, 0, 0, 1], 2727 fg => [0, 0, 0, 1],
2573 ellipsise => 0, 2728 ellipsise => 0,
2574 font => ($widget->{tooltip_font} || $::FONT_PROP), 2729 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2585 2740
2586sub size_allocate { 2741sub size_allocate {
2587 my ($self, $w, $h) = @_; 2742 my ($self, $w, $h) = @_;
2588 2743
2589 $self->SUPER::size_allocate ($w - 4, $h - 4); 2744 $self->SUPER::size_allocate ($w - 4, $h - 4);
2745}
2746
2747sub visibility_change {
2748 my ($self, $visible) = @_;
2749
2750 return unless $visible;
2751
2752 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner}
2754 or return;
2755
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH;
2760
2761 $self->move_abs ($x, $y);
2762 });
2590} 2763}
2591 2764
2592sub _draw { 2765sub _draw {
2593 my ($self) = @_; 2766 my ($self) = @_;
2594 2767
… …
2611 glVertex $w, $h; 2784 glVertex $w, $h;
2612 glVertex $w, 0; 2785 glVertex $w, 0;
2613 glEnd; 2786 glEnd;
2614 2787
2615 glTranslate 2 - 0.375, 2 - 0.375; 2788 glTranslate 2 - 0.375, 2 - 0.375;
2789
2616 $self->SUPER::_draw; 2790 $self->SUPER::_draw;
2617} 2791}
2618 2792
2619############################################################################# 2793#############################################################################
2620 2794
… …
2626 2800
2627sub new { 2801sub new {
2628 my $class = shift; 2802 my $class = shift;
2629 2803
2630 my $self = $class->SUPER::new ( 2804 my $self = $class->SUPER::new (
2631 aspect => 1, 2805 aspect => 1,
2806 can_events => 0,
2632 @_, 2807 @_,
2633 ); 2808 );
2634 2809
2635 if ($self->{anim} && $self->{animspeed}) { 2810 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2811 Scalar::Util::weaken (my $widget = $self);
… …
2695 $self->SUPER::DESTROY; 2870 $self->SUPER::DESTROY;
2696} 2871}
2697 2872
2698############################################################################# 2873#############################################################################
2699 2874
2700package CFClient::UI::InventoryItem; 2875package CFClient::UI::Buttonbar;
2701 2876
2702our @ISA = CFClient::UI::HBox::; 2877our @ISA = CFClient::UI::HBox::;
2703 2878
2704sub _item_to_desc { 2879# TODO: should actualyl wrap buttons and other goodies.
2705 my ($item) = @_;
2706
2707 my $desc =
2708 $item->{nrof} < 2
2709 ? $item->{name}
2710 : "$item->{nrof} × $item->{name_pl}";
2711
2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2713 and $desc .= " (open)";
2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2715 and $desc .= " (applied)";
2716 $item->{flags} & Crossfire::Protocol::F_UNPAID
2717 and $desc .= " (unpaid)";
2718 $item->{flags} & Crossfire::Protocol::F_MAGIC
2719 and $desc .= " (magic)";
2720 $item->{flags} & Crossfire::Protocol::F_CURSED
2721 and $desc .= " (cursed)";
2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2723 and $desc .= " (damned)";
2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2725 and $desc .= " *";
2726
2727 $desc
2728}
2729
2730sub new {
2731 my $class = shift;
2732
2733 my %args = @_;
2734
2735 my $item = delete $args{item};
2736
2737 my $desc = _item_to_desc ($item);
2738
2739 my $self = $class->SUPER::new (
2740 can_hover => 1,
2741 can_events => 1,
2742 tooltip => ((CFClient::UI::Label::escape $desc)
2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744 connect_button_down => sub {
2745 my ($self, $ev, $x, $y) = @_;
2746
2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2756 } elsif ($ev->{button} == 1) {
2757 $::CONN->send ("examine $item->{tag}");
2758 } elsif ($ev->{button} == 2) {
2759 $::CONN->send ("apply $item->{tag}");
2760 } elsif ($ev->{button} == 3) {
2761 my @menu_items = (
2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2774 ),
2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778 }
2779
2780 1
2781 },
2782 %args
2783 );
2784
2785
2786 $self->add (new CFClient::UI::Face
2787 can_events => 0,
2788 face => $item->{face},
2789 anim => $item->{anim},
2790 animspeed => $item->{animspeed},
2791 );
2792
2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795 $self->{item} = $item;
2796
2797 $self->update_item;
2798
2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Inventory;
2813
2814our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816sub new {
2817 my $class = shift;
2818
2819 my $self = $class->SUPER::new (
2820 scrolled => (new CFClient::UI::Table),
2821 @_,
2822 );
2823
2824 $self
2825}
2826
2827sub set_items {
2828 my ($self, $items) = @_;
2829
2830 $self->{scrolled}->clear;
2831 return unless $items;
2832
2833 my @items = sort {
2834 ($a->{type} <=> $b->{type})
2835 or ($a->{name} cmp $b->{name})
2836 } @$items;
2837
2838 $self->{real_items} = \@items;
2839
2840 for my $item (@items) {
2841 $item->{item} = $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845
2846 my $i = 0;
2847 for (@items) {
2848 $self->{scrolled}->add (0, $i, $_);
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2852
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2854}
2855
2856sub size_request {
2857 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h});
2859}
2860 2880
2861############################################################################# 2881#############################################################################
2862 2882
2863package CFClient::UI::Menu; 2883package CFClient::UI::Menu;
2864 2884
… …
2905 # maybe save $GRAB? must be careful about events... 2925 # maybe save $GRAB? must be careful about events...
2906 $GRAB = $self; 2926 $GRAB = $self;
2907 $self->{button} = $ev->{button}; 2927 $self->{button} = $ev->{button};
2908 2928
2909 $self->show; 2929 $self->show;
2910 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2930 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2911} 2931}
2912 2932
2913sub mouse_motion { 2933sub mouse_motion {
2914 my ($self, $ev, $x, $y) = @_; 2934 my ($self, $ev, $x, $y) = @_;
2915 2935
2916 # TODO: should use vbox->find_widget or so 2936 # TODO: should use vbox->find_widget or so
2917 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2918 $self->{hover} = $self->{item}{$HOVER}; 2938 $self->{hover} = $self->{item}{$HOVER};
2939
2940 0
2919} 2941}
2920 2942
2921sub button_up { 2943sub button_up {
2922 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2923 2945
… …
2925 undef $GRAB; 2947 undef $GRAB;
2926 $self->hide; 2948 $self->hide;
2927 2949
2928 $self->_emit ("popdown"); 2950 $self->_emit ("popdown");
2929 $self->{hover}[1]->() if $self->{hover}; 2951 $self->{hover}[1]->() if $self->{hover};
2952 } else {
2953 return 0
2954 }
2955
2956 1
2957}
2958
2959#############################################################################
2960
2961package CFClient::UI::Multiplexer;
2962
2963our @ISA = CFClient::UI::Container::;
2964
2965sub new {
2966 my $class = shift;
2967
2968 my $self = $class->SUPER::new (
2969 @_,
2970 );
2971
2972 $self->{current} = $self->{children}[0]
2973 if @{ $self->{children} };
2974
2975 $self
2976}
2977
2978sub add {
2979 my ($self, @widgets) = @_;
2980
2981 $self->SUPER::add (@widgets);
2982
2983 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} };
2985}
2986
2987sub set_current_page {
2988 my ($self, $page_or_widget) = @_;
2989
2990 my $widget = ref $page_or_widget
2991 ? $page_or_widget
2992 : $self->{children}[$page_or_widget];
2993
2994 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996
2997 $self->_emit (page_changed => $self->{current});
2998
2999 $self->realloc;
3000}
3001
3002sub visible_children {
3003 $_[0]{current}
3004}
3005
3006sub size_request {
3007 my ($self) = @_;
3008
3009 $self->{current}->size_request
3010}
3011
3012sub size_allocate {
3013 my ($self, $w, $h) = @_;
3014
3015 $self->{current}->configure (0, 0, $w, $h);
3016}
3017
3018sub _draw {
3019 my ($self) = @_;
3020
3021 $self->{current}->draw;
3022}
3023
3024#############################################################################
3025
3026package CFClient::UI::Notebook;
3027
3028our @ISA = CFClient::UI::VBox::;
3029
3030sub new {
3031 my $class = shift;
3032
3033 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3036 # filter => # will be put between multiplexer and $self
3037 @_,
3038 );
2930 } 3039
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3041 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3042
3043 $self
3044}
3045
3046sub add {
3047 my ($self, $title, $widget, $tooltip) = @_;
3048
3049 Scalar::Util::weaken $self;
3050
3051 $self->{buttonbar}->add (new CFClient::UI::Button
3052 markup => $title,
3053 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) },
3055 );
3056
3057 $self->{multiplexer}->add ($widget);
3058}
3059
3060sub set_current_page {
3061 my ($self, $page) = @_;
3062
3063 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current});
2931} 3065}
2932 3066
2933############################################################################# 3067#############################################################################
2934 3068
2935package CFClient::UI::Statusbox; 3069package CFClient::UI::Statusbox;
… …
2995sub add { 3129sub add {
2996 my ($self, $text, %arg) = @_; 3130 my ($self, $text, %arg) = @_;
2997 3131
2998 $text =~ s/^\s+//; 3132 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 3133 $text =~ s/\s+$//;
3134
3135 return unless $text;
3000 3136
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 3137 my $timeout = time + ((delete $arg{timeout}) || 60);
3002 3138
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 3140
… …
3038 $self->SUPER::reconfigure; 3174 $self->SUPER::reconfigure;
3039} 3175}
3040 3176
3041############################################################################# 3177#############################################################################
3042 3178
3043package CFClient::UI::Root; 3179package CFClient::UI::Inventory;
3044 3180
3045our @ISA = CFClient::UI::Container::; 3181our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047use CFClient::OpenGL;
3048 3182
3049sub new { 3183sub new {
3050 my $class = shift; 3184 my $class = shift;
3051 3185
3052 $class->SUPER::new ( 3186 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3188 @_,
3189 );
3190
3191 $self
3192}
3193
3194sub set_items {
3195 my ($self, $items) = @_;
3196
3197 $self->{child}->clear;
3198 return unless $items;
3199
3200 my @items = sort {
3201 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name})
3203 } @$items;
3204
3205 $self->{real_items} = \@items;
3206
3207 my $row = 0;
3208 for my $item (@items) {
3209 CFClient::Item::update_widgets $item;
3210
3211 $self->{child}->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget});
3214
3215 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 }
3414}
3415
3416#############################################################################
3417
3418package CFClient::UI::SpellList;
3419
3420our @ISA = CFClient::UI::Table::;
3421
3422sub new {
3423 my $class = shift;
3424
3425 my $self = $class->SUPER::new (
3426 binding => [],
3427 commands => [],
3053 @_, 3428 @_,
3054 ) 3429 )
3055} 3430}
3056 3431
3057sub configure { 3432# XXX: Do sorting? Argl...
3058 my ($self, $x, $y, $w, $h) = @_; 3433sub add_spell {
3059
3060 $self->{w} = $w;
3061 $self->{h} = $h;
3062}
3063
3064sub check_size {
3065 my ($self) = @_; 3434 my ($self, $spell) = @_;
3435 $self->{spells}->{$spell->{name}} = $spell;
3066 3436
3067 $self->size_allocate ($self->{w}, $self->{h}) 3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3068 if $self->{w}; 3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464}
3465
3466sub remove_spell {
3467 my ($self, $spell) = @_;
3468 delete $self->{spells}->{$spell->{name}};
3469 $self->rebuild_spell_list;
3470}
3471
3472#############################################################################
3473
3474package CFClient::UI::Root;
3475
3476our @ISA = CFClient::UI::Container::;
3477
3478use CFClient::OpenGL;
3479
3480sub new {
3481 my $class = shift;
3482
3483 my $self = $class->SUPER::new (
3484 visible => 1,
3485 @_,
3486 );
3487
3488 Scalar::Util::weaken ($self->{root} = $self);
3489
3490 $self
3069} 3491}
3070 3492
3071sub size_request { 3493sub size_request {
3072 my ($self) = @_; 3494 my ($self) = @_;
3073 3495
3074 ($self->{w}, $self->{h}) 3496 ($self->{w}, $self->{h})
3497}
3498
3499sub _to_pixel {
3500 my ($coord, $size, $max) = @_;
3501
3502 $coord =
3503 $coord eq "center" ? ($max - $size) * 0.5
3504 : $coord eq "max" ? $max
3505 : $coord;
3506
3507 $coord = 0 if $coord < 0;
3508 $coord = $max - $size if $coord > $max - $size;
3509
3510 int $coord + 0.5
3075} 3511}
3076 3512
3077sub size_allocate { 3513sub size_allocate {
3078 my ($self, $w, $h) = @_; 3514 my ($self, $w, $h) = @_;
3079 3515
3080 for my $child ($self->children) { 3516 for my $child ($self->children) {
3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082 3518
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3519 $X = $child->{force_x} if exists $child->{force_x};
3084 if exists $child->{req_x}; 3520 $Y = $child->{force_y} if exists $child->{force_y};
3085 3521
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3522 $X = _to_pixel $X, $W, $self->{w};
3087 if exists $child->{req_y}; 3523 $Y = _to_pixel $Y, $H, $self->{h};
3088
3089 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3090 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091 3524
3092 $child->configure ($X, $Y, $W, $H); 3525 $child->configure ($X, $Y, $W, $H);
3093 } 3526 }
3094} 3527}
3095 3528
… …
3106} 3539}
3107 3540
3108sub update { 3541sub update {
3109 my ($self) = @_; 3542 my ($self) = @_;
3110 3543
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3544 $::WANT_REFRESH++;
3113} 3545}
3114 3546
3115sub add { 3547sub add {
3116 my ($self, @children) = @_; 3548 my ($self, @children) = @_;
3117 3549
3118 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children;
3120 $w->{root} = $self;
3121 $w->{visible} = 1;
3122 }
3123
3124 for my $child (@children) {
3125 $child->{is_toplevel} = 1; 3550 $_->{is_toplevel} = 1
3126 3551 for @children;
3127 # integerise window positions
3128 $child->{x} = int $child->{x};
3129 $child->{y} = int $child->{y};
3130 }
3131 3552
3132 $self->SUPER::add (@children); 3553 $self->SUPER::add (@children);
3133} 3554}
3134 3555
3135sub remove { 3556sub remove {
3136 my ($self, @children) = @_; 3557 my ($self, @children) = @_;
3137 3558
3138 $self->SUPER::remove (@children); 3559 $self->SUPER::remove (@children);
3560
3561 delete $self->{is_toplevel}
3562 for @children;
3139 3563
3140 while (@children) { 3564 while (@children) {
3141 my $w = pop @children; 3565 my $w = pop @children;
3142 push @children, $w->children; 3566 push @children, $w->children;
3143 $w->set_invisible; 3567 $w->set_invisible;
… …
3162 while ($self->{refresh_hook}) { 3586 while ($self->{refresh_hook}) {
3163 $_->() 3587 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3588 for values %{delete $self->{refresh_hook}};
3165 } 3589 }
3166 3590
3167 if ($self->{check_size}) { 3591 if ($self->{realloc}) {
3168 my @queue = ([], []); 3592 my %queue;
3593 my @queue;
3594 my $widget;
3169 3595
3170 for (;;) { 3596 outer:
3171 if ($self->{check_size}) { 3597 while () {
3172 # heuristic: check containers last 3598 if (my $realloc = delete $self->{realloc}) {
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3599 for $widget (values %$realloc) {
3174 for values %{delete $self->{check_size}} 3600 $widget->{visible} or next; # do not resize invisible widgets
3601
3602 $queue{$widget+0}++ and next; # duplicates are common
3603
3604 push @{ $queue[$widget->{visible}] }, $widget;
3605 }
3175 } 3606 }
3176 3607
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3608 while () {
3609 @queue or last outer;
3178 3610
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3611 $widget = pop @{ $queue[-1] || [] }
3180 ? @$widget{qw(user_w user_h)} 3612 and last;
3181 : $widget->size_request;
3182
3183 if (delete $widget->{force_alloc}
3184 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3185 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3186 3613
3614 pop @queue;
3615 }
3616
3617 delete $queue{$widget+0};
3618
3619 my ($w, $h) = $widget->size_request;
3620
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3623
3624 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h};
3626
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3628 || delete $widget->{force_realloc}) {
3187 $widget->{req_w} = $w; 3629 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3630 $widget->{req_h} = $h;
3189 3631
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3632 $self->{size_alloc}{$widget+0} = $widget;
3191 3633
3192 $widget->{parent}->check_size
3193 if $widget->{parent}; 3634 if (my $parent = $widget->{parent}) {
3635 $self->{realloc}{$parent+0} = $parent
3636 unless $queue{$parent+0};
3637
3638 $parent->{force_size_alloc} = 1;
3639 $self->{size_alloc}{$parent+0} = $parent;
3640 }
3194 } 3641 }
3642
3643 delete $self->{realloc}{$widget+0};
3195 } 3644 }
3196 } 3645 }
3197 3646
3198 while ($self->{size_alloc}) { 3647 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3648 my @queue = sort { $b->{visible} <=> $a->{visible} }
3200 my ($widget, $w, $h) = @$_; 3649 values %$size_alloc;
3650
3651 while () {
3652 my $widget = pop @queue || last;
3653
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3201 3655
3202 $w = 0 if $w < 0; 3656 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3657 $h = 0 if $h < 0;
3204 3658
3659 $w = int $w + 0.5;
3660 $h = int $h + 0.5;
3661
3662 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3663 $widget->{old_w} = $widget->{w};
3664 $widget->{old_h} = $widget->{h};
3665
3205 $widget->{w} = $w; 3666 $widget->{w} = $w;
3206 $widget->{h} = $h; 3667 $widget->{h} = $h;
3668
3207 $widget->emit (size_allocate => $w, $h); 3669 $widget->emit (size_allocate => $w, $h);
3670 }
3208 } 3671 }
3209 } 3672 }
3210 3673
3211 while ($self->{post_alloc_hook}) { 3674 while ($self->{post_alloc_hook}) {
3212 $_->() 3675 $_->()
3213 for values %{delete $self->{post_alloc_hook}}; 3676 for values %{delete $self->{post_alloc_hook}};
3214 } 3677 }
3678
3215 3679
3216 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3680 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3681 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218 glClear GL_COLOR_BUFFER_BIT; 3682 glClear GL_COLOR_BUFFER_BIT;
3219 3683
… …
3221 glLoadIdentity; 3685 glLoadIdentity;
3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3223 glMatrixMode GL_MODELVIEW; 3687 glMatrixMode GL_MODELVIEW;
3224 glLoadIdentity; 3688 glLoadIdentity;
3225 3689
3690 {
3691 package CFClient::UI::Base;
3692
3693 ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h});
3695 }
3696
3226 $self->_draw; 3697 $self->_draw;
3227} 3698}
3228 3699
3229############################################################################# 3700#############################################################################
3230 3701

Diff Legend

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