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

Diff Legend

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