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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC

17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 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};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 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
177 $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.]+$/;
178 $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};
179 $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};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $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.]+$/;
182 $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};
183 $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};
184 $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
185 } 189 }
186 } 190 }
187 191
188 reconfigure_widgets; 192 reconfigure_widgets;
189} 193}
198 202
199sub new { 203sub new {
200 my $class = shift; 204 my $class = shift;
201 205
202 my $self = bless { 206 my $self = bless {
203 x => 0, 207 x => "center",
204 y => 0, 208 y => "center",
205 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
206 can_events => 1, 212 can_events => 1,
207 @_ 213 @_
208 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 217
210 for (keys %$self) { 218 for (keys %$self) {
211 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
213 } 221 }
214 } 222 }
215 223
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 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};
223 } 234 }
224 235
225 $self 236 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 237}
237 238
238sub destroy { 239sub destroy {
239 my ($self) = @_; 240 my ($self) = @_;
240 241
242 %$self = (); 243 %$self = ();
243} 244}
244 245
245sub show { 246sub show {
246 my ($self) = @_; 247 my ($self) = @_;
248
247 return if $self->{parent}; 249 return if $self->{parent};
248 250
249 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
250} 252}
251 253
252sub show_centered { 254sub set_visible {
253 my ($self) = @_; 255 my ($self) = @_;
256
254 return if $self->{parent}; 257 return if $self->{visible};
255 258
256 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
257 261
258 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
259 "centered $self" => sub { 263
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
261 }, 265
262 ); 266 $_->set_visible for $self->children;
263} 267}
264 268
265sub set_invisible { 269sub set_invisible {
266 my ($self) = @_; 270 my ($self) = @_;
267 271
268 return unless $self->{visible}; 272 return unless $self->{visible};
269 273
270 # broken show/hide model 274 $_->set_invisible for $self->children;
271 275
272 delete $self->{root}; 276 delete $self->{root};
273 delete $self->{visible}; 277 delete $self->{visible};
274 278
275 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
277 281
278 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
280 284
281 $self->focus_out; 285 $self->focus_out;
282 286
283 $self->emit (visibility_change => 0); 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;
284} 305}
285 306
286sub hide { 307sub hide {
287 my ($self) = @_; 308 my ($self) = @_;
288 309
290 311
291 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
292 if $self->{parent}; 313 if $self->{parent};
293} 314}
294 315
295sub move { 316sub move_abs {
296 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
297 318
298 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
299 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
300 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
301 322
302 $self->update; 323 $self->update;
303} 324}
304 325
305sub set_size { 326sub set_size {
306 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
307 328
308 $self->{user_w} = $w; 329 $self->{force_w} = $w;
309 $self->{user_h} = $h; 330 $self->{force_h} = $h;
310 331
311 $self->check_size; 332 $self->realloc;
312} 333}
313 334
314sub size_request { 335sub size_request {
315 require Carp; 336 require Carp;
316 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
318 339
319sub configure { 340sub configure {
320 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
321 342
322 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
323 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
324 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
325 348
326 # use alignment to adjust x, y 349 # use alignment to adjust x, y
327 350
328 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
329 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
330
331 ($w, $h) = ($w2, $h2);
332 } 353 }
333 354
334 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
335 $self->{x} = $x; 356 $self->{x} = $x;
336 $self->{y} = $y; 357 $self->{y} = $y;
337 $self->update; 358 $self->update;
338 } 359 }
339 360
340 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
341 $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;
342 } 368 }
343} 369}
344 370
345sub size_allocate { 371sub size_allocate {
346 # nothing to be done 372 # nothing to be done
347}
348
349sub reconfigure {
350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354} 373}
355 374
356sub children { 375sub children {
357} 376}
358 377
420 439
421 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
422 unless $FOCUS; 441 unless $FOCUS;
423} 442}
424 443
425sub mouse_motion { } 444sub mouse_motion { 0 }
426sub button_up { } 445sub button_up { 0 }
427sub key_down { } 446sub key_down { 0 }
428sub key_up { } 447sub key_up { 0 }
429 448
430sub button_down { 449sub button_down {
431 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
432 451
433 $self->focus_in; 452 $self->focus_in;
434}
435 453
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
440sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
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}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
441 530
442sub draw { 531sub draw {
443 my ($self) = @_; 532 my ($self) = @_;
444 533
445 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
446 545
447 glPushMatrix; 546 glPushMatrix;
448 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
449 $self->_draw; 548 $self->_draw;
450 glPopMatrix; 549 glPopMatrix;
462 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
463 glEnd; 562 glEnd;
464 glDisable GL_BLEND; 563 glDisable GL_BLEND;
465 } 564 }
466 565
467 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
468 glPushMatrix; 567 glPushMatrix;
469 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
471 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
472 glVertex 0 , 0; 571 glVertex 0 , 0;
483 my ($self) = @_; 582 my ($self) = @_;
484 583
485 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
486} 585}
487 586
488sub find_widget {
489 my ($self, $x, $y) = @_;
490
491 return () unless $self->{can_events};
492
493 return $self
494 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497 ()
498}
499
500sub set_parent {
501 my ($self, $parent) = @_;
502
503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 587sub DESTROY {
558 my ($self) = @_; 588 my ($self) = @_;
559 589
560 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
561 #$self->deactivate; 591 #$self->deactivate;
617 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
619} 649}
620 650
621sub size_request { 651sub size_request {
622 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
623} 655}
624 656
625sub draw { } 657sub draw { }
626 658
627############################################################################# 659#############################################################################
656 $self->{children} = [ 688 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 690 @{$self->{children}}, @widgets
659 ]; 691 ];
660 692
661 $self->check_size (1); 693 $self->realloc;
662 $self->update;
663} 694}
664 695
665sub children { 696sub children {
666 @{ $_[0]{children} } 697 @{ $_[0]{children} }
667} 698}
672 delete $child->{parent}; 703 delete $child->{parent};
673 $child->hide; 704 $child->hide;
674 705
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 707
677 $self->check_size (1); 708 $self->realloc;
678 $self->update;
679} 709}
680 710
681sub clear { 711sub clear {
682 my ($self) = @_; 712 my ($self) = @_;
683 713
687 for (@$children) { 717 for (@$children) {
688 delete $_->{parent}; 718 delete $_->{parent};
689 $_->hide; 719 $_->hide;
690 } 720 }
691 721
692 $self->check_size; 722 $self->realloc;
693 $self->update;
694} 723}
695 724
696sub find_widget { 725sub find_widget {
697 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
698 727
785 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 815 $self->update;
787} 816}
788 817
789sub _render { 818sub _render {
819 my ($self) = @_;
820
790 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
791} 822}
792 823
793sub render_child { 824sub render_child {
794 my ($self) = @_; 825 my ($self) = @_;
795 826
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 827 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
799 830
831 {
832 package CFClient::UI::Base;
833
834 ($draw_x, $draw_y, $draw_w, $draw_h) =
835 (0, 0, $self->{w}, $self->{h});
836 }
837
800 $self->_render; 838 $self->_render;
801 }; 839 };
802} 840}
803 841
804sub _draw { 842sub _draw {
805 my ($self) = @_; 843 my ($self) = @_;
806 844
807 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
808 846
809 my $tex = $self->{texture} 847 my $tex = $self->{texture}
810 or return; 848 or return;
811 849
812 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
835} 873}
836 874
837sub size_request { 875sub size_request {
838 my ($self) = @_; 876 my ($self) = @_;
839 877
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 879
842 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
843} 884}
844 885
845sub size_allocate { 886sub size_allocate {
846 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
847 888
889 my $child = $self->child;
890
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 893
851 $self->child->configure (0, 0, $w, $h); 894 $self->child->configure (0, 0, $w, $h);
852 $self->update; 895 $self->update;
853} 896}
854 897
889 } 932 }
890} 933}
891 934
892sub _render { 935sub _render {
893 my ($self) = @_; 936 my ($self) = @_;
937
938 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
939 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
894 940
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 942
897 $self->SUPER::_render; 943 $self->SUPER::_render;
898} 944}
997 1043
998our @ISA = CFClient::UI::Bin::; 1044our @ISA = CFClient::UI::Bin::;
999 1045
1000use CFClient::OpenGL; 1046use CFClient::OpenGL;
1001 1047
1002my @tex = 1048my $bg =
1049 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1050 mipmap => 1, wrap => 1;
1051
1052my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1053 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1055
1006sub new { 1056sub new {
1007 my $class = shift; 1057 my ($class, %arg) = @_;
1008 1058
1009 # TODO: user_x, user_y, overwrite moveto? 1059 my $title = delete $arg{title};
1010 1060
1011 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1064 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1065 can_events => 1,
1017 @_ 1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
1018 ); 1069 );
1019 1070
1020 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
1021 align => 0, 1072 align => 0,
1022 valign => 1, 1073 valign => 1,
1023 text => $self->{title}, 1074 text => $title,
1024 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
1025 1077
1026 $self 1078 $self
1079}
1080
1081sub add {
1082 my ($self, @widgets) = @_;
1083
1084 $self->SUPER::add (@widgets);
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1027} 1086}
1028 1087
1029sub border { 1088sub border {
1030 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
1031} 1090}
1032 1091
1033sub size_request { 1092sub size_request {
1034 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
1035 1097
1036 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
1037 1099
1038 ( 1100 (
1039 $w + $self->border * 2, 1101 $w + $self->border * 2,
1042} 1104}
1043 1105
1044sub size_allocate { 1106sub size_allocate {
1045 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
1046 1108
1109 if ($self->{title}) {
1110 $self->{title}{w} = $w;
1111 $self->{title}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h);
1113 }
1114
1115 my $border = $self->border;
1116
1047 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
1049 1119
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051 if $self->{title};
1052
1053 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
1054} 1121}
1055 1122
1056sub button_down { 1123sub button_down {
1057 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
1058 1125
1074 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
1075 1142
1076 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
1078 1145
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1148
1084 $self->check_size; 1149 $self->realloc;
1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085 }; 1151 };
1086 1152
1087 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
1091 $self->{motion} = sub { 1157 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1093 1159
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1161
1096 $self->{user_x} = $bx + $x - $ox; 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy;
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
1101 } 1168 1
1102} 1169}
1103 1170
1104sub button_up { 1171sub button_up {
1105 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
1106 1173
1107 delete $self->{motion}; 1174 !!delete $self->{motion}
1108} 1175}
1109 1176
1110sub mouse_motion { 1177sub mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
1112 1179
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
1114} 1183}
1115 1184
1116sub _draw { 1185sub _draw {
1117 my ($self) = @_; 1186 my ($self) = @_;
1118 1187
1188 my $child = $self->{children}[0];
1189
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1192
1122 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1195
1125 my $border = $self->border; 1196 my $border = $self->border;
1126 1197
1127 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1203
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
1135 1206
1136 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1210 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1212 }
1147 1213
1148 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
1149 1215
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
1153} 1222}
1154 1223
1155############################################################################# 1224#############################################################################
1156 1225
1157package CFClient::UI::Table; 1226package CFClient::UI::Table;
1179 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1180 1249
1181 $child->set_parent ($self); 1250 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1183 1252
1184 $self->check_size (1); 1253 $self->realloc;
1185} 1254}
1186 1255
1187# TODO: move to container class maybe? send children a signal on removal? 1256# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1257sub clear {
1189 my ($self) = @_; 1258 my ($self) = @_;
1194 for (@children) { 1263 for (@children) {
1195 delete $_->{parent}; 1264 delete $_->{parent};
1196 $_->hide; 1265 $_->hide;
1197 } 1266 }
1198 1267
1199 $self->check_size (1); 1268 $self->realloc;
1200 $self->update;
1201} 1269}
1202 1270
1203sub get_wh { 1271sub get_wh {
1204 my ($self) = @_; 1272 my ($self) = @_;
1205 1273
1301 } 1369 }
1302} 1370}
1303 1371
1304############################################################################# 1372#############################################################################
1305 1373
1306package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1307
1308# TODO: wrap into common Box base class
1309 1375
1310our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1311 1377
1312sub size_request { 1378sub size_request {
1313 my ($self) = @_; 1379 my ($self) = @_;
1314 1380
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1316 1382 ? (
1317 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1318 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319 (List::Util::max map $_->[1], @alloc), 1385 )
1320 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1321} 1390}
1322 1391
1323sub size_allocate { 1392sub size_allocate {
1324 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1325 1394
1326 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1327
1328 my $children = $self->{children}; 1396 my $children = $self->{children};
1329 1397
1330 my @h = map $_->{req_w}, @$children; 1398 my @req;
1331 1399
1332 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1333 1401 @req = ($space / (@$children || 1)) x @$children;
1334 if ($req_h > $h) {
1335 # ah well, not enough space
1336 $_ *= $h / $req_h for @h;
1337 } else { 1402 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1404 my $req = List::Util::sum @req;
1405
1406 if ($req > $space) {
1407 # ah well, not enough space
1408 $_ *= $space / $req for @req;
1409 } else {
1338 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1339 $exp ||= 1;
1340 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1341 for (0 .. $#$children) { 1415 for 0 .. $#$children;
1342 my $child = $children->[$_];
1343
1344 my $alloc_h = $h[$_];
1345 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346 $h[$_] = $alloc_h;
1347 } 1416 }
1348 } 1417 }
1349 1418
1350 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1351 1420
1352 my $y = 0; 1421 my $pos = 0;
1353 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1356 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357 1425
1358 $y += $h; 1426 $pos += $alloc;
1359 } 1427 }
1360 1428
1361 1 1429 1
1362} 1430}
1363 1431
1364############################################################################# 1432#############################################################################
1365 1433
1434package CFClient::UI::HBox;
1435
1436our @ISA = CFClient::UI::Box::;
1437
1438sub new {
1439 my $class = shift;
1440
1441 $class->SUPER::new (
1442 vertical => 0,
1443 @_,
1444 )
1445}
1446
1447#############################################################################
1448
1366package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1367 1450
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1371 1452
1372sub size_request { 1453sub new {
1373 my ($self) = @_; 1454 my $class = shift;
1374 1455
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1376 1457 vertical => 1,
1377 ( 1458 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1459 )
1381}
1382
1383sub size_allocate {
1384 my ($self, $w, $h) = @_;
1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388 my $children = $self->{children};
1389
1390 my @h = map $_->{req_h}, @$children;
1391
1392 my $req_h = List::Util::sum @h;
1393
1394 if ($req_h > $h) {
1395 # ah well, not enough space
1396 $_ *= $h / $req_h for @h;
1397 } else {
1398 my $exp = List::Util::sum map $_->{expand}, @$children;
1399 $exp ||= 1;
1400
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403
1404 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405 }
1406 }
1407
1408 CFClient::UI::harmonize \@h;
1409
1410 my $y = 0;
1411 for (0 .. $#$children) {
1412 my $child = $children->[$_];
1413 my $h = $h[$_];
1414 $child->configure (0, $y, $w, $h);
1415
1416 $y += $h;
1417 }
1418
1419 1
1420} 1460}
1421 1461
1422############################################################################# 1462#############################################################################
1423 1463
1424package CFClient::UI::Label; 1464package CFClient::UI::Label;
1441 ellipsise => 3, # end 1481 ellipsise => 3, # end
1442 layout => (new CFClient::Layout), 1482 layout => (new CFClient::Layout),
1443 fontsize => 1, 1483 fontsize => 1,
1444 align => -1, 1484 align => -1,
1445 valign => -1, 1485 valign => -1,
1446 padding => 2, 1486 padding_x => 2,
1487 padding_y => 2,
1447 can_events => 0, 1488 can_events => 0,
1448 %arg 1489 %arg
1449 ); 1490 );
1450 1491
1451 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
1487 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1488 1529
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1491 1532
1533 $self->realloc;
1492 $self->update; 1534 $self->update;
1493 $self->check_size;
1494} 1535}
1495 1536
1496sub set_markup { 1537sub set_markup {
1497 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1498 1539
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1544
1504 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1506 1547
1548 $self->realloc;
1507 $self->update; 1549 $self->update;
1508 $self->check_size;
1509} 1550}
1510 1551
1511sub size_request { 1552sub size_request {
1512 my ($self) = @_; 1553 my ($self) = @_;
1513 1554
1527 1568
1528 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1529 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1530 } 1571 }
1531 1572
1532 ( 1573 ($w, $h)
1533 $w + $self->{padding} * 2,
1534 $h + $self->{padding} * 2,
1535 )
1536} 1574}
1537 1575
1538sub size_allocate { 1576sub size_allocate {
1539 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1540 1578
1579 delete $self->{ox};
1580
1541 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1542} 1583}
1543 1584
1544sub set_fontsize { 1585sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1546 1587
1547 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1589 delete $self->{texture};
1549 1590
1550 $self->update; 1591 $self->realloc;
1551 $self->check_size;
1552} 1592}
1553 1593
1554sub _draw { 1594sub _draw {
1555 my ($self) = @_; 1595 my ($self) = @_;
1556 1596
1562 $self->{layout}->set_width ($self->{w}); 1602 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1603 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1606
1567 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1607 new_from_layout CFClient::Texture $self->{layout}
1608 };
1568 1609
1610 unless (exists $self->{ox}) {
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571 : ($self->{w} - $tex->{w}) * 0.5); 1613 : ($self->{w} - $tex->{w}) * 0.5);
1572 1614
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575 : ($self->{h} - $tex->{h}) * 0.5); 1617 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1578 }; 1618 };
1579 1619
1580 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1582 1622
1636sub set_text { 1676sub set_text {
1637 my ($self, $text) = @_; 1677 my ($self, $text) = @_;
1638 1678
1639 $self->{cursor} = length $text; 1679 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1680 $self->_set_text ($text);
1641 $self->update; 1681
1642 $self->check_size; 1682 $self->realloc;
1643} 1683}
1644 1684
1645sub get_text { 1685sub get_text {
1646 $_[0]{text} 1686 $_[0]{text}
1647} 1687}
1677 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1678 } elsif ($uni == 27) { 1718 } elsif ($uni == 27) {
1679 $self->_emit ('escape'); 1719 $self->_emit ('escape');
1680 } elsif ($uni) { 1720 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1682 } 1724 }
1683 1725
1684 $self->_set_text ($text); 1726 $self->_set_text ($text);
1685 $self->update; 1727
1686 $self->check_size; 1728 $self->realloc;
1729
1730 1
1687} 1731}
1688 1732
1689sub focus_in { 1733sub focus_in {
1690 my ($self) = @_; 1734 my ($self) = @_;
1691 1735
1706 utf8::encode $text; 1750 utf8::encode $text;
1707 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1708 1752
1709 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1710 $self->update; 1754 $self->update;
1755
1756 1
1711} 1757}
1712 1758
1713sub mouse_motion { 1759sub mouse_motion {
1714 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1715# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762
1763 0
1716} 1764}
1717 1765
1718sub _draw { 1766sub _draw {
1719 my ($self) = @_; 1767 my ($self) = @_;
1720 1768
1797 } else { 1845 } else {
1798 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1799 } 1847 }
1800 1848
1801 } else { 1849 } else {
1802 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1803 } 1853 1
1804
1805} 1854}
1806 1855
1807############################################################################# 1856#############################################################################
1808 1857
1809package CFClient::UI::Button; 1858package CFClient::UI::Button;
1818 1867
1819sub new { 1868sub new {
1820 my $class = shift; 1869 my $class = shift;
1821 1870
1822 $class->SUPER::new ( 1871 $class->SUPER::new (
1823 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1824 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1825 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1826 can_hover => 1, 1876 can_hover => 1,
1827 align => 0, 1877 align => 0,
1828 valign => 0, 1878 valign => 0,
1837 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1838 1888
1839 $self->emit ("activate") 1889 $self->emit ("activate")
1840 if $x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1841 && $y >= 0 && $y < $self->{h}; 1891 && $y >= 0 && $y < $self->{h};
1892
1893 1
1842} 1894}
1843 1895
1844sub _draw { 1896sub _draw {
1845 my ($self) = @_; 1897 my ($self) = @_;
1846 1898
1875 1927
1876sub new { 1928sub new {
1877 my $class = shift; 1929 my $class = shift;
1878 1930
1879 $class->SUPER::new ( 1931 $class->SUPER::new (
1880 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1881 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1882 active_fg => [1, 1, 0], 1935 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2], 1936 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5], 1937 active_bg => [1, 1, 1, 0.5],
1885 state => 0, 1938 state => 0,
1889} 1942}
1890 1943
1891sub size_request { 1944sub size_request {
1892 my ($self) = @_; 1945 my ($self) = @_;
1893 1946
1894 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1895} 1948}
1896 1949
1897sub button_down { 1950sub button_down {
1898 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1899 1952
1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1903 $self->_emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1904 } 1961 1
1905} 1962}
1906 1963
1907sub _draw { 1964sub _draw {
1908 my ($self) = @_; 1965 my ($self) = @_;
1909 1966
1910 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1911 1968
1912 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913 1970
1914 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1971 my ($w, $h) = @$self{qw(w h)};
1972
1973 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1915 1974
1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917 1976
1918 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919 1978
2184 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2185 active_fg => [0, 0, 0], 2244 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2], 2245 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5], 2246 active_bg => [1, 1, 1, 0.5],
2188 range => [0, 0, 100, 10, 0], 2247 range => [0, 0, 100, 10, 0],
2189 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2190 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2191 vertical => 0, 2250 vertical => 0,
2192 can_hover => 1, 2251 can_hover => 1,
2193 inner_pad => 0.02, 2252 inner_pad => 0.02,
2194 @_ 2253 @_
2195 ); 2254 );
2198 $self->update; 2257 $self->update;
2199 2258
2200 $self 2259 $self
2201} 2260}
2202 2261
2262sub changed { }
2263
2203sub set_range { 2264sub set_range {
2204 my ($self, $range) = @_; 2265 my ($self, $range) = @_;
2205 2266
2206 ($range, $self->{range}) = ($self->{range}, $range); 2267 ($range, $self->{range}) = ($self->{range}, $range);
2207 2268
2233} 2294}
2234 2295
2235sub size_request { 2296sub size_request {
2236 my ($self) = @_; 2297 my ($self) = @_;
2237 2298
2238 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2239 my $h = $self->{req_h};
2240
2241 $self->{vertical} ? ($h, $w) : ($w, $h)
2242} 2300}
2243 2301
2244sub button_down { 2302sub button_down {
2245 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2246 2304
2247 $self->SUPER::button_down ($ev, $x, $y); 2305 $self->SUPER::button_down ($ev, $x, $y);
2248 2306
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250 2308
2251 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2252} 2310}
2253 2311
2254sub mouse_motion { 2312sub mouse_motion {
2255 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2256 2314
2260 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2318 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261 2319
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2320 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263 2321
2264 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2322 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2323 } else {
2324 return 0;
2325 }
2326
2265 } 2327 1
2266} 2328}
2267 2329
2268sub update { 2330sub update {
2269 my ($self) = @_; 2331 my ($self) = @_;
2270 2332
2631} 2693}
2632 2694
2633sub set_tooltip_from { 2695sub set_tooltip_from {
2634 my ($self, $widget) = @_; 2696 my ($self, $widget) = @_;
2635 2697
2698 my $tooltip = $widget->{tooltip};
2699
2700 if ($ENV{CFPLUS_DEBUG} & 2) {
2701 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}";
2705 }
2706
2636 $self->add (new CFClient::UI::Label 2707 $self->add (new CFClient::UI::Label
2637 markup => $widget->{tooltip}, 2708 markup => $tooltip,
2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8, 2710 fontsize => 0.8,
2640 fg => [0, 0, 0, 1], 2711 fg => [0, 0, 0, 1],
2641 ellipsise => 0, 2712 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP), 2713 font => ($widget->{tooltip_font} || $::FONT_PROP),
2653 2724
2654sub size_allocate { 2725sub size_allocate {
2655 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2656 2727
2657 $self->SUPER::size_allocate ($w - 4, $h - 4); 2728 $self->SUPER::size_allocate ($w - 4, $h - 4);
2729}
2730
2731sub visibility_change {
2732 my ($self, $visible) = @_;
2733
2734 return unless $visible;
2735
2736 $self->{root}->on_post_alloc ("move_$self" => sub {
2737 my $widget = $self->{owner}
2738 or return;
2739
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH;
2744
2745 $self->move_abs ($x, $y);
2746 });
2658} 2747}
2659 2748
2660sub _draw { 2749sub _draw {
2661 my ($self) = @_; 2750 my ($self) = @_;
2662 2751
2679 glVertex $w, $h; 2768 glVertex $w, $h;
2680 glVertex $w, 0; 2769 glVertex $w, 0;
2681 glEnd; 2770 glEnd;
2682 2771
2683 glTranslate 2 - 0.375, 2 - 0.375; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2773
2684 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2685} 2775}
2686 2776
2687############################################################################# 2777#############################################################################
2688 2778
2764 $self->SUPER::DESTROY; 2854 $self->SUPER::DESTROY;
2765} 2855}
2766 2856
2767############################################################################# 2857#############################################################################
2768 2858
2769package CFClient::UI::Inventory;
2770
2771our @ISA = CFClient::UI::ScrolledWindow::;
2772
2773sub new {
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812}
2813
2814#############################################################################
2815
2816package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
2817 2860
2818our @ISA = CFClient::UI::FancyFrame::; 2861our @ISA = CFClient::UI::FancyFrame::;
2819 2862
2820use CFClient::OpenGL; 2863use CFClient::OpenGL;
2858 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 2902 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2861 2904
2862 $self->show; 2905 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 2907}
2865 2908
2866sub mouse_motion { 2909sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2868 2911
2869 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2872} 2917}
2873 2918
2874sub button_up { 2919sub button_up {
2875 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2876 2921
2878 undef $GRAB; 2923 undef $GRAB;
2879 $self->hide; 2924 $self->hide;
2880 2925
2881 $self->_emit ("popdown"); 2926 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2883 } 2932 1
2884} 2933}
2885 2934
2886############################################################################# 2935#############################################################################
2887 2936
2888package CFClient::UI::Statusbox; 2937package CFClient::UI::Statusbox;
2993 $self->SUPER::reconfigure; 3042 $self->SUPER::reconfigure;
2994} 3043}
2995 3044
2996############################################################################# 3045#############################################################################
2997 3046
2998package CFClient::UI::Root; 3047package CFClient::UI::Inventory;
2999 3048
3000our @ISA = CFClient::UI::Container::; 3049our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002use CFClient::OpenGL;
3003 3050
3004sub new { 3051sub new {
3005 my $class = shift; 3052 my $class = shift;
3006 3053
3007 $class->SUPER::new ( 3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3056 @_,
3057 );
3058
3059 $self
3060}
3061
3062sub set_items {
3063 my ($self, $items) = @_;
3064
3065 $self->{scrolled}->clear;
3066 return unless $items;
3067
3068 my @items = sort {
3069 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name})
3071 } @$items;
3072
3073 $self->{real_items} = \@items;
3074
3075 my $row = 0;
3076 for my $item (@items) {
3077 CFClient::Item::update_widgets $item;
3078
3079 $self->{scrolled}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3082
3083 $row++;
3084 }
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::BindEditor;
3090
3091our @ISA = CFClient::UI::FancyFrame::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3097
3098 $self->add (my $vb = new CFClient::UI::VBox);
3099
3100
3101 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3102 text => "start recording",
3103 tooltip => "Start/Stops recording of actions."
3104 ."All subsequent actions after the recording started will be captured."
3105 ."The actions are displayed after the record was stopped."
3106 ."To bind the action you have to click on the 'Bind' button",
3107 on_activate => sub {
3108 unless ($self->{recording}) {
3109 $self->start;
3110 } else {
3111 $self->stop;
3112 }
3113 });
3114
3115 $vb->add (new CFClient::UI::Label text => "Actions:");
3116 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3117
3118 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3119 $vb->add (my $hb = new CFClient::UI::HBox);
3120 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3121 $hb->add (new CFClient::UI::Button
3122 text => "bind",
3123 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3124 on_activate => sub {
3125 $self->ask_for_bind;
3126 });
3127
3128 $vb->add (my $hb = new CFClient::UI::HBox);
3129 $hb->add (new CFClient::UI::Button
3130 text => "ok",
3131 expand => 1,
3132 tooltip => "This closes the binding editor and saves the binding",
3133 on_activate => sub {
3134 $self->hide;
3135 $self->commit;
3136 });
3137
3138 $hb->add (new CFClient::UI::Button
3139 text => "cancel",
3140 expand => 1,
3141 tooltip => "This closes the binding editor without saving",
3142 on_activate => sub {
3143 $self->hide;
3144 $self->{binding_cancel}->()
3145 if $self->{binding_cancel};
3146 });
3147
3148 $self->update_binding_widgets;
3149
3150 $self
3151}
3152
3153sub commit {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 if ($sym != 0 && @$cmds > 0) {
3157 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3158 ."'. Don't forget 'Save Config'!");
3159 $self->{binding_change}->($mod, $sym, $cmds)
3160 if $self->{binding_change};
3161 } else {
3162 $::STATUSBOX->add ("No action bound, no key or action specified!");
3163 $self->{binding_cancel}->()
3164 if $self->{binding_cancel};
3165 }
3166}
3167
3168sub start {
3169 my ($self) = @_;
3170
3171 $self->{rec_btn}->set_text ("stop recording");
3172 $self->{recording} = 1;
3173 $self->clear_command_list;
3174 $::CONN->start_record if $::CONN;
3175}
3176
3177sub stop {
3178 my ($self) = @_;
3179
3180 $self->{rec_btn}->set_text ("start recording");
3181 $self->{recording} = 0;
3182
3183 my $rec;
3184 $rec = $::CONN->stop_record if $::CONN;
3185 return unless ref $rec eq 'ARRAY';
3186 $self->set_command_list ($rec);
3187}
3188
3189
3190sub ask_for_bind_and_commit {
3191 my ($self) = @_;
3192 $self->ask_for_bind (1);
3193}
3194
3195sub ask_for_bind {
3196 my ($self, $commit) = @_;
3197
3198 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets;
3202 $self->commit if $commit;
3203 });
3204}
3205
3206# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands)
3208# $cb is the callback that is executed on OK
3209# $ccb is the callback that is executed on CANCEL and
3210# when the binding was unsuccessful on OK
3211sub set_binding {
3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3213
3214 $self->clear_command_list;
3215 $self->{recording} = 0;
3216 $self->{rec_btn}->set_text ("start recording");
3217
3218 $self->{binding} = [$mod, $sym];
3219 $self->{commands} = $cmds;
3220
3221 $self->{binding_change} = $cb;
3222 $self->{binding_cancel} = $ccb;
3223
3224 $self->update_binding_widgets;
3225}
3226
3227# this is a shortcut method that asks for a binding
3228# and then just binds it.
3229sub do_quick_binding {
3230 my ($self, $cmds) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub {
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 });
3234 $self->ask_for_bind (1);
3235}
3236
3237sub update_binding_widgets {
3238 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding;
3240 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3241 $self->set_command_list ($cmds);
3242}
3243
3244sub get_binding {
3245 my ($self) = @_;
3246 return (
3247 $self->{binding}->[0],
3248 $self->{binding}->[1],
3249 [ grep { defined $_ } @{$self->{commands}} ]
3250 );
3251}
3252
3253sub clear_command_list {
3254 my ($self) = @_;
3255 $self->{cmdbox}->clear ();
3256}
3257
3258sub set_command_list {
3259 my ($self, $cmds) = @_;
3260
3261 $self->{cmdbox}->clear ();
3262 $self->{commands} = $cmds;
3263
3264 my $idx = 0;
3265
3266 for (@$cmds) {
3267 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3268
3269 my $i = $idx;
3270 $hb->add (new CFClient::UI::Label text => $_);
3271 $hb->add (new CFClient::UI::Button
3272 text => "delete",
3273 tooltip => "Deletes the action from the record",
3274 on_activate => sub {
3275 $self->{cmdbox}->remove ($hb);
3276 $cmds->[$i] = undef;
3277 });
3278
3279
3280 $idx++
3281 }
3282}
3283
3284#############################################################################
3285
3286package CFClient::UI::SpellList;
3287
3288our @ISA = CFClient::UI::FancyFrame::;
3289
3290sub new {
3291 my $class = shift;
3292
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3294
3295 $self->add (new CFClient::UI::ScrolledWindow
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3297
3298 $self;
3299}
3300
3301# XXX: Do sorting? Argl...
3302sub add_spell {
3303 my ($self, $spell) = @_;
3304 $self->{spells}->{$spell->{name}} = $spell;
3305
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333}
3334
3335sub remove_spell {
3336 my ($self, $spell) = @_;
3337 delete $self->{spells}->{$spell->{name}};
3338 $self->rebuild_spell_list;
3339}
3340
3341#############################################################################
3342
3343package CFClient::UI::Root;
3344
3345our @ISA = CFClient::UI::Container::;
3346
3347use CFClient::OpenGL;
3348
3349sub new {
3350 my $class = shift;
3351
3352 my $self = $class->SUPER::new (
3008 visible => 1, 3353 visible => 1,
3009 @_, 3354 @_,
3010 ) 3355 );
3011}
3012 3356
3013sub configure { 3357 Scalar::Util::weaken ($self->{root} = $self);
3014 my ($self, $x, $y, $w, $h) = @_;
3015 3358
3016 $self->{w} = $w; 3359 $self
3017 $self->{h} = $h;
3018}
3019
3020sub check_size {
3021 my ($self) = @_;
3022
3023 $self->size_allocate ($self->{w}, $self->{h})
3024 if $self->{w};
3025} 3360}
3026 3361
3027sub size_request { 3362sub size_request {
3028 my ($self) = @_; 3363 my ($self) = @_;
3029 3364
3030 ($self->{w}, $self->{h}) 3365 ($self->{w}, $self->{h})
3366}
3367
3368sub _to_pixel {
3369 my ($coord, $size, $max) = @_;
3370
3371 $coord =
3372 $coord eq "center" ? ($max - $size) * 0.5
3373 : $coord eq "max" ? $max
3374 : $coord;
3375
3376 $coord = 0 if $coord < 0;
3377 $coord = $max - $size if $coord > $max - $size;
3378
3379 int $coord + 0.5
3031} 3380}
3032 3381
3033sub size_allocate { 3382sub size_allocate {
3034 my ($self, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
3035 3384
3036 for my $child ($self->children) { 3385 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3387
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3388 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3389 $Y = $child->{force_y} if exists $child->{force_y};
3041 3390
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3391 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3392 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3393
3051 $child->configure ($X, $Y, $W, $H); 3394 $child->configure ($X, $Y, $W, $H);
3052 } 3395 }
3053} 3396}
3054 3397
3065} 3408}
3066 3409
3067sub update { 3410sub update {
3068 my ($self) = @_; 3411 my ($self) = @_;
3069 3412
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3413 $::WANT_REFRESH++;
3072} 3414}
3073 3415
3074sub add { 3416sub add {
3075 my ($self, @children) = @_; 3417 my ($self, @children) = @_;
3076 3418
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
3083 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3419 $_->{is_toplevel} = 1
3085 3420 for @children;
3086 # integerise window positions
3087 $child->{x} = int $child->{x};
3088 $child->{y} = int $child->{y};
3089 }
3090 3421
3091 $self->SUPER::add (@children); 3422 $self->SUPER::add (@children);
3092} 3423}
3093 3424
3094sub remove { 3425sub remove {
3095 my ($self, @children) = @_; 3426 my ($self, @children) = @_;
3096 3427
3097 $self->SUPER::remove (@children); 3428 $self->SUPER::remove (@children);
3429
3430 delete $self->{is_toplevel}
3431 for @children;
3098 3432
3099 while (@children) { 3433 while (@children) {
3100 my $w = pop @children; 3434 my $w = pop @children;
3101 push @children, $w->children; 3435 push @children, $w->children;
3102 $w->set_invisible; 3436 $w->set_invisible;
3121 while ($self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
3122 $_->() 3456 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3457 for values %{delete $self->{refresh_hook}};
3124 } 3458 }
3125 3459
3126 if ($self->{check_size}) { 3460 if ($self->{realloc}) {
3461 my %queue;
3127 my @queue; 3462 my @queue;
3463 my $widget;
3128 3464
3129 for (;;) { 3465 outer:
3130 if ($self->{check_size}) { 3466 while () {
3131 #TODO use array-of-depth approach 3467 if (my $realloc = delete $self->{realloc}) {
3468 for $widget (values %$realloc) {
3469 $widget->{visible} or next; # do not resize invisible widgets
3132 3470
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3471 $queue{$widget+0}++ and next; # duplicates are common
3134 @queue, values %{delete $self->{check_size}}; 3472
3473 push @{ $queue[$widget->{visible}] }, $widget;
3474 }
3135 } 3475 }
3136 3476
3477 while () {
3478 @queue or last outer;
3479
3137 my $widget = pop @queue || last; 3480 $widget = pop @{ $queue[-1] || [] }
3138 3481 and last;
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142 ? @$widget{qw(user_w user_h)}
3143 : $widget->size_request;
3144
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148 3482
3483 pop @queue;
3484 }
3485
3486 delete $queue{$widget+0};
3487
3488 my ($w, $h) = $widget->size_request;
3489
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3492
3493 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h};
3495
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3497 || delete $widget->{force_realloc}) {
3149 $widget->{req_w} = $w; 3498 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3499 $widget->{req_h} = $h;
3151 3500
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3501 $self->{size_alloc}{$widget+0} = $widget;
3153 3502
3154 $widget->{parent}->check_size
3155 if $widget->{parent}; 3503 if (my $parent = $widget->{parent}) {
3504 $self->{realloc}{$parent+0} = $parent
3505 unless $queue{$parent+0};
3506
3507 $parent->{force_size_alloc} = 1;
3508 $self->{size_alloc}{$parent+0} = $parent;
3509 }
3156 } 3510 }
3511
3512 delete $self->{realloc}{$widget+0};
3157 } 3513 }
3158 } 3514 }
3159 3515
3160 while ($self->{size_alloc}) { 3516 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3517 my @queue = sort { $b->{visible} <=> $a->{visible} }
3162 my ($widget, $w, $h) = @$_; 3518 values %$size_alloc;
3519
3520 while () {
3521 my $widget = pop @queue || last;
3522
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3163 3524
3164 $w = 0 if $w < 0; 3525 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3526 $h = 0 if $h < 0;
3166 3527
3528 $w = int $w + 0.5;
3529 $h = int $h + 0.5;
3530
3531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3532 $widget->{old_w} = $widget->{w};
3533 $widget->{old_h} = $widget->{h};
3534
3167 $widget->{w} = $w; 3535 $widget->{w} = $w;
3168 $widget->{h} = $h; 3536 $widget->{h} = $h;
3537
3169 $widget->emit (size_allocate => $w, $h); 3538 $widget->emit (size_allocate => $w, $h);
3539 }
3170 } 3540 }
3171 } 3541 }
3172 3542
3173 while ($self->{post_alloc_hook}) { 3543 while ($self->{post_alloc_hook}) {
3174 $_->() 3544 $_->()
3175 for values %{delete $self->{post_alloc_hook}}; 3545 for values %{delete $self->{post_alloc_hook}};
3176 } 3546 }
3547
3177 3548
3178 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
3181 3552
3183 glLoadIdentity; 3554 glLoadIdentity;
3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
3186 glLoadIdentity; 3557 glLoadIdentity;
3187 3558
3559 {
3560 package CFClient::UI::Base;
3561
3562 ($draw_x, $draw_y, $draw_w, $draw_h) =
3563 (0, 0, $self->{w}, $self->{h});
3564 }
3565
3188 $self->_draw; 3566 $self->_draw;
3189} 3567}
3190 3568
3191############################################################################# 3569#############################################################################
3192 3570

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines