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

Diff Legend

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