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

Diff Legend

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