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

Diff Legend

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