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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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