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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 76# class methods for events
73sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 79 if $FOCUS;
76} 80}
… …
78sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 84 if $FOCUS;
81} 85}
82 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
83sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
84 my ($ev) = @_; 101 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
86 103
87 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
89 108
90 $GRAB = $widget; 109 $GRAB = $widget;
91 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
92 111
93 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
94 } 113 }
95 114
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
97 120
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
99 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
100} 129}
101 130
102sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
103 my ($ev) = @_; 132 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 133
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 135
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 137
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
111 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 140
113 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 143 $grab->update if $grab;
116 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
117 145
118 check_tooltip; 146 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->();
119 } 148 }
120} 149}
121 150
122sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
123 my ($ev) = @_; 152 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
125 154
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 156
128 if ($widget != $HOVER) { 157 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 158
131 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 160 if $HOVER;
139} 161}
140 162
141# convert position array to integers 163# convert position array to integers
142sub harmonize { 164sub harmonize {
… …
192 reconfigure_widgets; 214 reconfigure_widgets;
193} 215}
194 216
195############################################################################# 217#############################################################################
196 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
197package CFClient::UI::Base; 227package CFPlus::UI::Base;
198 228
199use strict; 229use strict;
200 230
201use CFClient::OpenGL; 231use CFPlus::OpenGL;
202 232
203sub new { 233sub new {
204 my $class = shift; 234 my $class = shift;
205 235
206 my $self = bless { 236 my $self = bless {
… …
211 h => undef, 241 h => undef,
212 can_events => 1, 242 can_events => 1,
213 @_ 243 @_
214 }, $class; 244 }, $class;
215 245
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 247
218 for (keys %$self) { 248 for (keys %$self) {
219 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
221 } 251 }
222 } 252 }
223 253
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 259
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 262
233 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
238 268
239sub destroy { 269sub destroy {
240 my ($self) = @_; 270 my ($self) = @_;
241 271
242 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
243 %$self = (); 274 %$self = ();
244} 275}
245 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
246sub show { 281sub show {
247 my ($self) = @_; 282 my ($self) = @_;
248 283
249 return if $self->{parent}; 284 return if $self->{parent};
250 285
251 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
252} 287}
253 288
254sub set_visible { 289sub set_visible {
255 my ($self) = @_; 290 my ($self) = @_;
256 291
… …
271 306
272 return unless $self->{visible}; 307 return unless $self->{visible};
273 308
274 $_->set_invisible for $self->children; 309 $_->set_invisible for $self->children;
275 310
311 delete $self->{visible};
276 delete $self->{root}; 312 delete $self->{root};
277 delete $self->{visible};
278 313
279 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
281 316
282 CFClient::UI::check_tooltip 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
284 319
285 $self->focus_out; 320 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
289 323
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
314} 348}
315 349
316sub move_abs { 350sub move_abs {
317 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
318 352
319 $self->{x} = List::Util::max 0, int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
322 356
323 $self->update; 357 $self->update;
324} 358}
325 359
… …
335sub size_request { 369sub size_request {
336 require Carp; 370 require Carp;
337 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
338} 372}
339 373
374sub baseline_shift {
375 0
376}
377
340sub configure { 378sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
342 380
343 if ($self->{aspect}) { 381 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
345 383
346 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 386
349 # use alignment to adjust x, y 387 # use alignment to adjust x, y
350 388
351 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
366 404
367 $self->{root}{size_alloc}{$self+0} = $self; 405 $self->{root}{size_alloc}{$self+0} = $self;
368 } 406 }
369} 407}
370 408
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 409sub children {
376 # nop 410 # nop
377} 411}
378 412
379sub visible_children { 413sub visible_children {
… …
397 431
398 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
399 433
400 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
401 435
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 439 }
406} 440}
407 441
408# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
409sub coord2local { 443sub coord2local {
410 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
411 445
446 Carp::confess unless $self->{parent};#d#
447
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 449}
414 450
415# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
416sub coord2global { 452sub coord2global {
417 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
418 454
455 Carp::confess unless $self->{parent};#d#
456
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 458}
421 459
422sub focus_in { 460sub invoke_focus_in {
423 my ($self) = @_; 461 my ($self) = @_;
424 462
425 return if $FOCUS == $self; 463 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
427 465
428 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
429 467
430 $self->_emit (focus_in => $focus); 468 $self->update;
431 469
432 $focus->update if $focus; 470 0
433 $FOCUS->update;
434} 471}
435 472
436sub focus_out { 473sub invoke_focus_out {
437 my ($self) = @_; 474 my ($self) = @_;
438 475
439 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
440 477
441 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
442 479
443 $self->_emit (focus_out => $focus); 480 $self->update;
444 481
445 $focus->update if $focus; #?
446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448 unless $FOCUS; 483 unless $FOCUS;
449}
450 484
485 0
486}
487
488sub grab_focus {
489 my ($self) = @_;
490
491 $FOCUS->emit ("focus_out") if $FOCUS;
492 $self->emit ("focus_in");
493}
494
451sub mouse_motion { 0 } 495sub invoke_mouse_motion { 0 }
452sub button_up { 0 } 496sub invoke_button_up { 0 }
453sub key_down { 0 } 497sub invoke_key_down { 0 }
454sub key_up { 0 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
455 500
456sub button_down { 501sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
458 503
459 $self->focus_in; 504 $self->grab_focus;
460 505
461 0 506 0
462} 507}
463 508
509sub connect {
510 my ($self, $signal, $cb) = @_;
511
512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
532
533sub emit {
534 my ($self, $signal, @args) = @_;
535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
553 $self->{parent} && $self->{parent}->emit ($signal, @args)
554}
555
464sub find_widget { 556#sub find_widget {
465 my ($self, $x, $y) = @_; 557# in .xs
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475 558
476sub set_parent { 559sub set_parent {
477 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
478 561
479 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504} 564}
505 565
506sub realloc { 566sub realloc {
507 my ($self) = @_; 567 my ($self) = @_;
508 568
… …
541 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
542 602
543 # update screen rectangle 603 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 606
549 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 610
… …
575 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
578 glEnd; 636 glEnd;
579 glPopMatrix; 637 glPopMatrix;
580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581 } 639 }
582 640
583 $self->_draw; 641 $self->_draw;
584 glPopMatrix; 642 glPopMatrix;
585} 643}
… …
588 my ($self) = @_; 646 my ($self) = @_;
589 647
590 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
591} 649}
592 650
651my $cntx;#d#
593sub DESTROY { 652sub DESTROY {
594 my ($self) = @_; 653 my ($self) = @_;
595 654
655 return if CFPlus::in_destruct;
656
657 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
596 delete $WIDGET{$self+0}; 660 delete $WIDGET{$self+0};
597 #$self->deactivate;
598} 661}
599 662
600############################################################################# 663#############################################################################
601 664
602package CFClient::UI::DrawBG; 665package CFPlus::UI::DrawBG;
603 666
604our @ISA = CFClient::UI::Base::; 667our @ISA = CFPlus::UI::Base::;
605 668
606use strict; 669use strict;
607use CFClient::OpenGL; 670use CFPlus::OpenGL;
608 671
609sub new { 672sub new {
610 my $class = shift; 673 my $class = shift;
611 674
612 # range [value, low, high, page] 675 # range [value, low, high, page]
… …
643 } 706 }
644} 707}
645 708
646############################################################################# 709#############################################################################
647 710
648package CFClient::UI::Empty; 711package CFPlus::UI::Empty;
649 712
650our @ISA = CFClient::UI::Base::; 713our @ISA = CFPlus::UI::Base::;
651 714
652sub new { 715sub new {
653 my ($class, %arg) = @_; 716 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 717 $class->SUPER::new (can_events => 0, %arg);
655} 718}
… …
662 725
663sub draw { } 726sub draw { }
664 727
665############################################################################# 728#############################################################################
666 729
667package CFClient::UI::Container; 730package CFPlus::UI::Container;
668 731
669our @ISA = CFClient::UI::Base::; 732our @ISA = CFPlus::UI::Base::;
670 733
671sub new { 734sub new {
672 my ($class, %arg) = @_; 735 my ($class, %arg) = @_;
673 736
674 my $children = delete $arg{children}; 737 my $children = delete $arg{children};
… …
683 if $children; 746 if $children;
684 747
685 $self 748 $self
686} 749}
687 750
751sub realloc {
752 my ($self) = @_;
753
754 $self->{force_realloc} = 1;
755 $self->{force_size_alloc} = 1;
756 $self->SUPER::realloc;
757}
758
688sub add { 759sub add {
689 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
690 761
691 $_->set_parent ($self) 762 $_->set_parent ($self)
692 for @widgets; 763 for @widgets;
… …
752 $_->draw for @{$self->{children}}; 823 $_->draw for @{$self->{children}};
753} 824}
754 825
755############################################################################# 826#############################################################################
756 827
757package CFClient::UI::Bin; 828package CFPlus::UI::Bin;
758 829
759our @ISA = CFClient::UI::Container::; 830our @ISA = CFPlus::UI::Container::;
760 831
761sub new { 832sub new {
762 my ($class, %arg) = @_; 833 my ($class, %arg) = @_;
763 834
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 835 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 836
766 $class->SUPER::new (children => [$child], %arg) 837 $class->SUPER::new (children => [$child], %arg)
767} 838}
768 839
769sub add { 840sub add {
770 my ($self, $child) = @_; 841 my ($self, $child) = @_;
771 842
772 $self->{children} = []; 843 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 844 $self->SUPER::add ($child);
775} 845}
776 846
777sub remove { 847sub remove {
778 my ($self, $widget) = @_; 848 my ($self, $widget) = @_;
779 849
780 $self->SUPER::remove ($widget); 850 $self->SUPER::remove ($widget);
781 851
782 $self->{children} = [new CFClient::UI::Empty] 852 $self->{children} = [new CFPlus::UI::Empty]
783 unless @{$self->{children}}; 853 unless @{$self->{children}};
784} 854}
785 855
786sub child { $_[0]->{children}[0] } 856sub child { $_[0]->{children}[0] }
787 857
788sub size_request { 858sub size_request {
789 $_[0]{children}[0]->size_request 859 $_[0]{children}[0]->size_request
790} 860}
791 861
792sub size_allocate { 862sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 863 my ($self, $w, $h) = @_;
794 864
795 $self->{children}[0]->configure (0, 0, $w, $h); 865 $self->{children}[0]->configure (0, 0, $w, $h);
866
867 1
796} 868}
797 869
798############################################################################# 870#############################################################################
799 871
800# back-buffered drawing area 872# back-buffered drawing area
801 873
802package CFClient::UI::Window; 874package CFPlus::UI::Window;
803 875
804our @ISA = CFClient::UI::Bin::; 876our @ISA = CFPlus::UI::Bin::;
805 877
806use CFClient::OpenGL; 878use CFPlus::OpenGL;
807 879
808sub new { 880sub new {
809 my ($class, %arg) = @_; 881 my ($class, %arg) = @_;
810 882
811 my $self = $class->SUPER::new (%arg); 883 my $self = $class->SUPER::new (%arg);
… …
816 888
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 889 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 890 $self->SUPER::update;
819} 891}
820 892
821sub size_allocate { 893sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
823 895
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 896 $self->update;
897
898 $self->SUPER::invoke_size_allocate ($w, $h)
826} 899}
827 900
828sub _render { 901sub _render {
829 my ($self) = @_; 902 my ($self) = @_;
830 903
… …
832} 905}
833 906
834sub render_child { 907sub render_child {
835 my ($self) = @_; 908 my ($self) = @_;
836 909
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 910 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 911 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 912 glClear GL_COLOR_BUFFER_BIT;
840 913
841 { 914 {
842 package CFClient::UI::Base; 915 package CFPlus::UI::Base;
843 916
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 917 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 918 (0, 0, $self->{w}, $self->{h});
919
920 $self->_render;
846 } 921 }
847
848 $self->_render;
849 }; 922 };
850} 923}
851 924
852sub _draw { 925sub _draw {
853 my ($self) = @_; 926 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 927
857 my $tex = $self->{texture} 928 my $tex = $self->{texture}
858 or return; 929 or return;
859 930
860 glEnable GL_TEXTURE_2D; 931 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 933 glColor 0, 0, 0, 1;
863 934
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 935 $tex->draw_quad_alpha_premultiplied (0, 0);
865 936
866 glDisable GL_TEXTURE_2D; 937 glDisable GL_TEXTURE_2D;
867} 938}
868 939
869############################################################################# 940#############################################################################
870 941
871package CFClient::UI::ViewPort; 942package CFPlus::UI::ViewPort;
872 943
944use List::Util qw(min max);
945
873our @ISA = CFClient::UI::Window::; 946our @ISA = CFPlus::UI::Window::;
874 947
875sub new { 948sub new {
876 my $class = shift; 949 my $class = shift;
877 950
878 $class->SUPER::new ( 951 $class->SUPER::new (
… …
885sub size_request { 958sub size_request {
886 my ($self) = @_; 959 my ($self) = @_;
887 960
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 961 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 962
890 $w = 10 if $self->{scroll_x}; 963 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 964 $h = 1 if $self->{scroll_y};
892 965
893 ($w, $h) 966 ($w, $h)
894} 967}
895 968
896sub size_allocate { 969sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 970 my ($self, $w, $h) = @_;
898 971
899 my $child = $self->child; 972 my $child = $self->child;
900 973
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 974 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 975 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 976
904 $self->child->configure (0, 0, $w, $h); 977 $self->child->configure (0, 0, $w, $h);
905 $self->update; 978 $self->update;
979
980 1
906} 981}
907 982
908sub set_offset { 983sub set_offset {
909 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
910 985
986 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
987 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
988
989 if ($x != $self->{view_x} or $y != $self->{view_y}) {
911 $self->{view_x} = int $x; 990 $self->{view_x} = $x;
912 $self->{view_y} = int $y; 991 $self->{view_y} = $y;
913 992
993 $self->emit (changed => $x, $y);
914 $self->update; 994 $self->update;
995 }
915} 996}
916 997
917# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
918sub coord2local { 999sub coord2local {
919 my ($self, $x, $y) = @_; 1000 my ($self, $x, $y) = @_;
… …
934 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
935 1016
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 1019 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1021 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1023 }
943} 1024}
944 1025
945sub _render { 1026sub _render {
946 my ($self) = @_; 1027 my ($self) = @_;
947 1028
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1029 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 1031
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1033
953 $self->SUPER::_render; 1034 $self->SUPER::_render;
954} 1035}
955 1036
956############################################################################# 1037#############################################################################
957 1038
958package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
959 1040
960our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
961 1042
962sub new { 1043sub new {
963 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
964 1045
965 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
966 1047
967 my $self; 1048 my $self;
968 1049
969 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
970 vertical => 1, 1060 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1062 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974 }, 1065 },
975 ; 1066 ;
976 1067
977 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
979 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
980 %arg, 1076 %arg,
981 ); 1077 );
982 1078
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1091 ;
1092
1093 $self->SUPER::add_at (0, 0, $self->{vp});
1094
984 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
985 1096
986 $self 1097 $self
987} 1098}
1099
1100#TODO# update range on size_allocate depending on child
988 1101
989sub add { 1102sub add {
990 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
991 1104
992 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
993} 1106}
994 1107
1108sub update_slider {
1109 my ($self) = @_;
1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1130}
1131
995sub update { 1132sub update {
996 my ($self) = @_; 1133 my ($self) = @_;
997 1134
1135 $self->update_slider;
998 $self->SUPER::update; 1136 $self->SUPER::update;
999
1000 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1137}
1004 1138
1139sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_;
1141
1142 $self->{vslider}->emit (mouse_wheel => $ev)
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev)
1146 if $ev->{dx};
1147
1148 1
1149}
1150
1151sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_;
1153
1154 if ($ev->{button} == 2) {
1155 $self->grab_focus;
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1;
1168 }
1169
1170 0
1171}
1172
1173sub invoke_button_up {
1174 my ($self, $ev, $x, $y) = @_;
1175
1176 if (delete $self->{motion}) {
1177 return 1;
1178 }
1179
1180 0
1181}
1182
1183sub invoke_mouse_motion {
1184 my ($self, $ev, $x, $y) = @_;
1185
1186 if ($self->{motion}) {
1187 $self->{motion}->($ev, $x, $y);
1188 return 1;
1189 }
1190
1191 0
1192}
1193
1005sub size_allocate { 1194sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1195 my ($self, $w, $h) = @_;
1007 1196
1197 $self->update_slider;
1008 $self->SUPER::size_allocate ($w, $h); 1198 $self->SUPER::invoke_size_allocate ($w, $h)
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012} 1199}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1200
1017############################################################################# 1201#############################################################################
1018 1202
1019package CFClient::UI::Frame; 1203package CFPlus::UI::Frame;
1020 1204
1021our @ISA = CFClient::UI::Bin::; 1205our @ISA = CFPlus::UI::Bin::;
1022 1206
1023use CFClient::OpenGL; 1207use CFPlus::OpenGL;
1024 1208
1025sub new { 1209sub new {
1026 my $class = shift; 1210 my $class = shift;
1027 1211
1028 $class->SUPER::new ( 1212 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1238 $self->SUPER::_draw;
1055} 1239}
1056 1240
1057############################################################################# 1241#############################################################################
1058 1242
1059package CFClient::UI::FancyFrame; 1243package CFPlus::UI::FancyFrame;
1060 1244
1061our @ISA = CFClient::UI::Bin::; 1245our @ISA = CFPlus::UI::Bin::;
1062 1246
1063use CFClient::OpenGL; 1247use CFPlus::OpenGL;
1064
1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1248
1073sub new { 1249sub new {
1074 my ($class, %arg) = @_; 1250 my ($class, %arg) = @_;
1075 1251
1076 my $title = delete $arg{title}; 1252 if ((exists $arg{label}) && !ref $arg{label}) {
1253 $arg{label} = new CFPlus::UI::Label
1254 align => 1,
1255 valign => 0,
1256 text => $arg{label},
1257 fontsize => ($arg{border} || 0.8) * 0.75;
1258 }
1259
1260 my $self = $class->SUPER::new (
1261 # label => "",
1262 fg => [0.6, 0.3, 0.1],
1263 border => 0.8,
1264 style => 'single',
1265 %arg,
1266 );
1267
1268 $self
1269}
1270
1271sub add {
1272 my ($self, @widgets) = @_;
1273
1274 $self->SUPER::add (@widgets);
1275 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1276}
1277
1278sub border {
1279 int $_[0]{border} * $::FONTSIZE
1280}
1281
1282sub size_request {
1283 my ($self) = @_;
1284
1285 ($self->{label_w}, undef) = $self->{label}->size_request
1286 if $self->{label};
1287
1288 my ($w, $h) = $self->SUPER::size_request;
1289
1290 (
1291 $w + $self->border * 2,
1292 $h + $self->border * 2,
1293 )
1294}
1295
1296sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_;
1298
1299 my $border = $self->border;
1300
1301 $w -= List::Util::max 0, $border * 2;
1302 $h -= List::Util::max 0, $border * 2;
1303
1304 if (my $label = $self->{label}) {
1305 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1306 $label->{h} = List::Util::min $h, $border;
1307 $label->invoke_size_allocate ($label->{w}, $label->{h});
1308 }
1309
1310 $self->child->configure ($border, $border, $w, $h);
1311
1312 1
1313}
1314
1315sub _draw {
1316 my ($self) = @_;
1317
1318 my $child = $self->{children}[0];
1319
1320 my $border = $self->border;
1321 my ($w, $h) = ($self->{w}, $self->{h});
1322
1323 $child->draw;
1324
1325 glColor @{$self->{fg}};
1326 glBegin GL_LINE_STRIP;
1327 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1330 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1331 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1333 glEnd;
1334
1335 if ($self->{label}) {
1336 glTranslate $border * 2, 0;
1337 $self->{label}->_draw;
1338 }
1339}
1340
1341#############################################################################
1342
1343package CFPlus::UI::Toplevel;
1344
1345our @ISA = CFPlus::UI::Bin::;
1346
1347use CFPlus::OpenGL;
1348
1349my $bg =
1350 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1351 mipmap => 1, wrap => 1;
1352
1353my @border =
1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1355 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1360
1361sub new {
1362 my ($class, %arg) = @_;
1077 1363
1078 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1366 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1367 border => 0.6,
1082 can_events => 1, 1368 can_events => 1,
1083 min_w => 16, 1369 min_w => 64,
1084 min_h => 16, 1370 min_h => 32,
1085 %arg, 1371 %arg,
1086 ); 1372 );
1087 1373
1088 $self->{title} = new CFClient::UI::Label 1374 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1375 align => 0,
1090 valign => 1, 1376 valign => 1,
1091 text => $title, 1377 text => $self->{title},
1092 fontsize => $self->{border} 1378 fontsize => $self->{border},
1093 if defined $title; 1379 if exists $self->{title};
1380
1381 if ($self->{has_close_button}) {
1382 $self->{close_button} =
1383 new CFPlus::UI::ImageButton
1384 path => 'x1_close.png',
1385 on_activate => sub { $self->emit ("delete") };
1386
1387 $self->CFPlus::UI::Container::add ($self->{close_button});
1388 }
1094 1389
1095 $self 1390 $self
1096} 1391}
1097 1392
1098sub add { 1393sub add {
1099 my ($self, @widgets) = @_; 1394 my ($self, @widgets) = @_;
1100 1395
1101 $self->SUPER::add (@widgets); 1396 $self->SUPER::add (@widgets);
1397 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1398 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1399}
1104 1400
1105sub border { 1401sub border {
1106 int $_[0]{border} * $::FONTSIZE 1402 int $_[0]{border} * $::FONTSIZE
1107} 1403}
1108 1404
1109sub size_request { 1405sub size_request {
1110 my ($self) = @_; 1406 my ($self) = @_;
1111 1407
1112 $self->{title}->size_request 1408 $self->{title_widget}->size_request
1113 if $self->{title}; 1409 if $self->{title_widget};
1410
1411 $self->{close_button}->size_request
1412 if $self->{close_button};
1114 1413
1115 my ($w, $h) = $self->SUPER::size_request; 1414 my ($w, $h) = $self->SUPER::size_request;
1116 1415
1117 ( 1416 (
1118 $w + $self->border * 2, 1417 $w + $self->border * 2,
1119 $h + $self->border * 2, 1418 $h + $self->border * 2,
1120 ) 1419 )
1121} 1420}
1122 1421
1123sub size_allocate { 1422sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1423 my ($self, $w, $h) = @_;
1125 1424
1126 if ($self->{title}) { 1425 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1426 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1427 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1428 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1429 }
1131 1430
1132 my $border = $self->border; 1431 my $border = $self->border;
1133 1432
1134 $h -= List::Util::max 0, $border * 2; 1433 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1434 $w -= List::Util::max 0, $border * 2;
1435
1436 $self->child->configure ($border, $border, $w, $h);
1437
1438 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1439 if $self->{close_button};
1440
1441 1
1442}
1443
1444sub invoke_delete {
1445 my ($self) = @_;
1446
1447 $self->hide;
1136 1448
1137 $self->child->configure ($border, $border, $w, $h); 1449 1
1138} 1450}
1139 1451
1140sub button_down { 1452sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1453 my ($self, $ev, $x, $y) = @_;
1142 1454
1143 my ($w, $h) = @$self{qw(w h)}; 1455 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1456 my $border = $self->border;
1145 1457
… …
1176 1488
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1489 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1490
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1491 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1492 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1493 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1494 };
1183 } else { 1495 } else {
1184 return 0; 1496 return 0;
1185 } 1497 }
1186 1498
1187 1 1499 1
1188} 1500}
1189 1501
1190sub button_up { 1502sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1503 my ($self, $ev, $x, $y) = @_;
1192 1504
1193 !!delete $self->{motion} 1505 ! ! delete $self->{motion}
1194} 1506}
1195 1507
1196sub mouse_motion { 1508sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1509 my ($self, $ev, $x, $y) = @_;
1198 1510
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1511 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1512
1201 !!$self->{motion} 1513 ! ! $self->{motion}
1514}
1515
1516sub invoke_visibility_change {
1517 my ($self, $visible) = @_;
1518
1519 delete $self->{motion} unless $visible;
1520
1521 0
1202} 1522}
1203 1523
1204sub _draw { 1524sub _draw {
1205 my ($self) = @_; 1525 my ($self) = @_;
1206 1526
… …
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1214 1534
1215 my $border = $self->border; 1535 my $border = $self->border;
1216 1536
1217 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1218 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1222 1556
1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1225 1559
1226 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1232 1566
1233 glDisable GL_TEXTURE_2D; 1567 glDisable GL_TEXTURE_2D;
1234 1568
1235 $child->draw; 1569 $child->draw;
1236 1570
1237 if ($self->{title}) { 1571 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1572 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1573 $self->{title_widget}->_draw;
1574
1575 glTranslate 0, - ($border - $self->{h});
1240 } 1576 }
1577
1578 $self->{close_button}->draw
1579 if $self->{close_button};
1241} 1580}
1242 1581
1243############################################################################# 1582#############################################################################
1244 1583
1245package CFClient::UI::Table; 1584package CFPlus::UI::Table;
1246 1585
1247our @ISA = CFClient::UI::Base::; 1586our @ISA = CFPlus::UI::Base::;
1248 1587
1249use List::Util qw(max sum); 1588use List::Util qw(max sum);
1250 1589
1251use CFClient::OpenGL; 1590use CFPlus::OpenGL;
1252 1591
1253sub new { 1592sub new {
1254 my $class = shift; 1593 my $class = shift;
1255 1594
1256 $class->SUPER::new ( 1595 $class->SUPER::new (
1596 children => [],
1257 col_expand => [], 1597 col_expand => [],
1598 row_expand => [],
1258 @_, 1599 @_,
1259 ) 1600 )
1260} 1601}
1261 1602
1262sub children { 1603sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1605}
1265 1606
1607# TODO: store row/col info in child widget and use standard add/del
1266sub add { 1608sub add {
1267 my ($self, $x, $y, $child) = @_; 1609 my $self = shift;
1268 1610
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1612 $self->add_at (@_);
1613}
1614
1615sub add_at {
1616 my $self = shift;
1617
1618 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1621 $child->{row} = $row;
1622 $child->{col} = $col;
1623
1624 $child->{rowspan} ||= 1;
1625 $child->{colspan} ||= 1;
1626
1269 $child->set_parent ($self); 1627 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1628 $self->{children}[$row][$col] = $child;
1629 }
1271 1630
1631 $self->{force_realloc} = 1;
1632 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1633 $self->realloc;
1634}
1635
1636sub remove {
1637 my ($self, $child) = @_;
1638
1639 for (@{ $self->{children} }) {
1640 for (@{ $_ || [] }) {
1641 $_ = undef if $_ == $child;
1642 }
1643 }
1273} 1644}
1274 1645
1275# TODO: move to container class maybe? send children a signal on removal? 1646# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1647sub clear {
1277 my ($self) = @_; 1648 my ($self) = @_;
… …
1290sub get_wh { 1661sub get_wh {
1291 my ($self) = @_; 1662 my ($self) = @_;
1292 1663
1293 my (@w, @h); 1664 my (@w, @h);
1294 1665
1295 for my $y (0 .. $#{$self->{children}}) { 1666 my @children = $self->children;
1296 my $row = $self->{children}[$y]
1297 or next;
1298 1667
1299 for my $x (0 .. $#$row) { 1668 for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1300 my $widget = $row->[$x] 1669 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1301 or next;
1302 my ($w, $h) = @$widget{qw(req_w req_h)};
1303 1670
1304 $w[$x] = max $w[$x], $w; 1671 my $sw = sum @w[$c .. $c + $cs - 1];
1305 $h[$y] = max $h[$y], $h; 1672 my $sh = sum @h[$r .. $r + $rs - 1];
1673
1674 if ($w > $sw) {
1675 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1676 }
1677
1678 if ($h > $sh) {
1679 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1306 } 1680 }
1307 } 1681 }
1308 1682
1309 (\@w, \@h) 1683 (\@w, \@h)
1310} 1684}
… …
1318 (sum @$ws), 1692 (sum @$ws),
1319 (sum @$hs), 1693 (sum @$hs),
1320 ) 1694 )
1321} 1695}
1322 1696
1323sub size_allocate { 1697sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1698 my ($self, $w, $h) = @_;
1325 1699
1326 my ($ws, $hs) = $self->get_wh; 1700 my ($ws, $hs) = $self->get_wh;
1327 1701
1328 my $req_w = (sum @$ws) || 1; 1702 my $req_w = (sum @$ws) || 1;
1329 my $req_h = (sum @$hs) || 1; 1703 my $req_h = (sum @$hs) || 1;
1330 1704
1331 # TODO: nicer code && do row_expand 1705 # now linearly scale the rows/columns to the allocated size
1332 my @col_expand = @{$self->{col_expand}}; 1706 my @col_expand = @{$self->{col_expand}};
1333 @col_expand = (1) x @$ws unless @col_expand; 1707 @col_expand = (1) x @$ws unless @col_expand;
1334 my $col_expand = (sum @col_expand) || 1; 1708 my $col_expand = (sum @col_expand) || 1;
1335 1709
1336 # linearly scale sizes
1337 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1710 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339 1711
1340 CFClient::UI::harmonize $ws; 1712 CFPlus::UI::harmonize $ws;
1713
1714 my @row_expand = @{$self->{row_expand}};
1715 @row_expand = (1) x @$ws unless @row_expand;
1716 my $row_expand = (sum @row_expand) || 1;
1717
1718 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1719
1341 CFClient::UI::harmonize $hs; 1720 CFPlus::UI::harmonize $hs;
1342 1721
1343 my $y; 1722 my (@x, @y);
1344 1723
1724 for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1725 for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1726
1345 for my $r (0 .. $#{$self->{children}}) { 1727 for my $widget ($self->children) {
1346 my $row = $self->{children}[$r] 1728 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1347 or next;
1348 1729
1349 my $x = 0; 1730 $widget->configure (
1350 my $row_h = $hs->[$r]; 1731 $x[$c], $y[$r],
1732 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1351 1733 );
1352 for my $c (0 .. $#$row) { 1734 }
1353 my $col_w = $ws->[$c];
1354 1735
1355 if (my $widget = $row->[$c]) {
1356 $widget->configure ($x, $y, $col_w, $row_h);
1357 }
1358
1359 $x += $col_w;
1360 }
1361
1362 $y += $row_h;
1363 } 1736 1
1364
1365} 1737}
1366 1738
1367sub find_widget { 1739sub find_widget {
1368 my ($self, $x, $y) = @_; 1740 my ($self, $x, $y) = @_;
1369 1741
… …
1388 } 1760 }
1389} 1761}
1390 1762
1391############################################################################# 1763#############################################################################
1392 1764
1393package CFClient::UI::Box; 1765package CFPlus::UI::Fixed;
1394 1766
1767use List::Util qw(min max);
1768
1395our @ISA = CFClient::UI::Container::; 1769our @ISA = CFPlus::UI::Container::;
1770
1771sub add {
1772 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1773
1774 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1775 $self->SUPER::add ($child);
1776}
1777
1778sub _scale($$$) {
1779 my ($mode, $val, $max) = @_;
1780
1781 $mode eq "abs" ? $val
1782 : $mode eq "rel" ? $val * $max
1783 : 0
1784}
1785
1786sub size_request {
1787 my ($self) = @_;
1788
1789 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1790
1791 # determine overall size by querying abs widgets
1792 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1794
1795 if ($pos eq "abs") {
1796 $w = _scale $size, $w, $child->{req_w};
1797 $h = _scale $size, $h, $child->{req_h};
1798
1799 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1800 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1801 }
1802 }
1803
1804 my $W = $x2 - $x1;
1805 my $H = $y2 - $y1;
1806
1807 # now layout remaining widgets
1808 for my $child ($self->visible_children) {
1809 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1810
1811 if ($pos ne "abs") {
1812 $x = _scale $pos, $x, $W;
1813 $y = _scale $pos, $x, $H;
1814 $w = _scale $size, $w, $child->{req_w};
1815 $h = _scale $size, $h, $child->{req_h};
1816
1817 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1818 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1819 }
1820 }
1821
1822 my $W = $x2 - $x1;
1823 my $H = $y2 - $y1;
1824
1825 ($W, $H)
1826}
1827
1828sub invoke_size_allocate {
1829 my ($self, $W, $H) = @_;
1830
1831 for my $child ($self->visible_children) {
1832 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1833
1834 $x = _scale $pos, $x, $W;
1835 $y = _scale $pos, $x, $H;
1836 $w = _scale $size, $w, $child->{req_w};
1837 $h = _scale $size, $h, $child->{req_h};
1838
1839 $child->configure ($x, $y, $w, $h);
1840 }
1841
1842 1
1843}
1844
1845#############################################################################
1846
1847package CFPlus::UI::Box;
1848
1849our @ISA = CFPlus::UI::Container::;
1396 1850
1397sub size_request { 1851sub size_request {
1398 my ($self) = @_; 1852 my ($self) = @_;
1399 1853
1400 $self->{vertical} 1854 $self->{vertical}
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1860 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1861 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1862 )
1409} 1863}
1410 1864
1411sub size_allocate { 1865sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1866 my ($self, $w, $h) = @_;
1413 1867
1414 my $space = $self->{vertical} ? $h : $w; 1868 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1869 my @children = $self->visible_children;
1416 1870
1417 my @req; 1871 my @req;
1418 1872
1419 if ($self->{homogeneous}) { 1873 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1874 @req = ($space / (@children || 1)) x @children;
1421 } else { 1875 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1876 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1877 my $req = List::Util::sum @req;
1424 1878
1425 if ($req > $space) { 1879 if ($req > $space) {
1426 # ah well, not enough space 1880 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1881 $_ *= $space / $req for @req;
1428 } else { 1882 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1883 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1884
1431 $space = ($space - $req) / $expand; # remaining space to give away 1885 $space = ($space - $req) / $expand; # remaining space to give away
1432 1886
1433 $req[$_] += $space * $children->[$_]{expand} 1887 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1888 for 0 .. $#children;
1435 } 1889 }
1436 } 1890 }
1437 1891
1438 CFClient::UI::harmonize \@req; 1892 CFPlus::UI::harmonize \@req;
1439 1893
1440 my $pos = 0; 1894 my $pos = 0;
1441 for (0 .. $#$children) { 1895 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1896 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1897 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1898
1445 $pos += $alloc; 1899 $pos += $alloc;
1446 } 1900 }
1447 1901
1448 1 1902 1
1449} 1903}
1450 1904
1451############################################################################# 1905#############################################################################
1452 1906
1453package CFClient::UI::HBox; 1907package CFPlus::UI::HBox;
1454 1908
1455our @ISA = CFClient::UI::Box::; 1909our @ISA = CFPlus::UI::Box::;
1456 1910
1457sub new { 1911sub new {
1458 my $class = shift; 1912 my $class = shift;
1459 1913
1460 $class->SUPER::new ( 1914 $class->SUPER::new (
… …
1463 ) 1917 )
1464} 1918}
1465 1919
1466############################################################################# 1920#############################################################################
1467 1921
1468package CFClient::UI::VBox; 1922package CFPlus::UI::VBox;
1469 1923
1470our @ISA = CFClient::UI::Box::; 1924our @ISA = CFPlus::UI::Box::;
1471 1925
1472sub new { 1926sub new {
1473 my $class = shift; 1927 my $class = shift;
1474 1928
1475 $class->SUPER::new ( 1929 $class->SUPER::new (
… …
1478 ) 1932 )
1479} 1933}
1480 1934
1481############################################################################# 1935#############################################################################
1482 1936
1483package CFClient::UI::Label; 1937package CFPlus::UI::Label;
1484 1938
1485our @ISA = CFClient::UI::DrawBG::; 1939our @ISA = CFPlus::UI::DrawBG::;
1486 1940
1487use CFClient::OpenGL; 1941use CFPlus::OpenGL;
1488 1942
1489sub new { 1943sub new {
1490 my ($class, %arg) = @_; 1944 my ($class, %arg) = @_;
1491 1945
1492 my $self = $class->SUPER::new ( 1946 my $self = $class->SUPER::new (
… …
1495 #active_bg => none 1949 #active_bg => none
1496 #font => default_font 1950 #font => default_font
1497 #text => initial text 1951 #text => initial text
1498 #markup => initial narkup 1952 #markup => initial narkup
1499 #max_w => maximum pixel width 1953 #max_w => maximum pixel width
1954 #style => 0, # render flags
1500 ellipsise => 3, # end 1955 ellipsise => 3, # end
1501 layout => (new CFClient::Layout), 1956 layout => (new CFPlus::Layout),
1502 fontsize => 1, 1957 fontsize => 1,
1503 align => -1, 1958 align => -1,
1504 valign => -1, 1959 valign => -1,
1505 padding_x => 2, 1960 padding_x => 2,
1506 padding_y => 2, 1961 padding_y => 2,
1507 can_events => 0, 1962 can_events => 0,
1508 %arg 1963 %arg
1509 ); 1964 );
1510 1965
1511 if (exists $self->{template}) { 1966 if (exists $self->{template}) {
1512 my $layout = new CFClient::Layout; 1967 my $layout = new CFPlus::Layout;
1513 $layout->set_text (delete $self->{template}); 1968 $layout->set_text (delete $self->{template});
1514 $self->{template} = $layout; 1969 $self->{template} = $layout;
1515 } 1970 }
1516 1971
1517 if (exists $self->{markup}) { 1972 if (exists $self->{markup}) {
… …
1521 } 1976 }
1522 1977
1523 $self 1978 $self
1524} 1979}
1525 1980
1526sub escape($) {
1527 local $_ = $_[0];
1528
1529 s/&/&amp;/g;
1530 s/>/&gt;/g;
1531 s/</&lt;/g;
1532
1533 $_
1534}
1535
1536sub update { 1981sub update {
1537 my ($self) = @_; 1982 my ($self) = @_;
1538 1983
1539 delete $self->{texture}; 1984 delete $self->{texture};
1540 $self->SUPER::update; 1985 $self->SUPER::update;
… …
1542 1987
1543sub realloc { 1988sub realloc {
1544 my ($self) = @_; 1989 my ($self) = @_;
1545 1990
1546 delete $self->{ox}; 1991 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc; 1992 $self->SUPER::realloc;
1549} 1993}
1550 1994
1551sub set_text { 1995sub set_text {
1552 my ($self, $text) = @_; 1996 my ($self, $text) = @_;
1553 1997
1554 return if $self->{text} eq "T$text"; 1998 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1999 $self->{text} = "T$text";
1556 2000
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 2001 $self->{layout}->set_text ($text);
1559 2002
2003 delete $self->{size_req};
1560 $self->realloc; 2004 $self->realloc;
1561 $self->update; 2005 $self->update;
1562} 2006}
1563 2007
1564sub set_markup { 2008sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 2011 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 2012 $self->{text} = "M$markup";
1569 2013
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2014 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 2015
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 2016 $self->{layout}->set_markup ($markup);
1574 2017
2018 delete $self->{size_req};
1575 $self->realloc; 2019 $self->realloc;
1576 $self->update; 2020 $self->update;
1577} 2021}
1578 2022
1579sub size_request { 2023sub size_request {
1580 my ($self) = @_; 2024 my ($self) = @_;
1581 2025
1582 if (exists $self->{req_h}) { 2026 $self->{size_req} ||= do {
1583 @$self{qw(req_w req_h)}
1584 } else {
1585 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2027 $self->{layout}->set_font ($self->{font}) if $self->{font};
1586 $self->{layout}->set_width ($self->{max_w} || -1); 2028 $self->{layout}->set_width ($self->{max_w} || -1);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2029 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2030 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2031 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1590 2032
1591 my ($w, $h) = $self->{layout}->size; 2033 my ($w, $h) = $self->{layout}->size;
1592 2034
1593 if (exists $self->{template}) { 2035 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 2036 $self->{template}->set_font ($self->{font}) if $self->{font};
2037 $self->{template}->set_width ($self->{max_w} || -1);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2038 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 2039
1597 my ($w2, $h2) = $self->{template}->size; 2040 my ($w2, $h2) = $self->{template}->size;
1598 2041
1599 $w = List::Util::max $w, $w2; 2042 $w = List::Util::max $w, $w2;
1600 $h = List::Util::max $h, $h2; 2043 $h = List::Util::max $h, $h2;
1601 } 2044 }
1602 2045
1603 ($w, $h) 2046 [$w, $h]
1604 } 2047 };
1605}
1606 2048
2049 @{ $self->{size_req} }
2050}
2051
2052sub baseline_shift {
2053 $_[0]{layout}->descent
2054}
2055
1607sub size_allocate { 2056sub invoke_size_allocate {
1608 my ($self, $w, $h) = @_; 2057 my ($self, $w, $h) = @_;
1609 2058
1610 delete $self->{ox}; 2059 delete $self->{ox};
1611 2060
1612 delete $self->{texture} 2061 delete $self->{texture}
1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2062 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2063
2064 1
1614} 2065}
1615 2066
1616sub set_fontsize { 2067sub set_fontsize {
1617 my ($self, $fontsize) = @_; 2068 my ($self, $fontsize) = @_;
1618 2069
1619 $self->{fontsize} = $fontsize; 2070 $self->{fontsize} = $fontsize;
2071 delete $self->{size_req};
1620 delete $self->{texture}; 2072 delete $self->{texture};
1621 2073
1622 $self->realloc; 2074 $self->realloc;
1623} 2075}
1624 2076
2077sub reconfigure {
2078 my ($self) = @_;
2079
2080 delete $self->{size_req};
2081 delete $self->{texture};
2082
2083 $self->SUPER::reconfigure;
2084}
2085
1625sub _draw { 2086sub _draw {
1626 my ($self) = @_; 2087 my ($self) = @_;
1627 2088
1628 $self->SUPER::_draw; # draw background, if applicable 2089 $self->SUPER::_draw; # draw background, if applicable
1629 2090
1630 my $tex = $self->{texture} ||= do { 2091 my $size = $self->{texture} ||= do {
1631 $self->{layout}->set_foreground (@{$self->{fg}}); 2092 $self->{layout}->set_foreground (@{$self->{fg}});
1632 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2093 $self->{layout}->set_font ($self->{font}) if $self->{font};
1633 $self->{layout}->set_width ($self->{w}); 2094 $self->{layout}->set_width ($self->{w});
1634 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2095 $self->{layout}->set_ellipsise ($self->{ellipsise});
1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2096 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2097 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1637 2098
1638 new_from_layout CFClient::Texture $self->{layout} 2099 [$self->{layout}->size]
1639 }; 2100 };
1640 2101
1641 unless (exists $self->{ox}) { 2102 unless (exists $self->{ox}) {
1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2103 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2104 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1644 : ($self->{w} - $tex->{w}) * 0.5); 2105 : ($self->{w} - $size->[0]) * 0.5);
1645 2106
1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2107 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2108 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1648 : ($self->{h} - $tex->{h}) * 0.5); 2109 : ($self->{h} - $size->[1]) * 0.5);
1649 }; 2110 };
1650 2111
1651 glEnable GL_TEXTURE_2D; 2112 my $w = List::Util::min $self->{w} + 4, $size->[0];
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2113 my $h = List::Util::min $self->{h} + 2, $size->[1];
1653 2114
1654 glColor_premultiply @{$self->{fg}} 2115 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1655 if $tex->{format} == GL_ALPHA;
1656
1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1658
1659 glDisable GL_TEXTURE_2D;
1660} 2116}
1661 2117
1662############################################################################# 2118#############################################################################
1663 2119
1664package CFClient::UI::EntryBase; 2120package CFPlus::UI::EntryBase;
1665 2121
1666our @ISA = CFClient::UI::Label::; 2122our @ISA = CFPlus::UI::Label::;
1667 2123
1668use CFClient::OpenGL; 2124use CFPlus::OpenGL;
1669 2125
1670sub new { 2126sub new {
1671 my $class = shift; 2127 my $class = shift;
1672 2128
1673 $class->SUPER::new ( 2129 $class->SUPER::new (
… …
1677 active_fg => [0, 0, 0], 2133 active_fg => [0, 0, 0],
1678 can_hover => 1, 2134 can_hover => 1,
1679 can_focus => 1, 2135 can_focus => 1,
1680 valign => 0, 2136 valign => 0,
1681 can_events => 1, 2137 can_events => 1,
2138 ellipsise => 0,
1682 #text => ... 2139 #text => ...
2140 #hidden => "*",
1683 @_ 2141 @_
1684 ) 2142 )
1685} 2143}
1686 2144
1687sub _set_text { 2145sub _set_text {
… …
1694 $self->{last_activity} = $::NOW; 2152 $self->{last_activity} = $::NOW;
1695 $self->{text} = $text; 2153 $self->{text} = $text;
1696 2154
1697 $text =~ s/./*/g if $self->{hidden}; 2155 $text =~ s/./*/g if $self->{hidden};
1698 $self->{layout}->set_text ("$text "); 2156 $self->{layout}->set_text ("$text ");
2157 delete $self->{size_req};
1699 2158
1700 $self->_emit (changed => $self->{text}); 2159 $self->emit (changed => $self->{text});
2160
2161 $self->realloc;
1701 $self->update; 2162 $self->update;
1702} 2163}
1703 2164
1704sub set_text { 2165sub set_text {
1705 my ($self, $text) = @_; 2166 my ($self, $text) = @_;
1706 2167
1707 $self->{cursor} = length $text; 2168 $self->{cursor} = length $text;
1708 $self->_set_text ($text); 2169 $self->_set_text ($text);
1709
1710 $self->realloc;
1711} 2170}
1712 2171
1713sub get_text { 2172sub get_text {
1714 $_[0]{text} 2173 $_[0]{text}
1715} 2174}
… …
1720 my ($w, $h) = $self->SUPER::size_request; 2179 my ($w, $h) = $self->SUPER::size_request;
1721 2180
1722 ($w + 1, $h) # add 1 for cursor 2181 ($w + 1, $h) # add 1 for cursor
1723} 2182}
1724 2183
1725sub key_down { 2184sub invoke_key_down {
1726 my ($self, $ev) = @_; 2185 my ($self, $ev) = @_;
1727 2186
1728 my $mod = $ev->{mod}; 2187 my $mod = $ev->{mod};
1729 my $sym = $ev->{sym}; 2188 my $sym = $ev->{sym};
1730 my $uni = $ev->{unicode}; 2189 my $uni = $ev->{unicode};
1731 2190
1732 my $text = $self->get_text; 2191 my $text = $self->get_text;
2192
2193 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1733 2194
1734 if ($uni == 8) { 2195 if ($uni == 8) {
1735 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2196 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1736 } elsif ($uni == 127) { 2197 } elsif ($uni == 127) {
1737 substr $text, $self->{cursor}, 1, ""; 2198 substr $text, $self->{cursor}, 1, "";
1738 } elsif ($sym == CFClient::SDLK_LEFT) { 2199 } elsif ($sym == CFPlus::SDLK_LEFT) {
1739 --$self->{cursor} if $self->{cursor}; 2200 --$self->{cursor} if $self->{cursor};
1740 } elsif ($sym == CFClient::SDLK_RIGHT) { 2201 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1741 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2202 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1742 } elsif ($sym == CFClient::SDLK_HOME) { 2203 } elsif ($sym == CFPlus::SDLK_HOME) {
2204 # what a hack
2205 $self->{cursor} =
2206 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2207 ? length $1
2208 : 0;
2209 } elsif ($sym == CFPlus::SDLK_END) {
2210 # uh, again
2211 $self->{cursor} =
2212 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2213 ? $self->{cursor} + length $1
2214 : length $self->{text};
2215 } elsif ($uni == 21) { # ctrl-u
2216 $text = "";
1743 $self->{cursor} = 0; 2217 $self->{cursor} = 0;
1744 } elsif ($sym == CFClient::SDLK_END) {
1745 $self->{cursor} = length $text;
1746 } elsif ($uni == 27) { 2218 } elsif ($uni == 27) {
1747 $self->_emit ('escape'); 2219 $self->emit ('escape');
1748 } elsif ($uni) { 2220 } elsif ($uni == 0x0d) {
2221 substr $text, $self->{cursor}++, 0, "\012";
2222 } elsif ($uni >= 0x20) {
1749 substr $text, $self->{cursor}++, 0, chr $uni; 2223 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else { 2224 } else {
1751 return 0; 2225 return 0;
1752 } 2226 }
1753 2227
1754 $self->_set_text ($text); 2228 $self->_set_text ($text);
1755 2229
1756 $self->realloc; 2230 $self->realloc;
2231 $self->update;
1757 2232
1758 1 2233 1
1759} 2234}
1760 2235
1761sub focus_in { 2236sub invoke_focus_in {
1762 my ($self) = @_; 2237 my ($self) = @_;
1763 2238
1764 $self->{last_activity} = $::NOW; 2239 $self->{last_activity} = $::NOW;
1765 2240
1766 $self->SUPER::focus_in; 2241 $self->SUPER::invoke_focus_in
1767} 2242}
1768 2243
1769sub button_down { 2244sub invoke_button_down {
1770 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
1771 2246
1772 $self->SUPER::button_down ($ev, $x, $y); 2247 $self->SUPER::invoke_button_down ($ev, $x, $y);
1773 2248
1774 my $idx = $self->{layout}->xy_to_index ($x, $y); 2249 my $idx = $self->{layout}->xy_to_index ($x, $y);
1775 2250
1776 # byte-index to char-index 2251 # byte-index to char-index
1777 my $text = $self->{text}; 2252 my $text = $self->{text};
1778 utf8::encode $text; 2253 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1779 $self->{cursor} = length substr $text, 0, $idx; 2254 $self->{cursor} = length $text;
1780 2255
1781 $self->_set_text ($self->{text}); 2256 $self->_set_text ($self->{text});
1782 $self->update; 2257 $self->update;
1783 2258
1784 1 2259 1
1785} 2260}
1786 2261
1787sub mouse_motion { 2262sub invoke_mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 2263 my ($self, $ev, $x, $y) = @_;
1789# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2264# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790 2265
1791 0 2266 1
1792} 2267}
1793 2268
1794sub _draw { 2269sub _draw {
1795 my ($self) = @_; 2270 my ($self) = @_;
1796 2271
… …
1823 utf8::encode $text; 2298 utf8::encode $text;
1824 2299
1825 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2300 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1826 } 2301 }
1827 2302
1828 glColor @{$self->{fg}};
1829 glBegin GL_LINES; 2303 glBegin GL_LINES;
1830 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2304 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1831 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2305 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1832 glEnd; 2306 glEnd;
1833 } 2307 }
1834} 2308}
1835 2309
2310#############################################################################
2311
1836package CFClient::UI::Entry; 2312package CFPlus::UI::Entry;
1837 2313
1838our @ISA = CFClient::UI::EntryBase::; 2314our @ISA = CFPlus::UI::EntryBase::;
1839 2315
1840use CFClient::OpenGL; 2316use CFPlus::OpenGL;
1841 2317
1842sub key_down { 2318sub invoke_key_down {
1843 my ($self, $ev) = @_; 2319 my ($self, $ev) = @_;
1844 2320
1845 my $sym = $ev->{sym}; 2321 my $sym = $ev->{sym};
1846 2322
1847 if ($sym == 13) { 2323 if ($ev->{uni} == 0x0d || $sym == 13) {
1848 unshift @{$self->{history}}, 2324 unshift @{$self->{history}},
1849 my $txt = $self->get_text; 2325 my $txt = $self->get_text;
2326
1850 $self->{history_pointer} = -1; 2327 $self->{history_pointer} = -1;
1851 $self->{history_saveback} = ''; 2328 $self->{history_saveback} = '';
1852 $self->_emit (activate => $txt); 2329 $self->emit (activate => $txt);
1853 $self->update; 2330 $self->update;
1854 2331
1855 } elsif ($sym == CFClient::SDLK_UP) { 2332 } elsif ($sym == CFPlus::SDLK_UP) {
1856 if ($self->{history_pointer} < 0) { 2333 if ($self->{history_pointer} < 0) {
1857 $self->{history_saveback} = $self->get_text; 2334 $self->{history_saveback} = $self->get_text;
1858 } 2335 }
1859 if (@{$self->{history} || []} > 0) { 2336 if (@{$self->{history} || []} > 0) {
1860 $self->{history_pointer}++; 2337 $self->{history_pointer}++;
… …
1862 $self->{history_pointer} = @{$self->{history} || []} - 1; 2339 $self->{history_pointer} = @{$self->{history} || []} - 1;
1863 } 2340 }
1864 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2341 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1865 } 2342 }
1866 2343
1867 } elsif ($sym == CFClient::SDLK_DOWN) { 2344 } elsif ($sym == CFPlus::SDLK_DOWN) {
1868 $self->{history_pointer}--; 2345 $self->{history_pointer}--;
1869 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2346 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1870 2347
1871 if ($self->{history_pointer} >= 0) { 2348 if ($self->{history_pointer} >= 0) {
1872 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2349 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1873 } else { 2350 } else {
1874 $self->set_text ($self->{history_saveback}); 2351 $self->set_text ($self->{history_saveback});
1875 } 2352 }
1876 2353
1877 } else { 2354 } else {
1878 return $self->SUPER::key_down ($ev) 2355 return $self->SUPER::invoke_key_down ($ev)
1879 } 2356 }
1880 2357
1881 1 2358 1
1882} 2359}
1883 2360
1884############################################################################# 2361#############################################################################
1885 2362
2363package CFPlus::UI::TextEdit;
2364
2365our @ISA = CFPlus::UI::EntryBase::;
2366
2367use CFPlus::OpenGL;
2368
2369sub move_cursor_ver {
2370 my ($self, $dy) = @_;
2371
2372 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2373
2374 $y += $dy;
2375
2376 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2377 $self->{cursor} = $index;
2378 delete $self->{cur_h};
2379 $self->update;
2380 return;
2381 }
2382}
2383
2384sub invoke_key_down {
2385 my ($self, $ev) = @_;
2386
2387 my $sym = $ev->{sym};
2388
2389 if ($sym == CFPlus::SDLK_UP) {
2390 $self->move_cursor_ver (-1);
2391 } elsif ($sym == CFPlus::SDLK_DOWN) {
2392 $self->move_cursor_ver (+1);
2393 } else {
2394 return $self->SUPER::invoke_key_down ($ev)
2395 }
2396
2397 1
2398}
2399
2400#############################################################################
2401
1886package CFClient::UI::Button; 2402package CFPlus::UI::Button;
1887 2403
1888our @ISA = CFClient::UI::Label::; 2404our @ISA = CFPlus::UI::Label::;
1889 2405
1890use CFClient::OpenGL; 2406use CFPlus::OpenGL;
1891 2407
1892my @tex = 2408my @tex =
1893 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2409 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1894 qw(b1_button_active.png); 2410 qw(b1_button_inactive.png b1_button_active.png);
1895 2411
1896sub new { 2412sub new {
1897 my $class = shift; 2413 my $class = shift;
1898 2414
1899 $class->SUPER::new ( 2415 $class->SUPER::new (
1900 padding_x => 4, 2416 padding_x => 4,
1901 padding_y => 4, 2417 padding_y => 4,
1902 fg => [1, 1, 1], 2418 fg => [1.0, 1.0, 1.0],
1903 active_fg => [0, 0, 1], 2419 active_fg => [0.8, 0.8, 0.8],
1904 can_hover => 1, 2420 can_hover => 1,
1905 align => 0, 2421 align => 0,
1906 valign => 0, 2422 valign => 0,
1907 can_events => 1, 2423 can_events => 1,
1908 @_ 2424 @_
1909 ) 2425 )
1910} 2426}
1911 2427
1912sub activate { }
1913
1914sub button_up { 2428sub invoke_button_up {
1915 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
1916 2430
1917 $self->emit ("activate") 2431 $self->emit ("activate")
1918 if $x >= 0 && $x < $self->{w} 2432 if $x >= 0 && $x < $self->{w}
1919 && $y >= 0 && $y < $self->{h}; 2433 && $y >= 0 && $y < $self->{h};
… …
1928 2442
1929 glEnable GL_TEXTURE_2D; 2443 glEnable GL_TEXTURE_2D;
1930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1931 glColor 0, 0, 0, 1; 2445 glColor 0, 0, 0, 1;
1932 2446
2447 my $tex = $tex[$GRAB == $self];
1933 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2448 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1934 2449
1935 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
1936 2451
1937 $self->SUPER::_draw; 2452 $self->SUPER::_draw;
1938} 2453}
1939 2454
1940############################################################################# 2455#############################################################################
1941 2456
1942package CFClient::UI::CheckBox; 2457package CFPlus::UI::CheckBox;
1943 2458
1944our @ISA = CFClient::UI::DrawBG::; 2459our @ISA = CFPlus::UI::DrawBG::;
1945 2460
1946my @tex = 2461my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2462 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2463 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1949 2464
1950use CFClient::OpenGL; 2465use CFPlus::OpenGL;
1951 2466
1952sub new { 2467sub new {
1953 my $class = shift; 2468 my $class = shift;
1954 2469
1955 $class->SUPER::new ( 2470 $class->SUPER::new (
… …
1969 my ($self) = @_; 2484 my ($self) = @_;
1970 2485
1971 (6) x 2 2486 (6) x 2
1972} 2487}
1973 2488
2489sub toggle {
2490 my ($self) = @_;
2491
2492 $self->{state} = !$self->{state};
2493 $self->emit (changed => $self->{state});
2494 $self->update;
2495}
2496
1974sub button_down { 2497sub invoke_button_down {
1975 my ($self, $ev, $x, $y) = @_; 2498 my ($self, $ev, $x, $y) = @_;
1976 2499
1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2500 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2501 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1979 $self->{state} = !$self->{state}; 2502 $self->toggle;
1980 $self->_emit (changed => $self->{state});
1981 } else { 2503 } else {
1982 return 0 2504 return 0
1983 } 2505 }
1984 2506
1985 1 2507 1
… …
2005 glDisable GL_TEXTURE_2D; 2527 glDisable GL_TEXTURE_2D;
2006} 2528}
2007 2529
2008############################################################################# 2530#############################################################################
2009 2531
2010package CFClient::UI::Image; 2532package CFPlus::UI::Image;
2011 2533
2012our @ISA = CFClient::UI::Base::; 2534our @ISA = CFPlus::UI::Base::;
2013 2535
2014use CFClient::OpenGL; 2536use CFPlus::OpenGL;
2015use Carp qw/confess/;
2016 2537
2017our %loaded_images; 2538our %texture_cache;
2018 2539
2019sub new { 2540sub new {
2020 my $class = shift; 2541 my $class = shift;
2021 2542
2022 my $self = $class->SUPER::new (can_events => 0, @_); 2543 my $self = $class->SUPER::new (
2544 can_events => 0,
2545 @_,
2546 );
2023 2547
2024 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2548 $self->{path} || $self->{tex}
2549 or Carp::croak "'path' or 'tex' attributes required";
2025 2550
2026 $loaded_images{$self->{image}} ||= 2551 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2027 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2552 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2028 2553
2029 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2554 CFPlus::weaken $texture_cache{$self->{path}};
2030 2555
2031 Scalar::Util::weaken $loaded_images{$self->{image}}; 2556 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2032
2033 $self->{aspect} = $tex->{w} / $tex->{h};
2034 2557
2035 $self 2558 $self
2036} 2559}
2037 2560
2561sub STORABLE_freeze {
2562 my ($self, $cloning) = @_;
2563
2564 $self->{path}
2565 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2566
2567 $self->{path}
2568}
2569
2570sub STORABLE_attach {
2571 my ($self, $cloning, $path) = @_;
2572
2573 $self->new (path => $path)
2574}
2575
2038sub size_request { 2576sub size_request {
2039 my ($self) = @_; 2577 my ($self) = @_;
2040 2578
2041 ($self->{tex}->{w}, $self->{tex}->{h}) 2579 ($self->{tex}{w}, $self->{tex}{h})
2042} 2580}
2043 2581
2044sub _draw { 2582sub _draw {
2045 my ($self) = @_; 2583 my ($self) = @_;
2046 2584
… …
2056 } 2594 }
2057 2595
2058 glEnable GL_TEXTURE_2D; 2596 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2598
2061 $tex->draw_quad_alpha (0, 0, $w, $h); 2599 $tex->draw_quad (0, 0, $w, $h);
2062 2600
2063 glDisable GL_TEXTURE_2D; 2601 glDisable GL_TEXTURE_2D;
2064} 2602}
2065 2603
2066############################################################################# 2604#############################################################################
2067 2605
2606package CFPlus::UI::ImageButton;
2607
2608our @ISA = CFPlus::UI::Image::;
2609
2610use CFPlus::OpenGL;
2611
2612my %textures;
2613
2614sub new {
2615 my $class = shift;
2616
2617 my $self = $class->SUPER::new (
2618 padding_x => 4,
2619 padding_y => 4,
2620 fg => [1, 1, 1],
2621 active_fg => [0, 0, 1],
2622 can_hover => 1,
2623 align => 0,
2624 valign => 0,
2625 can_events => 1,
2626 @_
2627 );
2628}
2629
2630sub invoke_button_up {
2631 my ($self, $ev, $x, $y) = @_;
2632
2633 $self->emit ("activate")
2634 if $x >= 0 && $x < $self->{w}
2635 && $y >= 0 && $y < $self->{h};
2636
2637 1
2638}
2639
2640#############################################################################
2641
2068package CFClient::UI::VGauge; 2642package CFPlus::UI::VGauge;
2069 2643
2070our @ISA = CFClient::UI::Base::; 2644our @ISA = CFPlus::UI::Base::;
2071 2645
2072use List::Util qw(min max); 2646use List::Util qw(min max);
2073 2647
2074use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2075 2649
2076my %tex = ( 2650my %tex = (
2077 food => [ 2651 food => [
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2652 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2079 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2653 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2080 ], 2654 ],
2081 grace => [ 2655 grace => [
2082 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2656 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2083 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2657 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2084 ], 2658 ],
2085 hp => [ 2659 hp => [
2086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2660 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2087 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2661 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2088 ], 2662 ],
2089 mana => [ 2663 mana => [
2090 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2664 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2091 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2665 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2092 ], 2666 ],
2093); 2667);
2094 2668
2095# eg. VGauge->new (gauge => 'food'), default gauge: food 2669# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2155 my $ycut1 = max 0, min 1, $ycut; 2729 my $ycut1 = max 0, min 1, $ycut;
2156 my $ycut2 = max 0, min 1, $ycut - 1; 2730 my $ycut2 = max 0, min 1, $ycut - 1;
2157 2731
2158 my $h1 = $self->{h} * (1 - $ycut1); 2732 my $h1 = $self->{h} * (1 - $ycut1);
2159 my $h2 = $self->{h} * (1 - $ycut2); 2733 my $h2 = $self->{h} * (1 - $ycut2);
2734 my $h3 = $self->{h};
2735
2736 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2160 2737
2161 glEnable GL_BLEND; 2738 glEnable GL_BLEND;
2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2739 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2740 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2164 glEnable GL_TEXTURE_2D; 2741 glEnable GL_TEXTURE_2D;
… …
2183 2760
2184 if ($t3) { 2761 if ($t3) {
2185 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2762 glBindTexture GL_TEXTURE_2D, $t3->{name};
2186 glBegin GL_QUADS; 2763 glBegin GL_QUADS;
2187 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2764 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2188 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2765 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2189 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2766 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2190 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2767 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2191 glEnd; 2768 glEnd;
2192 } 2769 }
2193 2770
2194 glDisable GL_BLEND; 2771 glDisable GL_BLEND;
2195 glDisable GL_TEXTURE_2D; 2772 glDisable GL_TEXTURE_2D;
2196} 2773}
2197 2774
2198############################################################################# 2775#############################################################################
2199 2776
2200package CFClient::UI::Gauge; 2777package CFPlus::UI::Gauge;
2201 2778
2202our @ISA = CFClient::UI::VBox::; 2779our @ISA = CFPlus::UI::VBox::;
2203 2780
2204sub new { 2781sub new {
2205 my ($class, %arg) = @_; 2782 my ($class, %arg) = @_;
2206 2783
2207 my $self = $class->SUPER::new ( 2784 my $self = $class->SUPER::new (
… …
2209 can_hover => 1, 2786 can_hover => 1,
2210 can_events => 1, 2787 can_events => 1,
2211 %arg, 2788 %arg,
2212 ); 2789 );
2213 2790
2214 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2791 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2215 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2792 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2216 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2793 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2217 2794
2218 $self 2795 $self
2219} 2796}
2220 2797
2221sub set_fontsize { 2798sub set_fontsize {
… …
2242 $self->{value}->set_text ($val); 2819 $self->{value}->set_text ($val);
2243} 2820}
2244 2821
2245############################################################################# 2822#############################################################################
2246 2823
2247package CFClient::UI::Slider; 2824package CFPlus::UI::Slider;
2248 2825
2249use strict; 2826use strict;
2250 2827
2251use CFClient::OpenGL; 2828use CFPlus::OpenGL;
2252 2829
2253our @ISA = CFClient::UI::DrawBG::; 2830our @ISA = CFPlus::UI::DrawBG::;
2254 2831
2255my @tex = 2832my @tex =
2256 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2833 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2257 qw(s1_slider.png s1_slider_bg.png); 2834 qw(s1_slider.png s1_slider_bg.png);
2258 2835
2259sub new { 2836sub new {
2260 my $class = shift; 2837 my $class = shift;
2261 2838
… …
2282 $self->update; 2859 $self->update;
2283 2860
2284 $self 2861 $self
2285} 2862}
2286 2863
2287sub changed { }
2288
2289sub set_range { 2864sub set_range {
2290 my ($self, $range) = @_; 2865 my ($self, $range) = @_;
2291 2866
2292 ($range, $self->{range}) = ($self->{range}, $range); 2867 ($range, $self->{range}) = ($self->{range}, $range);
2293 2868
2294 $self->update
2295 if "@$range" ne "@{$self->{range}}"; 2869 if ("@$range" ne "@{$self->{range}}") {
2870 $self->update;
2871 $self->set_value ($self->{range}[0]);
2872 }
2296} 2873}
2297 2874
2298sub set_value { 2875sub set_value {
2299 my ($self, $value) = @_; 2876 my ($self, $value) = @_;
2300 2877
… …
2311 if $unit; 2888 if $unit;
2312 2889
2313 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2890 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2314 2891
2315 if ($value != $old_value) { 2892 if ($value != $old_value) {
2316 $self->_emit (changed => $value); 2893 $self->emit (changed => $value);
2317 $self->update; 2894 $self->update;
2318 } 2895 }
2319} 2896}
2320 2897
2321sub size_request { 2898sub size_request {
2322 my ($self) = @_; 2899 my ($self) = @_;
2323 2900
2324 ($self->{req_w}, $self->{req_h}) 2901 ($self->{req_w}, $self->{req_h})
2325} 2902}
2326 2903
2327sub button_down { 2904sub invoke_button_down {
2328 my ($self, $ev, $x, $y) = @_; 2905 my ($self, $ev, $x, $y) = @_;
2329 2906
2330 $self->SUPER::button_down ($ev, $x, $y); 2907 $self->SUPER::invoke_button_down ($ev, $x, $y);
2331 2908
2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2909 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333 2910
2334 $self->mouse_motion ($ev, $x, $y) 2911 $self->invoke_mouse_motion ($ev, $x, $y)
2335} 2912}
2336 2913
2337sub mouse_motion { 2914sub invoke_mouse_motion {
2338 my ($self, $ev, $x, $y) = @_; 2915 my ($self, $ev, $x, $y) = @_;
2339 2916
2340 if ($GRAB == $self) { 2917 if ($GRAB == $self) {
2341 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2918 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2342 2919
… …
2348 } else { 2925 } else {
2349 return 0; 2926 return 0;
2350 } 2927 }
2351 2928
2352 1 2929 1
2930}
2931
2932sub invoke_mouse_wheel {
2933 my ($self, $ev) = @_;
2934
2935 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2936
2937 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2938
2939 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2940
2941 ! ! $delta
2353} 2942}
2354 2943
2355sub update { 2944sub update {
2356 my ($self) = @_; 2945 my ($self) = @_;
2357 2946
… …
2406 glDisable GL_TEXTURE_2D; 2995 glDisable GL_TEXTURE_2D;
2407} 2996}
2408 2997
2409############################################################################# 2998#############################################################################
2410 2999
2411package CFClient::UI::ValSlider; 3000package CFPlus::UI::ValSlider;
2412 3001
2413our @ISA = CFClient::UI::HBox::; 3002our @ISA = CFPlus::UI::HBox::;
2414 3003
2415sub new { 3004sub new {
2416 my ($class, %arg) = @_; 3005 my ($class, %arg) = @_;
2417 3006
2418 my $range = delete $arg{range}; 3007 my $range = delete $arg{range};
2419 3008
2420 my $self = $class->SUPER::new ( 3009 my $self = $class->SUPER::new (
2421 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3010 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2422 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3011 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2423 to_value => sub { shift }, 3012 to_value => sub { shift },
2424 from_value => sub { shift }, 3013 from_value => sub { shift },
2425 %arg, 3014 %arg,
2426 ); 3015 );
2427 3016
… …
2447sub set_range { shift->{slider}->set_range (@_) } 3036sub set_range { shift->{slider}->set_range (@_) }
2448sub set_value { shift->{slider}->set_value (@_) } 3037sub set_value { shift->{slider}->set_value (@_) }
2449 3038
2450############################################################################# 3039#############################################################################
2451 3040
2452package CFClient::UI::TextView; 3041package CFPlus::UI::TextScroller;
2453 3042
2454our @ISA = CFClient::UI::HBox::; 3043our @ISA = CFPlus::UI::HBox::;
2455 3044
2456use CFClient::OpenGL; 3045use CFPlus::OpenGL;
2457 3046
2458sub new { 3047sub new {
2459 my $class = shift; 3048 my $class = shift;
2460 3049
2461 my $self = $class->SUPER::new ( 3050 my $self = $class->SUPER::new (
2462 fontsize => 1, 3051 fontsize => 1,
2463 can_events => 0, 3052 can_events => 1,
3053 indent => 0,
2464 #font => default_font 3054 #font => default_font
2465 @_, 3055 @_,
2466 3056
2467 layout => (new CFClient::Layout 1), 3057 layout => (new CFPlus::Layout),
2468 par => [], 3058 par => [],
3059 max_par => 0,
2469 height => 0, 3060 height => 0,
2470 children => [ 3061 children => [
2471 (new CFClient::UI::Empty expand => 1), 3062 (new CFPlus::UI::Empty expand => 1),
2472 (new CFClient::UI::Slider vertical => 1), 3063 (new CFPlus::UI::Slider vertical => 1),
2473 ], 3064 ],
2474 ); 3065 );
2475 3066
2476 $self->{children}[1]->connect (changed => sub { $self->update }); 3067 $self->{children}[1]->connect (changed => sub { $self->update });
2477 3068
… …
2483 3074
2484 $self->{fontsize} = $fontsize; 3075 $self->{fontsize} = $fontsize;
2485 $self->reflow; 3076 $self->reflow;
2486} 3077}
2487 3078
3079sub size_request {
3080 my ($self) = @_;
3081
3082 my ($empty, $slider) = @{ $self->{children} };
3083
3084 local $self->{children} = [$empty, $slider];
3085 $self->SUPER::size_request
3086}
3087
2488sub size_allocate { 3088sub invoke_size_allocate {
2489 my ($self, $w, $h) = @_; 3089 my ($self, $w, $h) = @_;
2490 3090
2491 $self->SUPER::size_allocate ($w, $h); 3091 my ($empty, $slider, @other) = @{ $self->{children} };
3092 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2492 3093
2493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3094 $self->{layout}->set_font ($self->{font}) if $self->{font};
2494 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3095 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495 $self->{layout}->set_width ($self->{children}[0]{w}); 3096 $self->{layout}->set_width ($empty->{w});
3097 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2496 3098
2497 $self->reflow; 3099 $self->reflow;
2498}
2499 3100
2500sub text_size { 3101 local $self->{children} = [$empty, $slider];
3102 $self->SUPER::invoke_size_allocate ($w, $h)
3103}
3104
3105sub invoke_mouse_wheel {
2501 my ($self, $text, $indent) = @_; 3106 my ($self, $ev) = @_;
3107
3108 return 0 unless $ev->{dy}; # only vertical movements
3109
3110 $self->{children}[1]->emit (mouse_wheel => $ev);
3111
3112 1
3113}
3114
3115sub get_layout {
3116 my ($self, $para) = @_;
2502 3117
2503 my $layout = $self->{layout}; 3118 my $layout = $self->{layout};
2504 3119
3120 $layout->set_font ($self->{font}) if $self->{font};
3121 $layout->set_foreground (@{$para->{fg}});
2505 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3122 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506 $layout->set_width ($self->{children}[0]{w} - $indent); 3123 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3124 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2507 $layout->set_markup ($text); 3125 $layout->set_markup ($para->{markup});
3126
3127 $layout->set_shapes (
3128 map
3129 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3130 @{$para->{widget}}
2508 3131 );
3132
2509 $layout->size 3133 $layout
2510} 3134}
2511 3135
2512sub reflow { 3136sub reflow {
2513 my ($self) = @_; 3137 my ($self) = @_;
2514 3138
… …
2521 3145
2522 # todo: base offset on lines or so, not on pixels 3146 # todo: base offset on lines or so, not on pixels
2523 $self->{children}[1]->set_value ($offset); 3147 $self->{children}[1]->set_value ($offset);
2524} 3148}
2525 3149
3150sub current_paragraph {
3151 my ($self) = @_;
3152
3153 $self->{top_paragraph} - 1
3154}
3155
3156sub scroll_to {
3157 my ($self, $para) = @_;
3158
3159 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3160
3161 $self->{scroll_to} = $para;
3162 $self->update;
3163}
3164
2526sub clear { 3165sub clear {
2527 my ($self) = @_; 3166 my ($self) = @_;
3167
3168 my (undef, undef, @other) = @{ $self->{children} };
3169 $self->remove ($_) for @other;
2528 3170
2529 $self->{par} = []; 3171 $self->{par} = [];
2530 $self->{height} = 0; 3172 $self->{height} = 0;
2531 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3173 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532} 3174}
2533 3175
2534sub add_paragraph { 3176sub add_paragraph {
2535 my ($self, $color, $text, $indent) = @_; 3177 my $self = shift;
2536 3178
2537 for my $line (split /\n/, $text) { 3179 for my $para (@_) {
2538 my ($w, $h) = $self->text_size ($line); 3180 $para = {
3181 fg => [1, 1, 1, 1],
3182 indent => 0,
3183 markup => "",
3184 widget => [],
3185 ref $para ? %$para : (markup => $para),
3186 w => 1e10,
3187 wrapped => 1,
3188 };
3189
3190 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3191 push @{$self->{par}}, $para;
3192 }
3193
3194 if (my $max = $self->{max_par}) {
3195 shift @{$self->{par}} while @{$self->{par}} > $max;
3196 }
3197
3198 $self->{need_reflow}++;
3199 $self->update;
3200}
3201
3202sub scroll_to_bottom {
3203 my ($self) = @_;
3204
3205 $self->{scroll_to} = $#{$self->{par}};
3206 $self->update;
3207}
3208
3209sub force_uptodate {
3210 my ($self) = @_;
3211
3212 if (delete $self->{need_reflow}) {
3213 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3214
3215 my $height = 0;
3216
3217 for my $para (@{$self->{par}}) {
3218 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3219 my $layout = $self->get_layout ($para);
3220 my ($w, $h) = $layout->size;
3221
3222 $para->{w} = $w + $para->{indent};
3223 $para->{h} = $h;
3224 $para->{wrapped} = $layout->has_wrapped;
3225 }
3226
3227 $para->{y} = $height;
3228 $height += $para->{h};
3229 }
3230
2539 $self->{height} += $h; 3231 $self->{height} = $height;
2540 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3232 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2541 }
2542 3233
2543 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3234 delete $self->{texture};
3235 }
3236
3237 if (my $paridx = delete $self->{scroll_to}) {
3238 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3239 }
2544} 3240}
2545 3241
2546sub update { 3242sub update {
2547 my ($self) = @_; 3243 my ($self) = @_;
2548 3244
… …
2550 3246
2551 return unless $self->{h} > 0; 3247 return unless $self->{h} > 0;
2552 3248
2553 delete $self->{texture}; 3249 delete $self->{texture};
2554 3250
2555 $ROOT->on_post_alloc ($self, sub { 3251 $ROOT->on_post_alloc ($self => sub {
3252 $self->force_uptodate;
3253
2556 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3254 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557 3255
2558 if (delete $self->{need_reflow}) {
2559 my $height = 0;
2560
2561 my $layout = $self->{layout};
2562
2563 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2565 for (@{$self->{par}}) {
2566 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2567 $layout->set_width ($W - $_->[3]);
2568 $layout->set_markup ($_->[4]);
2569 my ($w, $h) = $layout->size;
2570 $_->[0] = $w + $_->[3];
2571 $_->[1] = $h;
2572 }
2573
2574 $height += $_->[1];
2575 }
2576
2577 $self->{height} = $height;
2578
2579 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2580
2581 delete $self->{texture};
2582 }
2583
2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3256 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2585 glClearColor 0, 0, 0, 0; 3257 glClearColor 0, 0, 0, 0;
2586 glClear GL_COLOR_BUFFER_BIT; 3258 glClear GL_COLOR_BUFFER_BIT;
2587 3259
3260 package CFPlus::UI::Base;
3261 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3262 (0, 0, $self->{w}, $self->{h});
3263
3264 my $top = int $self->{children}[1]{range}[0];
3265
3266 my $paridx = 0;
3267 my $top_paragraph;
2588 my $top = int $self->{children}[1]{range}[0]; 3268 my $top = int $self->{children}[1]{range}[0];
2589 3269
2590 my $y0 = $top; 3270 my $y0 = $top;
2591 my $y1 = $top + $H; 3271 my $y1 = $top + $H;
2592 3272
2593 my $y = 0;
2594
2595 my $layout = $self->{layout};
2596
2597 $layout->set_font ($self->{font}) if $self->{font};
2598
2599 glEnable GL_BLEND;
2600 #TODO# not correct in windows where rgba is forced off
2601 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602
2603 for my $par (@{$self->{par}}) { 3273 for my $para (@{$self->{par}}) {
2604 my $h = $par->[1]; 3274 my $h = $para->{h};
3275 my $y = $para->{y};
2605 3276
2606 if ($y0 < $y + $h && $y < $y1) { 3277 if ($y0 < $y + $h && $y < $y1) {
2607 $layout->set_foreground (@{ $par->[2] }); 3278 my $layout = $self->get_layout ($para);
2608 $layout->set_width ($W - $par->[3]);
2609 $layout->set_markup ($par->[4]);
2610 3279
2611 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3280 $layout->render ($para->{indent}, $y - $y0);
2612 3281
2613 glRasterPos $par->[3], $y - $y0; 3282 if (my @w = @{ $para->{widget} }) {
2614 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3283 my @s = $layout->get_shapes;
3284
3285 for (@w) {
3286 my ($dx, $dy) = splice @s, 0, 2, ();
3287
3288 $_->{x} = $dx + $para->{indent};
3289 $_->{y} = $dy + $y - $y0;
3290
3291 $_->draw;
3292 }
3293 }
2615 } 3294 }
2616 3295
2617 $y += $h; 3296 $paridx++;
3297 $top_paragraph ||= $paridx if $y >= $top;
2618 } 3298 }
2619 3299
2620 glDisable GL_BLEND; 3300 $self->{top_paragraph} = $top_paragraph;
2621 }; 3301 };
2622 }); 3302 });
3303}
3304
3305sub reconfigure {
3306 my ($self) = @_;
3307
3308 $self->SUPER::reconfigure;
3309
3310 $_->{w} = 1e10 for @{ $self->{par} };
3311 $self->reflow;
2623} 3312}
2624 3313
2625sub _draw { 3314sub _draw {
2626 my ($self) = @_; 3315 my ($self) = @_;
2627 3316
… …
2630 glColor 0, 0, 0, 1; 3319 glColor 0, 0, 0, 1;
2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3320 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2632 glDisable GL_TEXTURE_2D; 3321 glDisable GL_TEXTURE_2D;
2633 3322
2634 $self->{children}[1]->draw; 3323 $self->{children}[1]->draw;
2635
2636} 3324}
2637 3325
2638############################################################################# 3326#############################################################################
2639 3327
2640package CFClient::UI::Animator; 3328package CFPlus::UI::Animator;
2641 3329
2642use CFClient::OpenGL; 3330use CFPlus::OpenGL;
2643 3331
2644our @ISA = CFClient::UI::Bin::; 3332our @ISA = CFPlus::UI::Bin::;
2645 3333
2646sub moveto { 3334sub moveto {
2647 my ($self, $x, $y) = @_; 3335 my ($self, $x, $y) = @_;
2648 3336
2649 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3337 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2677 glPopMatrix; 3365 glPopMatrix;
2678} 3366}
2679 3367
2680############################################################################# 3368#############################################################################
2681 3369
2682package CFClient::UI::Flopper; 3370package CFPlus::UI::Flopper;
2683 3371
2684our @ISA = CFClient::UI::Button::; 3372our @ISA = CFPlus::UI::Button::;
2685 3373
2686sub new { 3374sub new {
2687 my $class = shift; 3375 my $class = shift;
2688 3376
2689 my $self = $class->SUPER::new ( 3377 my $self = $class->SUPER::new (
… …
2701 $self->{other}->toggle_visibility; 3389 $self->{other}->toggle_visibility;
2702} 3390}
2703 3391
2704############################################################################# 3392#############################################################################
2705 3393
2706package CFClient::UI::Tooltip; 3394package CFPlus::UI::Tooltip;
2707 3395
2708our @ISA = CFClient::UI::Bin::; 3396our @ISA = CFPlus::UI::Bin::;
2709 3397
2710use CFClient::OpenGL; 3398use CFPlus::OpenGL;
2711 3399
2712sub new { 3400sub new {
2713 my $class = shift; 3401 my $class = shift;
2714 3402
2715 $class->SUPER::new ( 3403 $class->SUPER::new (
… …
2718 ) 3406 )
2719} 3407}
2720 3408
2721sub set_tooltip_from { 3409sub set_tooltip_from {
2722 my ($self, $widget) = @_; 3410 my ($self, $widget) = @_;
3411
3412 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3413 if $widget->{tooltip} =~ /^#(.*)$/;
2723 3414
2724 my $tooltip = $widget->{tooltip}; 3415 my $tooltip = $widget->{tooltip};
2725 3416
2726 if ($ENV{CFPLUS_DEBUG} & 2) { 3417 if ($ENV{CFPLUS_DEBUG} & 2) {
2727 $tooltip .= "\n\n" . (ref $widget) . "\n" 3418 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3419 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n" 3420 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}"; 3421 . "visible $widget->{visible}";
2731 } 3422 }
2732 3423
3424 $tooltip =~ s/^\n+//;
3425 $tooltip =~ s/\n+$//;
3426
2733 $self->add (new CFClient::UI::Label 3427 $self->add (new CFPlus::UI::Label
2734 markup => $tooltip, 3428 markup => $tooltip,
2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3429 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2736 fontsize => 0.8, 3430 fontsize => 0.8,
2737 fg => [0, 0, 0, 1], 3431 style => 1, # FLAG_INVERSE
2738 ellipsise => 0, 3432 ellipsise => 0,
2739 font => ($widget->{tooltip_font} || $::FONT_PROP), 3433 font => ($widget->{tooltip_font} || $::FONT_PROP),
2740 ); 3434 );
2741} 3435}
2742 3436
… …
2746 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3440 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2747 3441
2748 ($w + 4, $h + 4) 3442 ($w + 4, $h + 4)
2749} 3443}
2750 3444
2751sub size_allocate { 3445sub invoke_size_allocate {
2752 my ($self, $w, $h) = @_; 3446 my ($self, $w, $h) = @_;
2753 3447
2754 $self->SUPER::size_allocate ($w - 4, $h - 4); 3448 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2755} 3449}
2756 3450
2757sub visibility_change { 3451sub invoke_visibility_change {
2758 my ($self, $visible) = @_; 3452 my ($self, $visible) = @_;
2759 3453
2760 return unless $visible; 3454 return unless $visible;
2761 3455
2762 $self->{root}->on_post_alloc ("move_$self" => sub { 3456 $self->{root}->on_post_alloc ("move_$self" => sub {
2763 my $widget = $self->{owner} 3457 my $widget = $self->{owner}
2764 or return; 3458 or return;
2765 3459
3460 if ($widget->{visible}) {
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3461 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767 3462
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3463 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH; 3464 if $x + $self->{w} > $self->{root}{w};
2770 3465
2771 $self->move_abs ($x, $y); 3466 $self->move_abs ($x, $y);
3467 } else {
3468 $self->hide;
3469 }
2772 }); 3470 });
2773} 3471}
2774 3472
2775sub _draw { 3473sub _draw {
2776 my ($self) = @_; 3474 my ($self) = @_;
… …
2800 $self->SUPER::_draw; 3498 $self->SUPER::_draw;
2801} 3499}
2802 3500
2803############################################################################# 3501#############################################################################
2804 3502
2805package CFClient::UI::Face; 3503package CFPlus::UI::Face;
2806 3504
2807our @ISA = CFClient::UI::Base::; 3505our @ISA = CFPlus::UI::DrawBG::;
2808 3506
2809use CFClient::OpenGL; 3507use CFPlus::OpenGL;
2810 3508
2811sub new { 3509sub new {
2812 my $class = shift; 3510 my $class = shift;
2813 3511
2814 my $self = $class->SUPER::new ( 3512 my $self = $class->SUPER::new (
3513 size_w => 32,
3514 size_h => 8,
2815 aspect => 1, 3515 aspect => 1,
2816 can_events => 0, 3516 can_events => 0,
2817 @_, 3517 @_,
2818 ); 3518 );
2819 3519
2820 if ($self->{anim} && $self->{animspeed}) { 3520 if ($self->{anim} && $self->{animspeed}) {
2821 Scalar::Util::weaken (my $widget = $self); 3521 CFPlus::weaken (my $widget = $self);
2822 3522
3523 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3524 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2823 $self->{timer} = Event->timer ( 3525 $self->{timer} = Event->timer (
2824 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2825 hard => 1, 3526 parked => 1,
2826 interval => $self->{animspeed},
2827 cb => sub { 3527 cb => sub {
3528 return unless $::CONN && $widget;
3529
2828 ++$widget->{frame}; 3530 ++$widget->{frame};
3531 $widget->update_face;
2829 $widget->update; 3532 $widget->update;
3533
3534 $widget->update_timer;
2830 }, 3535 },
2831 ); 3536 );
3537
3538 $self->update_face;
3539 $self->update_timer;
2832 } 3540 }
2833 3541
2834 $self 3542 $self
2835} 3543}
2836 3544
3545sub update_timer {
3546 my ($self) = @_;
3547
3548 return unless $self->{timer};
3549
3550 if ($self->{visible}) {
3551 $self->{timer}->at (
3552 $self->{anim_start}
3553 + $self->{animspeed}
3554 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3555 );
3556 $self->{timer}->start;
3557 } else {
3558 $self->{timer}->stop;
3559 }
3560}
3561
3562sub update_face {
3563 my ($self) = @_;
3564
3565 return unless $::CONN;
3566
3567 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3568 if ($anim && @$anim) {
3569 delete $self->{wait_face};
3570 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3571 }
3572 }
3573}
3574
2837sub size_request { 3575sub size_request {
2838 (32, 8) 3576 my ($self) = @_;
3577
3578 if ($::CONN) {
3579 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3580 if (my $tex = $::CONN->{texture}[$faceid]) {
3581 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3582 } else {
3583 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3584 $self->realloc;
3585 });
3586 }
3587 }
3588 }
3589
3590 ($self->{size_w} || 8, $self->{size_h} || 8)
2839} 3591}
2840 3592
2841sub update { 3593sub update {
2842 my ($self) = @_; 3594 my ($self) = @_;
2843 3595
2844 return unless $self->{visible}; 3596 return unless $self->{visible};
2845 3597
2846 $self->SUPER::update; 3598 $self->SUPER::update;
2847} 3599}
2848 3600
3601sub invoke_visibility_change {
3602 my ($self) = @_;
3603
3604 $self->update_timer;
3605
3606 0
3607}
3608
2849sub _draw { 3609sub _draw {
2850 my ($self) = @_; 3610 my ($self) = @_;
2851 3611
2852 return unless $::CONN; 3612 return unless $::CONN;
2853 3613
2854 my $face; 3614 $self->SUPER::_draw;
2855 3615
2856 if ($self->{frame}) {
2857 my $anim = $::CONN->{anim}[$self->{anim}]; 3616 my $faceid = $::CONN->{faceid}[$self->{face}]
2858 3617 or return;
2859 $face = $anim->[ $self->{frame} % @$anim ]
2860 if $anim && @$anim;
2861 }
2862 3618
2863 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3619 my $tex = $::CONN->{texture}[$faceid];
2864 3620
2865 if ($tex) { 3621 if ($tex) {
2866 glEnable GL_TEXTURE_2D; 3622 glEnable GL_TEXTURE_2D;
2867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2868 glColor 0, 0, 0, 1; 3624 glColor 0, 0, 0, 1;
2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3625 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2870 glDisable GL_TEXTURE_2D; 3626 glDisable GL_TEXTURE_2D;
2871 } 3627 }
2872} 3628}
2873 3629
2874sub DESTROY { 3630sub destroy {
2875 my ($self) = @_; 3631 my ($self) = @_;
2876 3632
2877 $self->{timer}->cancel 3633 (delete $self->{timer})->cancel
2878 if $self->{timer}; 3634 if $self->{timer};
2879 3635
2880 $self->SUPER::DESTROY; 3636 $self->SUPER::destroy;
2881} 3637}
2882 3638
2883############################################################################# 3639#############################################################################
2884 3640
2885package CFClient::UI::Buttonbar; 3641package CFPlus::UI::Buttonbar;
2886 3642
2887our @ISA = CFClient::UI::HBox::; 3643our @ISA = CFPlus::UI::HBox::;
2888 3644
2889# TODO: should actualyl wrap buttons and other goodies. 3645# TODO: should actually wrap buttons and other goodies.
2890 3646
2891############################################################################# 3647#############################################################################
2892 3648
2893package CFClient::UI::Menu; 3649package CFPlus::UI::Menu;
2894 3650
2895our @ISA = CFClient::UI::FancyFrame::; 3651our @ISA = CFPlus::UI::Toplevel::;
2896 3652
2897use CFClient::OpenGL; 3653use CFPlus::OpenGL;
2898 3654
2899sub new { 3655sub new {
2900 my $class = shift; 3656 my $class = shift;
2901 3657
2902 my $self = $class->SUPER::new ( 3658 my $self = $class->SUPER::new (
2903 items => [], 3659 items => [],
2904 z => 100, 3660 z => 100,
2905 @_, 3661 @_,
2906 ); 3662 );
2907 3663
2908 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3664 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2909 3665
2910 for my $item (@{ $self->{items} }) { 3666 for my $item (@{ $self->{items} }) {
2911 my ($widget, $cb) = @$item; 3667 my ($widget, $cb, $tooltip) = @$item;
2912 3668
2913 # handle various types of items, only text for now 3669 # handle various types of items, only text for now
2914 if (!ref $widget) { 3670 if (!ref $widget) {
3671 if ($widget =~ /\t/) {
3672 my ($left, $right) = split /\t/, $widget, 2;
3673
2915 $widget = new CFClient::UI::Label 3674 $widget = new CFPlus::UI::HBox
2916 can_hover => 1, 3675 can_hover => 1,
2917 can_events => 1, 3676 can_events => 1,
3677 tooltip => $tooltip,
3678 children => [
3679 (new CFPlus::UI::Label markup => $left, expand => 1),
3680 (new CFPlus::UI::Label markup => $right, align => +1),
3681 ],
3682 ;
3683
3684 } else {
3685 $widget = new CFPlus::UI::Label
3686 can_hover => 1,
3687 can_events => 1,
2918 text => $widget; 3688 markup => $widget,
3689 tooltip => $tooltip;
3690 }
2919 } 3691 }
2920 3692
2921 $self->{item}{$widget} = $item; 3693 $self->{item}{$widget} = $item;
2922 3694
2923 $self->{vbox}->add ($widget); 3695 $self->{vbox}->add ($widget);
… …
2928 3700
2929# popup given the event (must be a mouse button down event currently) 3701# popup given the event (must be a mouse button down event currently)
2930sub popup { 3702sub popup {
2931 my ($self, $ev) = @_; 3703 my ($self, $ev) = @_;
2932 3704
2933 $self->_emit ("popdown"); 3705 $self->emit ("popdown");
2934 3706
2935 # maybe save $GRAB? must be careful about events... 3707 # maybe save $GRAB? must be careful about events...
2936 $GRAB = $self; 3708 $GRAB = $self;
2937 $self->{button} = $ev->{button}; 3709 $self->{button} = $ev->{button};
2938 3710
2939 $self->show; 3711 $self->show;
2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3712 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2941} 3713}
2942 3714
2943sub mouse_motion { 3715sub invoke_mouse_motion {
2944 my ($self, $ev, $x, $y) = @_; 3716 my ($self, $ev, $x, $y) = @_;
2945 3717
2946 # TODO: should use vbox->find_widget or so 3718 # TODO: should use vbox->find_widget or so
2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3719 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2948 $self->{hover} = $self->{item}{$HOVER}; 3720 $self->{hover} = $self->{item}{$HOVER};
2949 3721
2950 0 3722 0
2951} 3723}
2952 3724
2953sub button_up { 3725sub invoke_button_up {
2954 my ($self, $ev, $x, $y) = @_; 3726 my ($self, $ev, $x, $y) = @_;
2955 3727
2956 if ($ev->{button} == $self->{button}) { 3728 if ($ev->{button} == $self->{button}) {
2957 undef $GRAB; 3729 undef $GRAB;
2958 $self->hide; 3730 $self->hide;
2959 3731
2960 $self->_emit ("popdown"); 3732 $self->emit ("popdown");
2961 $self->{hover}[1]->() if $self->{hover}; 3733 $self->{hover}[1]->() if $self->{hover};
2962 } else { 3734 } else {
2963 return 0 3735 return 0
2964 } 3736 }
2965 3737
2966 1 3738 1
2967} 3739}
2968 3740
2969############################################################################# 3741#############################################################################
2970 3742
2971package CFClient::UI::Multiplexer; 3743package CFPlus::UI::Multiplexer;
2972 3744
2973our @ISA = CFClient::UI::Container::; 3745our @ISA = CFPlus::UI::Container::;
2974 3746
2975sub new { 3747sub new {
2976 my $class = shift; 3748 my $class = shift;
2977 3749
2978 my $self = $class->SUPER::new ( 3750 my $self = $class->SUPER::new (
… …
2992 3764
2993 $self->{current} = $self->{children}[0] 3765 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} }; 3766 if @{ $self->{children} };
2995} 3767}
2996 3768
3769sub get_current_page {
3770 my ($self) = @_;
3771
3772 $self->{current}
3773}
3774
2997sub set_current_page { 3775sub set_current_page {
2998 my ($self, $page_or_widget) = @_; 3776 my ($self, $page_or_widget) = @_;
2999 3777
3000 my $widget = ref $page_or_widget 3778 my $widget = ref $page_or_widget
3001 ? $page_or_widget 3779 ? $page_or_widget
3002 : $self->{children}[$page_or_widget]; 3780 : $self->{children}[$page_or_widget];
3003 3781
3004 $self->{current} = $widget; 3782 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3783 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006 3784
3007 $self->_emit (page_changed => $self->{current}); 3785 $self->emit (page_changed => $self->{current});
3008 3786
3009 $self->realloc; 3787 $self->realloc;
3010} 3788}
3011 3789
3012sub visible_children { 3790sub visible_children {
… …
3017 my ($self) = @_; 3795 my ($self) = @_;
3018 3796
3019 $self->{current}->size_request 3797 $self->{current}->size_request
3020} 3798}
3021 3799
3022sub size_allocate { 3800sub invoke_size_allocate {
3023 my ($self, $w, $h) = @_; 3801 my ($self, $w, $h) = @_;
3024 3802
3025 $self->{current}->configure (0, 0, $w, $h); 3803 $self->{current}->configure (0, 0, $w, $h);
3804
3805 1
3026} 3806}
3027 3807
3028sub _draw { 3808sub _draw {
3029 my ($self) = @_; 3809 my ($self) = @_;
3030 3810
3031 $self->{current}->draw; 3811 $self->{current}->draw;
3032} 3812}
3033 3813
3034############################################################################# 3814#############################################################################
3035 3815
3036package CFClient::UI::Notebook; 3816package CFPlus::UI::Notebook;
3037 3817
3038our @ISA = CFClient::UI::VBox::; 3818our @ISA = CFPlus::UI::VBox::;
3039 3819
3040sub new { 3820sub new {
3041 my $class = shift; 3821 my $class = shift;
3042 3822
3043 my $self = $class->SUPER::new ( 3823 my $self = $class->SUPER::new (
3044 buttonbar => (new CFClient::UI::Buttonbar), 3824 buttonbar => (new CFPlus::UI::Buttonbar),
3045 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3825 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3046 # filter => # will be put between multiplexer and $self 3826 # filter => # will be put between multiplexer and $self
3047 @_, 3827 @_,
3048 ); 3828 );
3049 3829
3050 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3830 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3054} 3834}
3055 3835
3056sub add { 3836sub add {
3057 my ($self, $title, $widget, $tooltip) = @_; 3837 my ($self, $title, $widget, $tooltip) = @_;
3058 3838
3059 Scalar::Util::weaken $self; 3839 CFPlus::weaken $self;
3060 3840
3061 $self->{buttonbar}->add (new CFClient::UI::Button 3841 $self->{buttonbar}->add (new CFPlus::UI::Button
3062 markup => $title, 3842 markup => $title,
3063 tooltip => $tooltip, 3843 tooltip => $tooltip,
3064 on_activate => sub { $self->set_current_page ($widget) }, 3844 on_activate => sub { $self->set_current_page ($widget) },
3065 ); 3845 );
3066 3846
3067 $self->{multiplexer}->add ($widget); 3847 $self->{multiplexer}->add ($widget);
3068} 3848}
3069 3849
3850sub get_current_page {
3851 my ($self) = @_;
3852
3853 $self->{multiplexer}->get_current_page
3854}
3855
3070sub set_current_page { 3856sub set_current_page {
3071 my ($self, $page) = @_; 3857 my ($self, $page) = @_;
3072 3858
3073 $self->{multiplexer}->set_current_page ($page); 3859 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current}); 3860 $self->emit (page_changed => $self->{multiplexer}{current});
3075} 3861}
3076 3862
3077############################################################################# 3863#############################################################################
3078 3864
3865package CFPlus::UI::Selector;
3866
3867use utf8;
3868
3869our @ISA = CFPlus::UI::Button::;
3870
3871sub new {
3872 my $class = shift;
3873
3874 my $self = $class->SUPER::new (
3875 options => [], # [value, title, longdesc], ...
3876 value => undef,
3877 @_,
3878 );
3879
3880 $self->_set_value ($self->{value});
3881
3882 $self
3883}
3884
3885sub invoke_button_down {
3886 my ($self, $ev) = @_;
3887
3888 my @menu_items;
3889
3890 for (@{ $self->{options} }) {
3891 my ($value, $title, $tooltip) = @$_;
3892
3893 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3894 }
3895
3896 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3897}
3898
3899sub _set_value {
3900 my ($self, $value) = @_;
3901
3902 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3903 or return;
3904
3905 $self->{value} = $item->[0];
3906 $self->set_markup ("$item->[1] ⇓");
3907 $self->set_tooltip ($item->[2]);
3908}
3909
3910sub set_value {
3911 my ($self, $value) = @_;
3912
3913 return unless $self->{value} ne $value;
3914
3915 $self->_set_value ($value);
3916 $self->emit (changed => $value);
3917}
3918
3919#############################################################################
3920
3079package CFClient::UI::Statusbox; 3921package CFPlus::UI::Statusbox;
3080 3922
3081our @ISA = CFClient::UI::VBox::; 3923our @ISA = CFPlus::UI::VBox::;
3082 3924
3083sub new { 3925sub new {
3084 my $class = shift; 3926 my $class = shift;
3085 3927
3086 my $self = $class->SUPER::new ( 3928 my $self = $class->SUPER::new (
3087 fontsize => 0.8, 3929 fontsize => 0.8,
3088 @_, 3930 @_,
3089 ); 3931 );
3090 3932
3091 Scalar::Util::weaken (my $this = $self); 3933 CFPlus::weaken (my $this = $self);
3092 3934
3093 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3935 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3094 3936
3095 $self 3937 $self
3096} 3938}
… …
3098sub reorder { 3940sub reorder {
3099 my ($self) = @_; 3941 my ($self) = @_;
3100 my $NOW = Time::HiRes::time; 3942 my $NOW = Time::HiRes::time;
3101 3943
3102 # freeze display when hovering over any label 3944 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner} 3945 return if $CFPlus::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3946 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} }; 3947 values %{ $self->{item} };
3106 3948
3107 while (my ($k, $v) = each %{ $self->{item} }) { 3949 while (my ($k, $v) = each %{ $self->{item} }) {
3108 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3950 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3109 } 3951 }
… …
3130 for ($short) { 3972 for ($short) {
3131 s/^\s+//; 3973 s/^\s+//;
3132 s/\s+/ /g; 3974 s/\s+/ /g;
3133 } 3975 }
3134 3976
3135 new CFClient::UI::Label 3977 new CFPlus::UI::Label
3136 markup => $short, 3978 markup => $short,
3137 tooltip => $item->{tooltip}, 3979 tooltip => $item->{tooltip},
3138 tooltip_font => $::FONT_PROP, 3980 tooltip_font => $::FONT_PROP,
3139 tooltip_width => 0.67, 3981 tooltip_width => 0.67,
3140 fontsize => $item->{fontsize} || $self->{fontsize}, 3982 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3178 $item->{count}++; 4020 $item->{count}++;
3179 } else { 4021 } else {
3180 $item->{count} = 1; 4022 $item->{count} = 1;
3181 $item->{text} = $item->{tooltip} = $text; 4023 $item->{text} = $item->{tooltip} = $text;
3182 } 4024 }
3183 $item->{id} = ++$self->{id}; 4025 $item->{id} += 0.2;#d#
3184 $item->{timeout} = $timeout; 4026 $item->{timeout} = $timeout;
3185 delete $item->{label}; 4027 delete $item->{label};
3186 } else { 4028 } else {
3187 $self->{item}{$group} = { 4029 $self->{item}{$group} = {
3188 id => ++$self->{id}, 4030 id => ++$self->{id},
… …
3194 count => 1, 4036 count => 1,
3195 %arg, 4037 %arg,
3196 }; 4038 };
3197 } 4039 }
3198 4040
4041 $ROOT->on_refresh (reorder => sub {
3199 $self->reorder; 4042 $self->reorder;
4043 });
3200} 4044}
3201 4045
3202sub reconfigure { 4046sub reconfigure {
3203 my ($self) = @_; 4047 my ($self) = @_;
3204 4048
… …
3207 4051
3208 $self->reorder; 4052 $self->reorder;
3209 $self->SUPER::reconfigure; 4053 $self->SUPER::reconfigure;
3210} 4054}
3211 4055
3212sub DESTROY { 4056sub destroy {
3213 my ($self) = @_; 4057 my ($self) = @_;
3214 4058
3215 $self->{timer}->cancel; 4059 $self->{timer}->cancel;
3216 4060
3217 $self->SUPER::DESTROY; 4061 $self->SUPER::destroy;
3218} 4062}
3219 4063
3220############################################################################# 4064#############################################################################
3221 4065
3222package CFClient::UI::Inventory;
3223
3224our @ISA = CFClient::UI::ScrolledWindow::;
3225
3226sub new {
3227 my $class = shift;
3228
3229 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3231 @_,
3232 );
3233
3234 $self
3235}
3236
3237sub set_items {
3238 my ($self, $items) = @_;
3239
3240 $self->{child}->clear;
3241 return unless $items;
3242
3243 my @items = sort {
3244 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name})
3246 } @$items;
3247
3248 $self->{real_items} = \@items;
3249
3250 my $row = 0;
3251 for my $item (@items) {
3252 CFClient::Item::update_widgets $item;
3253
3254 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget});
3257
3258 $row++;
3259 }
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 }
3457}
3458
3459#############################################################################
3460
3461package CFClient::UI::SpellList;
3462
3463our @ISA = CFClient::UI::Table::;
3464
3465sub new {
3466 my $class = shift;
3467
3468 my $self = $class->SUPER::new (
3469 binding => [],
3470 commands => [],
3471 @_,
3472 )
3473}
3474
3475# XXX: Do sorting? Argl...
3476sub add_spell {
3477 my ($self, $spell) = @_;
3478 $self->{spells}->{$spell->{name}} = $spell;
3479
3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507}
3508
3509sub remove_spell {
3510 my ($self, $spell) = @_;
3511 delete $self->{spells}->{$spell->{name}};
3512 $self->rebuild_spell_list;
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::Root; 4066package CFPlus::UI::Root;
3518 4067
3519our @ISA = CFClient::UI::Container::; 4068our @ISA = CFPlus::UI::Container::;
3520 4069
3521use List::Util qw(min max); 4070use List::Util qw(min max);
3522 4071
3523use CFClient::OpenGL; 4072use CFPlus::OpenGL;
3524 4073
3525sub new { 4074sub new {
3526 my $class = shift; 4075 my $class = shift;
3527 4076
3528 my $self = $class->SUPER::new ( 4077 my $self = $class->SUPER::new (
3529 visible => 1, 4078 visible => 1,
3530 @_, 4079 @_,
3531 ); 4080 );
3532 4081
3533 Scalar::Util::weaken ($self->{root} = $self); 4082 CFPlus::weaken ($self->{root} = $self);
3534 4083
3535 $self 4084 $self
3536} 4085}
3537 4086
3538sub size_request { 4087sub size_request {
… …
3553 $coord = $max - $size if $coord > $max - $size; 4102 $coord = $max - $size if $coord > $max - $size;
3554 4103
3555 int $coord + 0.5 4104 int $coord + 0.5
3556} 4105}
3557 4106
3558sub size_allocate { 4107sub invoke_size_allocate {
3559 my ($self, $w, $h) = @_; 4108 my ($self, $w, $h) = @_;
3560 4109
3561 for my $child ($self->children) { 4110 for my $child ($self->children) {
3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4111 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3563 4112
… …
3567 $X = _to_pixel $X, $W, $self->{w}; 4116 $X = _to_pixel $X, $W, $self->{w};
3568 $Y = _to_pixel $Y, $H, $self->{h}; 4117 $Y = _to_pixel $Y, $H, $self->{h};
3569 4118
3570 $child->configure ($X, $Y, $W, $H); 4119 $child->configure ($X, $Y, $W, $H);
3571 } 4120 }
4121
4122 1
3572} 4123}
3573 4124
3574sub coord2local { 4125sub coord2local {
3575 my ($self, $x, $y) = @_; 4126 my ($self, $x, $y) = @_;
3576 4127
… …
3702 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4253 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3703 4254
3704 $w = 0 if $w < 0; 4255 $w = 0 if $w < 0;
3705 $h = 0 if $h < 0; 4256 $h = 0 if $h < 0;
3706 4257
4258 $w = max $widget->{min_w}, $w;
4259 $h = max $widget->{min_h}, $h;
4260
4261# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4262# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4263
4264 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4265 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4266
3707 $w = int $w + 0.5; 4267 $w = int $w + 0.5;
3708 $h = int $h + 0.5; 4268 $h = int $h + 0.5;
3709 4269
3710 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4270 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711 $widget->{old_w} = $widget->{w}; 4271 $widget->{old_w} = $widget->{w};
… …
3721 4281
3722 while ($self->{post_alloc_hook}) { 4282 while ($self->{post_alloc_hook}) {
3723 $_->() 4283 $_->()
3724 for values %{delete $self->{post_alloc_hook}}; 4284 for values %{delete $self->{post_alloc_hook}};
3725 } 4285 }
3726
3727 4286
3728 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4287 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3729 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4288 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3730 glClear GL_COLOR_BUFFER_BIT; 4289 glClear GL_COLOR_BUFFER_BIT;
3731 4290
… …
3734 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4293 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3735 glMatrixMode GL_MODELVIEW; 4294 glMatrixMode GL_MODELVIEW;
3736 glLoadIdentity; 4295 glLoadIdentity;
3737 4296
3738 { 4297 {
3739 package CFClient::UI::Base; 4298 package CFPlus::UI::Base;
3740 4299
3741 ($draw_x, $draw_y, $draw_w, $draw_h) = 4300 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3742 (0, 0, $self->{w}, $self->{h}); 4301 (0, 0, $self->{w}, $self->{h});
3743 }
3744 4302
3745 $self->_draw; 4303 $self->_draw;
4304 }
3746} 4305}
3747 4306
3748############################################################################# 4307#############################################################################
3749 4308
3750package CFClient::UI; 4309package CFPlus::UI;
3751 4310
3752$ROOT = new CFClient::UI::Root; 4311$ROOT = new CFPlus::UI::Root;
3753$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4312$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3754 4313
37551 43141
3756 4315

Diff Legend

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