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.358 by root, Fri Dec 8 14:59:54 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 do not like duplication
520 # and needlessly verbose code, either.
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;
597}
598 644
599############################################################################# 645 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
647}
600 648
649#############################################################################
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 local ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
905
906 $self->_render;
845 } 907 }
846
847 $self->_render;
848 }; 908 };
849} 909}
850 910
851sub _draw { 911sub _draw {
852 my ($self) = @_; 912 my ($self) = @_;
853
854 my ($w, $h) = @$self{qw(w h)};
855 913
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 1088
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015
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;
1237 }
1238}
1239 1444
1240############################################################################# 1445 glTranslate 0, - ($border - $self->{h});
1446 }
1241 1447
1448 $self->{close_button}->draw
1449 if $self->{close_button};
1450}
1451
1452#############################################################################
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 (
… …
1664 active_fg => [0, 0, 0], 1900 active_fg => [0, 0, 0],
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,
1905 ellipsise => 0,
1669 #text => ... 1906 #text => ...
1907 #hidden => "*",
1670 @_ 1908 @_
1671 ) 1909 )
1672} 1910}
1673 1911
1674sub _set_text { 1912sub _set_text {
… …
1681 $self->{last_activity} = $::NOW; 1919 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1920 $self->{text} = $text;
1683 1921
1684 $text =~ s/./*/g if $self->{hidden}; 1922 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1923 $self->{layout}->set_text ("$text ");
1924 delete $self->{size_req};
1686 1925
1687 $self->_emit (changed => $self->{text}); 1926 $self->emit (changed => $self->{text});
1927
1928 $self->realloc;
1688 $self->update; 1929 $self->update;
1689} 1930}
1690 1931
1691sub set_text { 1932sub set_text {
1692 my ($self, $text) = @_; 1933 my ($self, $text) = @_;
1693 1934
1694 $self->{cursor} = length $text; 1935 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 1936 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 1937}
1699 1938
1700sub get_text { 1939sub get_text {
1701 $_[0]{text} 1940 $_[0]{text}
1702} 1941}
… …
1707 my ($w, $h) = $self->SUPER::size_request; 1946 my ($w, $h) = $self->SUPER::size_request;
1708 1947
1709 ($w + 1, $h) # add 1 for cursor 1948 ($w + 1, $h) # add 1 for cursor
1710} 1949}
1711 1950
1712sub key_down { 1951sub invoke_key_down {
1713 my ($self, $ev) = @_; 1952 my ($self, $ev) = @_;
1714 1953
1715 my $mod = $ev->{mod}; 1954 my $mod = $ev->{mod};
1716 my $sym = $ev->{sym}; 1955 my $sym = $ev->{sym};
1717 my $uni = $ev->{unicode}; 1956 my $uni = $ev->{unicode};
… …
1720 1959
1721 if ($uni == 8) { 1960 if ($uni == 8) {
1722 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1961 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1723 } elsif ($uni == 127) { 1962 } elsif ($uni == 127) {
1724 substr $text, $self->{cursor}, 1, ""; 1963 substr $text, $self->{cursor}, 1, "";
1725 } elsif ($sym == CFClient::SDLK_LEFT) { 1964 } elsif ($sym == CFPlus::SDLK_LEFT) {
1726 --$self->{cursor} if $self->{cursor}; 1965 --$self->{cursor} if $self->{cursor};
1727 } elsif ($sym == CFClient::SDLK_RIGHT) { 1966 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1728 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1967 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1729 } elsif ($sym == CFClient::SDLK_HOME) { 1968 } elsif ($sym == CFPlus::SDLK_HOME) {
1730 $self->{cursor} = 0; 1969 $self->{cursor} = 0;
1731 } elsif ($sym == CFClient::SDLK_END) { 1970 } elsif ($sym == CFPlus::SDLK_END) {
1732 $self->{cursor} = length $text; 1971 $self->{cursor} = length $text;
1972 } elsif ($uni == 21) { # ctrl-u
1973 $text = "";
1974 $self->{cursor} = 0;
1733 } elsif ($uni == 27) { 1975 } elsif ($uni == 27) {
1734 $self->_emit ('escape'); 1976 $self->emit ('escape');
1735 } elsif ($uni) { 1977 } elsif ($uni >= 0x20) {
1736 substr $text, $self->{cursor}++, 0, chr $uni; 1978 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else { 1979 } else {
1738 return 0; 1980 return 0;
1739 } 1981 }
1740 1982
1741 $self->_set_text ($text); 1983 $self->_set_text ($text);
1742 1984
1743 $self->realloc; 1985 $self->realloc;
1986 $self->update;
1744 1987
1745 1 1988 1
1746} 1989}
1747 1990
1748sub focus_in { 1991sub invoke_focus_in {
1749 my ($self) = @_; 1992 my ($self) = @_;
1750 1993
1751 $self->{last_activity} = $::NOW; 1994 $self->{last_activity} = $::NOW;
1752 1995
1753 $self->SUPER::focus_in; 1996 $self->SUPER::invoke_focus_in
1754} 1997}
1755 1998
1756sub button_down { 1999sub invoke_button_down {
1757 my ($self, $ev, $x, $y) = @_; 2000 my ($self, $ev, $x, $y) = @_;
1758 2001
1759 $self->SUPER::button_down ($ev, $x, $y); 2002 $self->SUPER::invoke_button_down ($ev, $x, $y);
1760 2003
1761 my $idx = $self->{layout}->xy_to_index ($x, $y); 2004 my $idx = $self->{layout}->xy_to_index ($x, $y);
1762 2005
1763 # byte-index to char-index 2006 # byte-index to char-index
1764 my $text = $self->{text}; 2007 my $text = $self->{text};
1765 utf8::encode $text; 2008 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1766 $self->{cursor} = length substr $text, 0, $idx; 2009 $self->{cursor} = length $text;
1767 2010
1768 $self->_set_text ($self->{text}); 2011 $self->_set_text ($self->{text});
1769 $self->update; 2012 $self->update;
1770 2013
1771 1 2014 1
1772} 2015}
1773 2016
1774sub mouse_motion { 2017sub invoke_mouse_motion {
1775 my ($self, $ev, $x, $y) = @_; 2018 my ($self, $ev, $x, $y) = @_;
1776# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2019# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1777 2020
1778 0 2021 1
1779} 2022}
1780 2023
1781sub _draw { 2024sub _draw {
1782 my ($self) = @_; 2025 my ($self) = @_;
1783 2026
1784 local $self->{fg} = $self->{fg}; 2027 local $self->{fg} = $self->{fg};
1785 2028
1786 if ($FOCUS == $self) { 2029 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 2030 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 2031 $self->{fg} = $self->{active_fg};
1789 } else { 2032 } else {
1790 glColor @{$self->{bg}}; 2033 glColor_premultiply @{$self->{bg}};
1791 } 2034 }
1792 2035
1793 glEnable GL_BLEND; 2036 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2037 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS; 2038 glBegin GL_QUADS;
1796 glVertex 0 , 0; 2039 glVertex 0 , 0;
1797 glVertex 0 , $self->{h}; 2040 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 2041 glVertex $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0; 2042 glVertex $self->{w}, 0;
… …
1810 utf8::encode $text; 2053 utf8::encode $text;
1811 2054
1812 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2055 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1813 } 2056 }
1814 2057
1815 glColor @{$self->{fg}};
1816 glBegin GL_LINES; 2058 glBegin GL_LINES;
1817 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2059 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}; 2060 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1819 glEnd; 2061 glEnd;
1820 } 2062 }
1821} 2063}
1822 2064
2065#############################################################################
2066
1823package CFClient::UI::Entry; 2067package CFPlus::UI::Entry;
1824 2068
1825our @ISA = CFClient::UI::EntryBase::; 2069our @ISA = CFPlus::UI::EntryBase::;
1826 2070
1827use CFClient::OpenGL; 2071use CFPlus::OpenGL;
1828 2072
1829sub key_down { 2073sub invoke_key_down {
1830 my ($self, $ev) = @_; 2074 my ($self, $ev) = @_;
1831 2075
1832 my $sym = $ev->{sym}; 2076 my $sym = $ev->{sym};
1833 2077
1834 if ($sym == 13) { 2078 if ($sym == 13) {
1835 unshift @{$self->{history}}, 2079 unshift @{$self->{history}},
1836 my $txt = $self->get_text; 2080 my $txt = $self->get_text;
2081
1837 $self->{history_pointer} = -1; 2082 $self->{history_pointer} = -1;
1838 $self->{history_saveback} = ''; 2083 $self->{history_saveback} = '';
1839 $self->_emit (activate => $txt); 2084 $self->emit (activate => $txt);
1840 $self->update; 2085 $self->update;
1841 2086
1842 } elsif ($sym == CFClient::SDLK_UP) { 2087 } elsif ($sym == CFPlus::SDLK_UP) {
1843 if ($self->{history_pointer} < 0) { 2088 if ($self->{history_pointer} < 0) {
1844 $self->{history_saveback} = $self->get_text; 2089 $self->{history_saveback} = $self->get_text;
1845 } 2090 }
1846 if (@{$self->{history} || []} > 0) { 2091 if (@{$self->{history} || []} > 0) {
1847 $self->{history_pointer}++; 2092 $self->{history_pointer}++;
… …
1849 $self->{history_pointer} = @{$self->{history} || []} - 1; 2094 $self->{history_pointer} = @{$self->{history} || []} - 1;
1850 } 2095 }
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2096 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } 2097 }
1853 2098
1854 } elsif ($sym == CFClient::SDLK_DOWN) { 2099 } elsif ($sym == CFPlus::SDLK_DOWN) {
1855 $self->{history_pointer}--; 2100 $self->{history_pointer}--;
1856 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2101 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1857 2102
1858 if ($self->{history_pointer} >= 0) { 2103 if ($self->{history_pointer} >= 0) {
1859 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2104 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1860 } else { 2105 } else {
1861 $self->set_text ($self->{history_saveback}); 2106 $self->set_text ($self->{history_saveback});
1862 } 2107 }
1863 2108
1864 } else { 2109 } else {
1865 return $self->SUPER::key_down ($ev) 2110 return $self->SUPER::invoke_key_down ($ev)
1866 } 2111 }
1867 2112
1868 1 2113 1
1869} 2114}
1870 2115
1871############################################################################# 2116#############################################################################
1872 2117
2118package CFPlus::UI::TextEdit;
2119
2120our @ISA = CFPlus::UI::EntryBase::;
2121
2122use CFPlus::OpenGL;
2123
2124sub move_cursor_ver {
2125 my ($self, $dy) = @_;
2126
2127 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2128
2129 do {
2130 if (defined (my $index = $self->{layout}->line_x_to_index ($y + $dy, $x))) {
2131 $self->{cursor} = $index;
2132 delete $self->{cur_h};
2133 $self->update;
2134 return;
2135 }
2136 } while --$x >= 0;
2137}
2138
2139sub invoke_key_down {
2140 my ($self, $ev) = @_;
2141
2142 my $sym = $ev->{sym};
2143
2144 if ($sym == CFPlus::SDLK_UP) {
2145 $self->move_cursor_ver (-1);
2146 } elsif ($sym == CFPlus::SDLK_DOWN) {
2147 $self->move_cursor_ver (+1);
2148 } else {
2149 return $self->SUPER::invoke_key_down ($ev)
2150 }
2151
2152 1
2153}
2154
2155#############################################################################
2156
1873package CFClient::UI::Button; 2157package CFPlus::UI::Button;
1874 2158
1875our @ISA = CFClient::UI::Label::; 2159our @ISA = CFPlus::UI::Label::;
1876 2160
1877use CFClient::OpenGL; 2161use CFPlus::OpenGL;
1878 2162
1879my @tex = 2163my @tex =
1880 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2164 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1881 qw(b1_button_active.png); 2165 qw(b1_button_active.png);
1882 2166
1883sub new { 2167sub new {
1884 my $class = shift; 2168 my $class = shift;
1885 2169
… …
1894 can_events => 1, 2178 can_events => 1,
1895 @_ 2179 @_
1896 ) 2180 )
1897} 2181}
1898 2182
1899sub activate { }
1900
1901sub button_up { 2183sub invoke_button_up {
1902 my ($self, $ev, $x, $y) = @_; 2184 my ($self, $ev, $x, $y) = @_;
1903 2185
1904 $self->emit ("activate") 2186 $self->emit ("activate")
1905 if $x >= 0 && $x < $self->{w} 2187 if $x >= 0 && $x < $self->{w}
1906 && $y >= 0 && $y < $self->{h}; 2188 && $y >= 0 && $y < $self->{h};
… …
1909} 2191}
1910 2192
1911sub _draw { 2193sub _draw {
1912 my ($self) = @_; 2194 my ($self) = @_;
1913 2195
1914 local $self->{fg} = $self->{fg}; 2196 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919 2197
1920 glEnable GL_TEXTURE_2D; 2198 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2199 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 2200 glColor 0, 0, 0, 1;
1923 2201
… …
1928 $self->SUPER::_draw; 2206 $self->SUPER::_draw;
1929} 2207}
1930 2208
1931############################################################################# 2209#############################################################################
1932 2210
1933package CFClient::UI::CheckBox; 2211package CFPlus::UI::CheckBox;
1934 2212
1935our @ISA = CFClient::UI::DrawBG::; 2213our @ISA = CFPlus::UI::DrawBG::;
1936 2214
1937my @tex = 2215my @tex =
1938 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2216 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1939 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2217 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1940 2218
1941use CFClient::OpenGL; 2219use CFPlus::OpenGL;
1942 2220
1943sub new { 2221sub new {
1944 my $class = shift; 2222 my $class = shift;
1945 2223
1946 $class->SUPER::new ( 2224 $class->SUPER::new (
… …
1960 my ($self) = @_; 2238 my ($self) = @_;
1961 2239
1962 (6) x 2 2240 (6) x 2
1963} 2241}
1964 2242
2243sub toggle {
2244 my ($self) = @_;
2245
2246 $self->{state} = !$self->{state};
2247 $self->emit (changed => $self->{state});
2248 $self->update;
2249}
2250
1965sub button_down { 2251sub invoke_button_down {
1966 my ($self, $ev, $x, $y) = @_; 2252 my ($self, $ev, $x, $y) = @_;
1967 2253
1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2254 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2255 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970 $self->{state} = !$self->{state}; 2256 $self->toggle;
1971 $self->_emit (changed => $self->{state});
1972 } else { 2257 } else {
1973 return 0 2258 return 0
1974 } 2259 }
1975 2260
1976 1 2261 1
… …
1996 glDisable GL_TEXTURE_2D; 2281 glDisable GL_TEXTURE_2D;
1997} 2282}
1998 2283
1999############################################################################# 2284#############################################################################
2000 2285
2001package CFClient::UI::Image; 2286package CFPlus::UI::Image;
2002 2287
2003our @ISA = CFClient::UI::Base::; 2288our @ISA = CFPlus::UI::Base::;
2004 2289
2005use CFClient::OpenGL; 2290use CFPlus::OpenGL;
2006use Carp qw/confess/;
2007 2291
2008our %loaded_images; 2292our %texture_cache;
2009 2293
2010sub new { 2294sub new {
2011 my $class = shift; 2295 my $class = shift;
2012 2296
2013 my $self = $class->SUPER::new (can_events => 0, @_); 2297 my $self = $class->SUPER::new (
2298 can_events => 0,
2299 @_,
2300 );
2014 2301
2015 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2302 $self->{path} || $self->{tex}
2303 or Carp::croak "'path' or 'tex' attributes required";
2016 2304
2017 $loaded_images{$self->{image}} ||= 2305 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2018 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2306 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2019 2307
2020 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2308 Scalar::Util::weaken $texture_cache{$self->{path}};
2021 2309
2022 Scalar::Util::weaken $loaded_images{$self->{image}}; 2310 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2023
2024 $self->{aspect} = $tex->{w} / $tex->{h};
2025 2311
2026 $self 2312 $self
2027} 2313}
2028 2314
2315sub STORABLE_freeze {
2316 my ($self, $cloning) = @_;
2317
2318 $self->{path}
2319 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2320
2321 $self->{path}
2322}
2323
2324sub STORABLE_attach {
2325 my ($self, $cloning, $path) = @_;
2326
2327 $self->new (path => $path)
2328}
2329
2029sub size_request { 2330sub size_request {
2030 my ($self) = @_; 2331 my ($self) = @_;
2031 2332
2032 ($self->{tex}->{w}, $self->{tex}->{h}) 2333 ($self->{tex}{w}, $self->{tex}{h})
2033} 2334}
2034 2335
2035sub _draw { 2336sub _draw {
2036 my ($self) = @_; 2337 my ($self) = @_;
2037 2338
… …
2047 } 2348 }
2048 2349
2049 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
2050 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2051 2352
2052 $tex->draw_quad_alpha (0, 0, $w, $h); 2353 $tex->draw_quad (0, 0, $w, $h);
2053 2354
2054 glDisable GL_TEXTURE_2D; 2355 glDisable GL_TEXTURE_2D;
2055} 2356}
2056 2357
2057############################################################################# 2358#############################################################################
2058 2359
2360package CFPlus::UI::ImageButton;
2361
2362our @ISA = CFPlus::UI::Image::;
2363
2364use CFPlus::OpenGL;
2365
2366my %textures;
2367
2368sub new {
2369 my $class = shift;
2370
2371 my $self = $class->SUPER::new (
2372 padding_x => 4,
2373 padding_y => 4,
2374 fg => [1, 1, 1],
2375 active_fg => [0, 0, 1],
2376 can_hover => 1,
2377 align => 0,
2378 valign => 0,
2379 can_events => 1,
2380 @_
2381 );
2382}
2383
2384sub invoke_button_up {
2385 my ($self, $ev, $x, $y) = @_;
2386
2387 $self->emit ("activate")
2388 if $x >= 0 && $x < $self->{w}
2389 && $y >= 0 && $y < $self->{h};
2390
2391 1
2392}
2393
2394#############################################################################
2395
2059package CFClient::UI::VGauge; 2396package CFPlus::UI::VGauge;
2060 2397
2061our @ISA = CFClient::UI::Base::; 2398our @ISA = CFPlus::UI::Base::;
2062 2399
2063use List::Util qw(min max); 2400use List::Util qw(min max);
2064 2401
2065use CFClient::OpenGL; 2402use CFPlus::OpenGL;
2066 2403
2067my %tex = ( 2404my %tex = (
2068 food => [ 2405 food => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2406 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2407 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2071 ], 2408 ],
2072 grace => [ 2409 grace => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2410 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/ 2411 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2075 ], 2412 ],
2076 hp => [ 2413 hp => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2414 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2078 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2415 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2079 ], 2416 ],
2080 mana => [ 2417 mana => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 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/ 2419 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2083 ], 2420 ],
2084); 2421);
2085 2422
2086# eg. VGauge->new (gauge => 'food'), default gauge: food 2423# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2146 my $ycut1 = max 0, min 1, $ycut; 2483 my $ycut1 = max 0, min 1, $ycut;
2147 my $ycut2 = max 0, min 1, $ycut - 1; 2484 my $ycut2 = max 0, min 1, $ycut - 1;
2148 2485
2149 my $h1 = $self->{h} * (1 - $ycut1); 2486 my $h1 = $self->{h} * (1 - $ycut1);
2150 my $h2 = $self->{h} * (1 - $ycut2); 2487 my $h2 = $self->{h} * (1 - $ycut2);
2488 my $h3 = $self->{h};
2489
2490 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2151 2491
2152 glEnable GL_BLEND; 2492 glEnable GL_BLEND;
2153 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2493 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2494 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2154 glEnable GL_TEXTURE_2D; 2495 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2497
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2498 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2499 glBegin GL_QUADS;
… …
2173 2514
2174 if ($t3) { 2515 if ($t3) {
2175 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2516 glBindTexture GL_TEXTURE_2D, $t3->{name};
2176 glBegin GL_QUADS; 2517 glBegin GL_QUADS;
2177 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2518 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2178 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2519 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2179 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2520 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2180 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2521 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2181 glEnd; 2522 glEnd;
2182 } 2523 }
2183 2524
2184 glDisable GL_BLEND; 2525 glDisable GL_BLEND;
2185 glDisable GL_TEXTURE_2D; 2526 glDisable GL_TEXTURE_2D;
2186} 2527}
2187 2528
2188############################################################################# 2529#############################################################################
2189 2530
2190package CFClient::UI::Gauge; 2531package CFPlus::UI::Gauge;
2191 2532
2192our @ISA = CFClient::UI::VBox::; 2533our @ISA = CFPlus::UI::VBox::;
2193 2534
2194sub new { 2535sub new {
2195 my ($class, %arg) = @_; 2536 my ($class, %arg) = @_;
2196 2537
2197 my $self = $class->SUPER::new ( 2538 my $self = $class->SUPER::new (
… …
2199 can_hover => 1, 2540 can_hover => 1,
2200 can_events => 1, 2541 can_events => 1,
2201 %arg, 2542 %arg,
2202 ); 2543 );
2203 2544
2204 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2545 $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); 2546 $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"); 2547 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2207 2548
2208 $self 2549 $self
2209} 2550}
2210 2551
2211sub set_fontsize { 2552sub set_fontsize {
… …
2232 $self->{value}->set_text ($val); 2573 $self->{value}->set_text ($val);
2233} 2574}
2234 2575
2235############################################################################# 2576#############################################################################
2236 2577
2237package CFClient::UI::Slider; 2578package CFPlus::UI::Slider;
2238 2579
2239use strict; 2580use strict;
2240 2581
2241use CFClient::OpenGL; 2582use CFPlus::OpenGL;
2242 2583
2243our @ISA = CFClient::UI::DrawBG::; 2584our @ISA = CFPlus::UI::DrawBG::;
2244 2585
2245my @tex = 2586my @tex =
2246 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2587 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2247 qw(s1_slider.png s1_slider_bg.png); 2588 qw(s1_slider.png s1_slider_bg.png);
2248 2589
2249sub new { 2590sub new {
2250 my $class = shift; 2591 my $class = shift;
2251 2592
… …
2272 $self->update; 2613 $self->update;
2273 2614
2274 $self 2615 $self
2275} 2616}
2276 2617
2277sub changed { }
2278
2279sub set_range { 2618sub set_range {
2280 my ($self, $range) = @_; 2619 my ($self, $range) = @_;
2281 2620
2282 ($range, $self->{range}) = ($self->{range}, $range); 2621 ($range, $self->{range}) = ($self->{range}, $range);
2283 2622
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}"; 2623 if ("@$range" ne "@{$self->{range}}") {
2624 $self->update;
2625 $self->set_value ($self->{range}[0]);
2626 }
2286} 2627}
2287 2628
2288sub set_value { 2629sub set_value {
2289 my ($self, $value) = @_; 2630 my ($self, $value) = @_;
2290 2631
… …
2301 if $unit; 2642 if $unit;
2302 2643
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2644 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304 2645
2305 if ($value != $old_value) { 2646 if ($value != $old_value) {
2306 $self->_emit (changed => $value); 2647 $self->emit (changed => $value);
2307 $self->update; 2648 $self->update;
2308 } 2649 }
2309} 2650}
2310 2651
2311sub size_request { 2652sub size_request {
2312 my ($self) = @_; 2653 my ($self) = @_;
2313 2654
2314 ($self->{req_w}, $self->{req_h}) 2655 ($self->{req_w}, $self->{req_h})
2315} 2656}
2316 2657
2317sub button_down { 2658sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_; 2659 my ($self, $ev, $x, $y) = @_;
2319 2660
2320 $self->SUPER::button_down ($ev, $x, $y); 2661 $self->SUPER::invoke_button_down ($ev, $x, $y);
2321 2662
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2663 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323 2664
2324 $self->mouse_motion ($ev, $x, $y) 2665 $self->invoke_mouse_motion ($ev, $x, $y)
2325} 2666}
2326 2667
2327sub mouse_motion { 2668sub invoke_mouse_motion {
2328 my ($self, $ev, $x, $y) = @_; 2669 my ($self, $ev, $x, $y) = @_;
2329 2670
2330 if ($GRAB == $self) { 2671 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2672 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332 2673
… …
2338 } else { 2679 } else {
2339 return 0; 2680 return 0;
2340 } 2681 }
2341 2682
2342 1 2683 1
2684}
2685
2686sub invoke_mouse_wheel {
2687 my ($self, $ev) = @_;
2688
2689 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2690
2691 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2692
2693 ! ! $delta
2343} 2694}
2344 2695
2345sub update { 2696sub update {
2346 my ($self) = @_; 2697 my ($self) = @_;
2347 2698
… …
2396 glDisable GL_TEXTURE_2D; 2747 glDisable GL_TEXTURE_2D;
2397} 2748}
2398 2749
2399############################################################################# 2750#############################################################################
2400 2751
2401package CFClient::UI::ValSlider; 2752package CFPlus::UI::ValSlider;
2402 2753
2403our @ISA = CFClient::UI::HBox::; 2754our @ISA = CFPlus::UI::HBox::;
2404 2755
2405sub new { 2756sub new {
2406 my ($class, %arg) = @_; 2757 my ($class, %arg) = @_;
2407 2758
2408 my $range = delete $arg{range}; 2759 my $range = delete $arg{range};
2409 2760
2410 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2411 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2762 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2412 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2763 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2413 to_value => sub { shift }, 2764 to_value => sub { shift },
2414 from_value => sub { shift }, 2765 from_value => sub { shift },
2415 %arg, 2766 %arg,
2416 ); 2767 );
2417 2768
… …
2437sub set_range { shift->{slider}->set_range (@_) } 2788sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) } 2789sub set_value { shift->{slider}->set_value (@_) }
2439 2790
2440############################################################################# 2791#############################################################################
2441 2792
2442package CFClient::UI::TextView; 2793package CFPlus::UI::TextScroller;
2443 2794
2444our @ISA = CFClient::UI::HBox::; 2795our @ISA = CFPlus::UI::HBox::;
2445 2796
2446use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2447 2798
2448sub new { 2799sub new {
2449 my $class = shift; 2800 my $class = shift;
2450 2801
2451 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2452 fontsize => 1, 2803 fontsize => 1,
2453 can_events => 0, 2804 can_events => 1,
2805 indent => 0,
2454 #font => default_font 2806 #font => default_font
2455 @_, 2807 @_,
2456 2808
2457 layout => (new CFClient::Layout 1), 2809 layout => (new CFPlus::Layout),
2458 par => [], 2810 par => [],
2459 height => 0, 2811 height => 0,
2460 children => [ 2812 children => [
2461 (new CFClient::UI::Empty expand => 1), 2813 (new CFPlus::UI::Empty expand => 1),
2462 (new CFClient::UI::Slider vertical => 1), 2814 (new CFPlus::UI::Slider vertical => 1),
2463 ], 2815 ],
2464 ); 2816 );
2465 2817
2466 $self->{children}[1]->connect (changed => sub { $self->update }); 2818 $self->{children}[1]->connect (changed => sub { $self->update });
2467 2819
… …
2473 2825
2474 $self->{fontsize} = $fontsize; 2826 $self->{fontsize} = $fontsize;
2475 $self->reflow; 2827 $self->reflow;
2476} 2828}
2477 2829
2830sub size_request {
2831 my ($self) = @_;
2832
2833 my ($empty, $slider) = @{ $self->{children} };
2834
2835 local $self->{children} = [$empty, $slider];
2836 $self->SUPER::size_request
2837}
2838
2478sub size_allocate { 2839sub invoke_size_allocate {
2479 my ($self, $w, $h) = @_; 2840 my ($self, $w, $h) = @_;
2480 2841
2481 $self->SUPER::size_allocate ($w, $h); 2842 my ($empty, $slider, @other) = @{ $self->{children} };
2843 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2482 2844
2483 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2845 $self->{layout}->set_font ($self->{font}) if $self->{font};
2484 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2846 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485 $self->{layout}->set_width ($self->{children}[0]{w}); 2847 $self->{layout}->set_width ($empty->{w});
2848 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2486 2849
2487 $self->reflow; 2850 $self->reflow;
2488}
2489 2851
2490sub text_size { 2852 local $self->{children} = [$empty, $slider];
2853 $self->SUPER::invoke_size_allocate ($w, $h)
2854}
2855
2856sub invoke_mouse_wheel {
2491 my ($self, $text, $indent) = @_; 2857 my ($self, $ev) = @_;
2858
2859 return 0 unless $ev->{dy}; # only vertical movements
2860
2861 $self->{children}[1]->emit (mouse_wheel => $ev);
2862
2863 1
2864}
2865
2866sub get_layout {
2867 my ($self, $para) = @_;
2492 2868
2493 my $layout = $self->{layout}; 2869 my $layout = $self->{layout};
2494 2870
2871 $layout->set_font ($self->{font}) if $self->{font};
2872 $layout->set_foreground (@{$para->{fg}});
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2873 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $layout->set_width ($self->{children}[0]{w} - $indent); 2874 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2875 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2497 $layout->set_markup ($text); 2876 $layout->set_markup ($para->{markup});
2877
2878 $layout->set_shapes (
2879 map
2880 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2881 @{$para->{widget}}
2498 2882 );
2883
2499 $layout->size 2884 $layout
2500} 2885}
2501 2886
2502sub reflow { 2887sub reflow {
2503 my ($self) = @_; 2888 my ($self) = @_;
2504 2889
… …
2511 2896
2512 # todo: base offset on lines or so, not on pixels 2897 # todo: base offset on lines or so, not on pixels
2513 $self->{children}[1]->set_value ($offset); 2898 $self->{children}[1]->set_value ($offset);
2514} 2899}
2515 2900
2901sub current_paragraph {
2902 my ($self) = @_;
2903
2904 $self->{top_paragraph} - 1
2905}
2906
2907sub scroll_to {
2908 my ($self, $para) = @_;
2909
2910 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2911
2912 $self->{scroll_to} = $para;
2913 $self->update;
2914}
2915
2516sub clear { 2916sub clear {
2517 my ($self) = @_; 2917 my ($self) = @_;
2918
2919 my (undef, undef, @other) = @{ $self->{children} };
2920 $self->remove ($_) for @other;
2518 2921
2519 $self->{par} = []; 2922 $self->{par} = [];
2520 $self->{height} = 0; 2923 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2924 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522} 2925}
2523 2926
2524sub add_paragraph { 2927sub add_paragraph {
2525 my ($self, $color, $text, $indent) = @_; 2928 my $self = shift;
2526 2929
2527 for my $line (split /\n/, $text) { 2930 for my $para (@_) {
2528 my ($w, $h) = $self->text_size ($line); 2931 $para = {
2932 fg => [1, 1, 1, 1],
2933 indent => 0,
2934 markup => "",
2935 widget => [],
2936 ref $para ? %$para : (markup => $para),
2937 w => 1e10,
2938 wrapped => 1,
2939 };
2940
2941 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2942 push @{$self->{par}}, $para;
2943 }
2944
2945 $self->{need_reflow}++;
2946 $self->update;
2947}
2948
2949sub scroll_to_bottom {
2950 my ($self) = @_;
2951
2952 $self->{scroll_to} = $#{$self->{par}};
2953 $self->update;
2954}
2955
2956sub force_uptodate {
2957 my ($self) = @_;
2958
2959 if (delete $self->{need_reflow}) {
2960 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2961
2962 my $height = 0;
2963
2964 for my $para (@{$self->{par}}) {
2965 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2966 my $layout = $self->get_layout ($para);
2967 my ($w, $h) = $layout->size;
2968
2969 $para->{w} = $w + $para->{indent};
2970 $para->{h} = $h;
2971 $para->{wrapped} = $layout->has_wrapped;
2972 }
2973
2974 $para->{y} = $height;
2975 $height += $para->{h};
2976 }
2977
2529 $self->{height} += $h; 2978 $self->{height} = $height;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2979 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2531 }
2532 2980
2533 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2981 delete $self->{texture};
2982 }
2983
2984 if (my $paridx = delete $self->{scroll_to}) {
2985 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2986 }
2534} 2987}
2535 2988
2536sub update { 2989sub update {
2537 my ($self) = @_; 2990 my ($self) = @_;
2538 2991
… …
2540 2993
2541 return unless $self->{h} > 0; 2994 return unless $self->{h} > 0;
2542 2995
2543 delete $self->{texture}; 2996 delete $self->{texture};
2544 2997
2545 $ROOT->on_post_alloc ($self, sub { 2998 $ROOT->on_post_alloc ($self => sub {
2999 $self->force_uptodate;
3000
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3001 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547 3002
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 { 3003 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 3004 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 3005 glClear GL_COLOR_BUFFER_BIT;
2577 3006
3007 package CFPlus::UI::Base;
3008 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3009 (0, 0, $self->{w}, $self->{h});
3010
3011 my $top = int $self->{children}[1]{range}[0];
3012
3013 my $paridx = 0;
3014 my $top_paragraph;
2578 my $top = int $self->{children}[1]{range}[0]; 3015 my $top = int $self->{children}[1]{range}[0];
2579 3016
2580 my $y0 = $top; 3017 my $y0 = $top;
2581 my $y1 = $top + $H; 3018 my $y1 = $top + $H;
2582 3019
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}}) { 3020 for my $para (@{$self->{par}}) {
2594 my $h = $par->[1]; 3021 my $h = $para->{h};
3022 my $y = $para->{y};
2595 3023
2596 if ($y0 < $y + $h && $y < $y1) { 3024 if ($y0 < $y + $h && $y < $y1) {
2597 $layout->set_foreground (@{ $par->[2] }); 3025 my $layout = $self->get_layout ($para);
2598 $layout->set_width ($W - $par->[3]);
2599 $layout->set_markup ($par->[4]);
2600 3026
2601 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3027 $layout->render ($para->{indent}, $y - $y0);
2602 3028
2603 glRasterPos $par->[3], $y - $y0; 3029 if (my @w = @{ $para->{widget} }) {
2604 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3030 my @s = $layout->get_shapes;
3031
3032 for (@w) {
3033 my ($dx, $dy) = splice @s, 0, 2, ();
3034
3035 $_->{x} = $dx + $para->{indent};
3036 $_->{y} = $dy + $y - $y0;
3037
3038 $_->draw;
3039 }
3040 }
2605 } 3041 }
2606 3042
2607 $y += $h; 3043 $paridx++;
3044 $top_paragraph ||= $paridx if $y >= $top;
2608 } 3045 }
2609 3046
2610 glDisable GL_BLEND; 3047 $self->{top_paragraph} = $top_paragraph;
2611 }; 3048 };
2612 }); 3049 });
2613} 3050}
2614 3051
3052sub reconfigure {
3053 my ($self) = @_;
3054
3055 $self->SUPER::reconfigure;
3056
3057 $_->{w} = 1e10 for @{ $self->{par} };
3058 $self->reflow;
3059}
3060
2615sub _draw { 3061sub _draw {
2616 my ($self) = @_; 3062 my ($self) = @_;
2617 3063
2618 glEnable GL_TEXTURE_2D; 3064 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 3066 glColor 0, 0, 0, 1;
2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3067 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622 glDisable GL_TEXTURE_2D; 3068 glDisable GL_TEXTURE_2D;
2623 3069
2624 $self->{children}[1]->draw; 3070 $self->{children}[1]->draw;
2625
2626} 3071}
2627 3072
2628############################################################################# 3073#############################################################################
2629 3074
2630package CFClient::UI::Animator; 3075package CFPlus::UI::Animator;
2631 3076
2632use CFClient::OpenGL; 3077use CFPlus::OpenGL;
2633 3078
2634our @ISA = CFClient::UI::Bin::; 3079our @ISA = CFPlus::UI::Bin::;
2635 3080
2636sub moveto { 3081sub moveto {
2637 my ($self, $x, $y) = @_; 3082 my ($self, $x, $y) = @_;
2638 3083
2639 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3084 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2667 glPopMatrix; 3112 glPopMatrix;
2668} 3113}
2669 3114
2670############################################################################# 3115#############################################################################
2671 3116
2672package CFClient::UI::Flopper; 3117package CFPlus::UI::Flopper;
2673 3118
2674our @ISA = CFClient::UI::Button::; 3119our @ISA = CFPlus::UI::Button::;
2675 3120
2676sub new { 3121sub new {
2677 my $class = shift; 3122 my $class = shift;
2678 3123
2679 my $self = $class->SUPER::new ( 3124 my $self = $class->SUPER::new (
… …
2691 $self->{other}->toggle_visibility; 3136 $self->{other}->toggle_visibility;
2692} 3137}
2693 3138
2694############################################################################# 3139#############################################################################
2695 3140
2696package CFClient::UI::Tooltip; 3141package CFPlus::UI::Tooltip;
2697 3142
2698our @ISA = CFClient::UI::Bin::; 3143our @ISA = CFPlus::UI::Bin::;
2699 3144
2700use CFClient::OpenGL; 3145use CFPlus::OpenGL;
2701 3146
2702sub new { 3147sub new {
2703 my $class = shift; 3148 my $class = shift;
2704 3149
2705 $class->SUPER::new ( 3150 $class->SUPER::new (
… …
2708 ) 3153 )
2709} 3154}
2710 3155
2711sub set_tooltip_from { 3156sub set_tooltip_from {
2712 my ($self, $widget) = @_; 3157 my ($self, $widget) = @_;
3158
3159 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3160 if $widget->{tooltip} =~ /^#(.*)$/;
2713 3161
2714 my $tooltip = $widget->{tooltip}; 3162 my $tooltip = $widget->{tooltip};
2715 3163
2716 if ($ENV{CFPLUS_DEBUG} & 2) { 3164 if ($ENV{CFPLUS_DEBUG} & 2) {
2717 $tooltip .= "\n\n" . (ref $widget) . "\n" 3165 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3166 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n" 3167 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}"; 3168 . "visible $widget->{visible}";
2721 } 3169 }
2722 3170
3171 $tooltip =~ s/^\n+//;
3172 $tooltip =~ s/\n+$//;
3173
2723 $self->add (new CFClient::UI::Label 3174 $self->add (new CFPlus::UI::Label
2724 markup => $tooltip, 3175 markup => $tooltip,
2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3176 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726 fontsize => 0.8, 3177 fontsize => 0.8,
2727 fg => [0, 0, 0, 1], 3178 style => 1, # FLAG_INVERSE
2728 ellipsise => 0, 3179 ellipsise => 0,
2729 font => ($widget->{tooltip_font} || $::FONT_PROP), 3180 font => ($widget->{tooltip_font} || $::FONT_PROP),
2730 ); 3181 );
2731} 3182}
2732 3183
… …
2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3187 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737 3188
2738 ($w + 4, $h + 4) 3189 ($w + 4, $h + 4)
2739} 3190}
2740 3191
2741sub size_allocate { 3192sub invoke_size_allocate {
2742 my ($self, $w, $h) = @_; 3193 my ($self, $w, $h) = @_;
2743 3194
2744 $self->SUPER::size_allocate ($w - 4, $h - 4); 3195 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745} 3196}
2746 3197
2747sub visibility_change { 3198sub invoke_visibility_change {
2748 my ($self, $visible) = @_; 3199 my ($self, $visible) = @_;
2749 3200
2750 return unless $visible; 3201 return unless $visible;
2751 3202
2752 $self->{root}->on_post_alloc ("move_$self" => sub { 3203 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner} 3204 my $widget = $self->{owner}
2754 or return; 3205 or return;
2755 3206
3207 if ($widget->{visible}) {
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3208 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757 3209
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3210 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH; 3211 if $x + $self->{w} > $self->{root}{w};
2760 3212
2761 $self->move_abs ($x, $y); 3213 $self->move_abs ($x, $y);
3214 } else {
3215 $self->hide;
3216 }
2762 }); 3217 });
2763} 3218}
2764 3219
2765sub _draw { 3220sub _draw {
2766 my ($self) = @_; 3221 my ($self) = @_;
… …
2790 $self->SUPER::_draw; 3245 $self->SUPER::_draw;
2791} 3246}
2792 3247
2793############################################################################# 3248#############################################################################
2794 3249
2795package CFClient::UI::Face; 3250package CFPlus::UI::Face;
2796 3251
2797our @ISA = CFClient::UI::Base::; 3252our @ISA = CFPlus::UI::DrawBG::;
2798 3253
2799use CFClient::OpenGL; 3254use CFPlus::OpenGL;
2800 3255
2801sub new { 3256sub new {
2802 my $class = shift; 3257 my $class = shift;
2803 3258
2804 my $self = $class->SUPER::new ( 3259 my $self = $class->SUPER::new (
… …
2839sub _draw { 3294sub _draw {
2840 my ($self) = @_; 3295 my ($self) = @_;
2841 3296
2842 return unless $::CONN; 3297 return unless $::CONN;
2843 3298
3299 $self->SUPER::_draw;
3300
2844 my $face; 3301 my $face;
2845 3302
2846 if ($self->{frame}) { 3303 if ($self->{frame}) {
2847 my $anim = $::CONN->{anim}[$self->{anim}]; 3304 my $anim = $::CONN->{anim}[$self->{anim}];
2848 3305
… …
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854 3311
2855 if ($tex) { 3312 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 3313 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 3315 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3316 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 3317 glDisable GL_TEXTURE_2D;
2861 } 3318 }
2862} 3319}
2863 3320
2864sub DESTROY { 3321sub destroy {
2865 my ($self) = @_; 3322 my ($self) = @_;
2866 3323
2867 $self->{timer}->cancel 3324 $self->{timer}->cancel
2868 if $self->{timer}; 3325 if $self->{timer};
2869 3326
2870 $self->SUPER::DESTROY; 3327 $self->SUPER::destroy;
2871} 3328}
2872 3329
2873############################################################################# 3330#############################################################################
2874 3331
2875package CFClient::UI::Buttonbar; 3332package CFPlus::UI::Buttonbar;
2876 3333
2877our @ISA = CFClient::UI::HBox::; 3334our @ISA = CFPlus::UI::HBox::;
2878 3335
2879# TODO: should actualyl wrap buttons and other goodies. 3336# TODO: should actually wrap buttons and other goodies.
2880 3337
2881############################################################################# 3338#############################################################################
2882 3339
2883package CFClient::UI::Menu; 3340package CFPlus::UI::Menu;
2884 3341
2885our @ISA = CFClient::UI::FancyFrame::; 3342our @ISA = CFPlus::UI::Toplevel::;
2886 3343
2887use CFClient::OpenGL; 3344use CFPlus::OpenGL;
2888 3345
2889sub new { 3346sub new {
2890 my $class = shift; 3347 my $class = shift;
2891 3348
2892 my $self = $class->SUPER::new ( 3349 my $self = $class->SUPER::new (
2893 items => [], 3350 items => [],
2894 z => 100, 3351 z => 100,
2895 @_, 3352 @_,
2896 ); 3353 );
2897 3354
2898 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3355 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2899 3356
2900 for my $item (@{ $self->{items} }) { 3357 for my $item (@{ $self->{items} }) {
2901 my ($widget, $cb) = @$item; 3358 my ($widget, $cb, $tooltip) = @$item;
2902 3359
2903 # handle various types of items, only text for now 3360 # handle various types of items, only text for now
2904 if (!ref $widget) { 3361 if (!ref $widget) {
3362 if ($widget =~ /\t/) {
3363 my ($left, $right) = split /\t/, $widget, 2;
3364
2905 $widget = new CFClient::UI::Label 3365 $widget = new CFPlus::UI::HBox
2906 can_hover => 1, 3366 can_hover => 1,
2907 can_events => 1, 3367 can_events => 1,
3368 tooltip => $tooltip,
3369 children => [
3370 (new CFPlus::UI::Label markup => $left, expand => 1),
3371 (new CFPlus::UI::Label markup => $right, align => +1),
3372 ],
3373 ;
3374
3375 } else {
3376 $widget = new CFPlus::UI::Label
3377 can_hover => 1,
3378 can_events => 1,
2908 text => $widget; 3379 markup => $widget,
3380 tooltip => $tooltip;
3381 }
2909 } 3382 }
2910 3383
2911 $self->{item}{$widget} = $item; 3384 $self->{item}{$widget} = $item;
2912 3385
2913 $self->{vbox}->add ($widget); 3386 $self->{vbox}->add ($widget);
… …
2918 3391
2919# popup given the event (must be a mouse button down event currently) 3392# popup given the event (must be a mouse button down event currently)
2920sub popup { 3393sub popup {
2921 my ($self, $ev) = @_; 3394 my ($self, $ev) = @_;
2922 3395
2923 $self->_emit ("popdown"); 3396 $self->emit ("popdown");
2924 3397
2925 # maybe save $GRAB? must be careful about events... 3398 # maybe save $GRAB? must be careful about events...
2926 $GRAB = $self; 3399 $GRAB = $self;
2927 $self->{button} = $ev->{button}; 3400 $self->{button} = $ev->{button};
2928 3401
2929 $self->show; 3402 $self->show;
2930 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3403 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2931} 3404}
2932 3405
2933sub mouse_motion { 3406sub invoke_mouse_motion {
2934 my ($self, $ev, $x, $y) = @_; 3407 my ($self, $ev, $x, $y) = @_;
2935 3408
2936 # TODO: should use vbox->find_widget or so 3409 # TODO: should use vbox->find_widget or so
2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3410 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938 $self->{hover} = $self->{item}{$HOVER}; 3411 $self->{hover} = $self->{item}{$HOVER};
2939 3412
2940 0 3413 0
2941} 3414}
2942 3415
2943sub button_up { 3416sub invoke_button_up {
2944 my ($self, $ev, $x, $y) = @_; 3417 my ($self, $ev, $x, $y) = @_;
2945 3418
2946 if ($ev->{button} == $self->{button}) { 3419 if ($ev->{button} == $self->{button}) {
2947 undef $GRAB; 3420 undef $GRAB;
2948 $self->hide; 3421 $self->hide;
2949 3422
2950 $self->_emit ("popdown"); 3423 $self->emit ("popdown");
2951 $self->{hover}[1]->() if $self->{hover}; 3424 $self->{hover}[1]->() if $self->{hover};
2952 } else { 3425 } else {
2953 return 0 3426 return 0
2954 } 3427 }
2955 3428
2956 1 3429 1
2957} 3430}
2958 3431
2959############################################################################# 3432#############################################################################
2960 3433
2961package CFClient::UI::Multiplexer; 3434package CFPlus::UI::Multiplexer;
2962 3435
2963our @ISA = CFClient::UI::Container::; 3436our @ISA = CFPlus::UI::Container::;
2964 3437
2965sub new { 3438sub new {
2966 my $class = shift; 3439 my $class = shift;
2967 3440
2968 my $self = $class->SUPER::new ( 3441 my $self = $class->SUPER::new (
… …
2982 3455
2983 $self->{current} = $self->{children}[0] 3456 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} }; 3457 if @{ $self->{children} };
2985} 3458}
2986 3459
3460sub get_current_page {
3461 my ($self) = @_;
3462
3463 $self->{current}
3464}
3465
2987sub set_current_page { 3466sub set_current_page {
2988 my ($self, $page_or_widget) = @_; 3467 my ($self, $page_or_widget) = @_;
2989 3468
2990 my $widget = ref $page_or_widget 3469 my $widget = ref $page_or_widget
2991 ? $page_or_widget 3470 ? $page_or_widget
2992 : $self->{children}[$page_or_widget]; 3471 : $self->{children}[$page_or_widget];
2993 3472
2994 $self->{current} = $widget; 3473 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3474 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996 3475
2997 $self->_emit (page_changed => $self->{current}); 3476 $self->emit (page_changed => $self->{current});
2998 3477
2999 $self->realloc; 3478 $self->realloc;
3000} 3479}
3001 3480
3002sub visible_children { 3481sub visible_children {
… …
3007 my ($self) = @_; 3486 my ($self) = @_;
3008 3487
3009 $self->{current}->size_request 3488 $self->{current}->size_request
3010} 3489}
3011 3490
3012sub size_allocate { 3491sub invoke_size_allocate {
3013 my ($self, $w, $h) = @_; 3492 my ($self, $w, $h) = @_;
3014 3493
3015 $self->{current}->configure (0, 0, $w, $h); 3494 $self->{current}->configure (0, 0, $w, $h);
3495
3496 1
3016} 3497}
3017 3498
3018sub _draw { 3499sub _draw {
3019 my ($self) = @_; 3500 my ($self) = @_;
3020 3501
3021 $self->{current}->draw; 3502 $self->{current}->draw;
3022} 3503}
3023 3504
3024############################################################################# 3505#############################################################################
3025 3506
3026package CFClient::UI::Notebook; 3507package CFPlus::UI::Notebook;
3027 3508
3028our @ISA = CFClient::UI::VBox::; 3509our @ISA = CFPlus::UI::VBox::;
3029 3510
3030sub new { 3511sub new {
3031 my $class = shift; 3512 my $class = shift;
3032 3513
3033 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar), 3515 buttonbar => (new CFPlus::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3516 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3036 # filter => # will be put between multiplexer and $self 3517 # filter => # will be put between multiplexer and $self
3037 @_, 3518 @_,
3038 ); 3519 );
3039 3520
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3521 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3046sub add { 3527sub add {
3047 my ($self, $title, $widget, $tooltip) = @_; 3528 my ($self, $title, $widget, $tooltip) = @_;
3048 3529
3049 Scalar::Util::weaken $self; 3530 Scalar::Util::weaken $self;
3050 3531
3051 $self->{buttonbar}->add (new CFClient::UI::Button 3532 $self->{buttonbar}->add (new CFPlus::UI::Button
3052 markup => $title, 3533 markup => $title,
3053 tooltip => $tooltip, 3534 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) }, 3535 on_activate => sub { $self->set_current_page ($widget) },
3055 ); 3536 );
3056 3537
3057 $self->{multiplexer}->add ($widget); 3538 $self->{multiplexer}->add ($widget);
3058} 3539}
3059 3540
3541sub get_current_page {
3542 my ($self) = @_;
3543
3544 $self->{multiplexer}->get_current_page
3545}
3546
3060sub set_current_page { 3547sub set_current_page {
3061 my ($self, $page) = @_; 3548 my ($self, $page) = @_;
3062 3549
3063 $self->{multiplexer}->set_current_page ($page); 3550 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current}); 3551 $self->emit (page_changed => $self->{multiplexer}{current});
3065} 3552}
3066 3553
3067############################################################################# 3554#############################################################################
3068 3555
3069package CFClient::UI::Statusbox; 3556package CFPlus::UI::Selector;
3070 3557
3558use utf8;
3559
3071our @ISA = CFClient::UI::VBox::; 3560our @ISA = CFPlus::UI::Button::;
3072 3561
3073sub new { 3562sub new {
3074 my $class = shift; 3563 my $class = shift;
3075 3564
3076 $class->SUPER::new ( 3565 my $self = $class->SUPER::new (
3566 options => [], # [value, title, longdesc], ...
3567 value => undef,
3568 @_,
3569 );
3570
3571 $self->_set_value ($self->{value});
3572
3573 $self
3574}
3575
3576sub invoke_button_down {
3577 my ($self, $ev) = @_;
3578
3579 my @menu_items;
3580
3581 for (@{ $self->{options} }) {
3582 my ($value, $title, $tooltip) = @$_;
3583
3584 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3585 }
3586
3587 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3588}
3589
3590sub _set_value {
3591 my ($self, $value) = @_;
3592
3593 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3594 or return;
3595
3596 $self->{value} = $item->[0];
3597 $self->set_markup ("$item->[1] ⇓");
3598 $self->set_tooltip ($item->[2]);
3599}
3600
3601sub set_value {
3602 my ($self, $value) = @_;
3603
3604 return unless $self->{value} ne $value;
3605
3606 $self->_set_value ($value);
3607 $self->emit (changed => $value);
3608}
3609
3610#############################################################################
3611
3612package CFPlus::UI::Statusbox;
3613
3614our @ISA = CFPlus::UI::VBox::;
3615
3616sub new {
3617 my $class = shift;
3618
3619 my $self = $class->SUPER::new (
3077 fontsize => 0.8, 3620 fontsize => 0.8,
3078 @_, 3621 @_,
3079 ) 3622 );
3623
3624 Scalar::Util::weaken (my $this = $self);
3625
3626 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3627
3628 $self
3080} 3629}
3081 3630
3082sub reorder { 3631sub reorder {
3083 my ($self) = @_; 3632 my ($self) = @_;
3084 my $NOW = time; 3633 my $NOW = Time::HiRes::time;
3634
3635 # freeze display when hovering over any label
3636 return if $CFPlus::UI::TOOLTIP->{owner}
3637 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3638 values %{ $self->{item} };
3085 3639
3086 while (my ($k, $v) = each %{ $self->{item} }) { 3640 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3641 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 3642 }
3089 3643
… …
3092 my @items = sort { 3646 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 3647 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 3648 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 3649 } values %{ $self->{item} };
3096 3650
3651 $self->{timer}->interval (1);
3652
3097 my $count = 10 + 1; 3653 my $count = 10 + 1;
3098 for my $item (@items) { 3654 for my $item (@items) {
3099 last unless --$count; 3655 last unless --$count;
3100 3656
3101 push @widgets, $item->{label} ||= do { 3657 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 3658 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 3659 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 3660 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 3661 : $item->{text};
3106 3662
3107 for ($short) { 3663 for ($short) {
3108 s/^\s+//; 3664 s/^\s+//;
3109 s/\s+/ /g; 3665 s/\s+/ /g;
3110 } 3666 }
3111 3667
3112 new CFClient::UI::Label 3668 new CFPlus::UI::Label
3113 markup => $short, 3669 markup => $short,
3114 tooltip => $item->{tooltip}, 3670 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 3671 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 3672 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 3673 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 3674 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 3675 fg => [@{ $item->{fg} }],
3120 can_events => 1, 3676 can_events => 1,
3121 can_hover => 1 3677 can_hover => 1
3122 }; 3678 };
3679
3680 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3681 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3682 $label->update;
3683 $label->set_max_size (undef, $label->{req_h} * $diff)
3684 if $diff < 1;
3685 $self->{timer}->interval (1/30);
3686 } else {
3687 $label->{fg}[3] = $item->{fg}[3] || 1;
3688 }
3689
3690 push @widgets, $label;
3123 } 3691 }
3124 3692
3125 $self->clear; 3693 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 3694 $self->SUPER::add (reverse @widgets);
3127} 3695}
… …
3132 $text =~ s/^\s+//; 3700 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 3701 $text =~ s/\s+$//;
3134 3702
3135 return unless $text; 3703 return unless $text;
3136 3704
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 3705 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 3706
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3707 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 3708
3141 if (my $item = $self->{item}{$group}) { 3709 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 3710 if ($item->{text} eq $text) {
3143 $item->{count}++; 3711 $item->{count}++;
3144 } else { 3712 } else {
3145 $item->{count} = 1; 3713 $item->{count} = 1;
3146 $item->{text} = $item->{tooltip} = $text; 3714 $item->{text} = $item->{tooltip} = $text;
3147 } 3715 }
3148 $item->{id} = ++$self->{id}; 3716 $item->{id} += 0.2;#d#
3149 $item->{timeout} = $timeout; 3717 $item->{timeout} = $timeout;
3150 delete $item->{label}; 3718 delete $item->{label};
3151 } else { 3719 } else {
3152 $self->{item}{$group} = { 3720 $self->{item}{$group} = {
3153 id => ++$self->{id}, 3721 id => ++$self->{id},
… …
3159 count => 1, 3727 count => 1,
3160 %arg, 3728 %arg,
3161 }; 3729 };
3162 } 3730 }
3163 3731
3732 $ROOT->on_refresh (reorder => sub {
3164 $self->reorder; 3733 $self->reorder;
3734 });
3165} 3735}
3166 3736
3167sub reconfigure { 3737sub reconfigure {
3168 my ($self) = @_; 3738 my ($self) = @_;
3169 3739
… …
3172 3742
3173 $self->reorder; 3743 $self->reorder;
3174 $self->SUPER::reconfigure; 3744 $self->SUPER::reconfigure;
3175} 3745}
3176 3746
3177############################################################################# 3747sub destroy {
3748 my ($self) = @_;
3178 3749
3750 $self->{timer}->cancel;
3751
3752 $self->SUPER::destroy;
3753}
3754
3755#############################################################################
3756
3179package CFClient::UI::Inventory; 3757package CFPlus::UI::Inventory;
3180 3758
3181our @ISA = CFClient::UI::ScrolledWindow::; 3759our @ISA = CFPlus::UI::Table::;
3182 3760
3183sub new { 3761sub new {
3184 my $class = shift; 3762 my $class = shift;
3185 3763
3186 my $self = $class->SUPER::new ( 3764 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3765 col_expand => [0, 1, 0],
3766 items => [],
3188 @_, 3767 @_,
3189 ); 3768 );
3190 3769
3770 $self->set_sort_order (undef);
3771
3191 $self 3772 $self
3773}
3774
3775sub update_items {
3776 my ($self) = @_;
3777
3778 $self->clear;
3779
3780 my @item = $self->{sort}->(@{ $self->{items} });
3781
3782 my @adds;
3783 my $row = 0;
3784 for my $item ($self->{sort}->(@{ $self->{items} })) {
3785 CFPlus::Item::update_widgets $item;
3786
3787 push @adds, 0, $row, $item->{face_widget};
3788 push @adds, 1, $row, $item->{desc_widget};
3789 push @adds, 2, $row, $item->{weight_widget};
3790
3791 $row++;
3792 }
3793
3794 $self->add (@adds);
3795}
3796
3797sub set_sort_order {
3798 my ($self, $order) = @_;
3799
3800 $self->{sort} = $order ||= sub {
3801 sort {
3802 $a->{type} <=> $b->{type}
3803 or $a->{name} cmp $b->{name}
3804 } @_
3805 };
3806
3807 $self->update_items;
3192} 3808}
3193 3809
3194sub set_items { 3810sub set_items {
3195 my ($self, $items) = @_; 3811 my ($self, $items) = @_;
3196 3812
3197 $self->{child}->clear; 3813 $self->{items} = [$items ? values %$items : ()];
3198 return unless $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}
3218
3219#############################################################################
3220
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; 3814 $self->update_items;
3281
3282 $self
3283} 3815}
3284 3816
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############################################################################# 3817#############################################################################
3417 3818
3418package CFClient::UI::SpellList; 3819package CFPlus::UI::SpellList;
3419 3820
3420our @ISA = CFClient::UI::Table::; 3821our @ISA = CFPlus::UI::Table::;
3421 3822
3422sub new { 3823sub new {
3423 my $class = shift; 3824 my $class = shift;
3424 3825
3425 my $self = $class->SUPER::new ( 3826 my $self = $class->SUPER::new (
… …
3427 commands => [], 3828 commands => [],
3428 @_, 3829 @_,
3429 ) 3830 )
3430} 3831}
3431 3832
3432# XXX: Do sorting? Argl... 3833my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3834
3835my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3836 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3837my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3838 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3839my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3840 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3841my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3842 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3843my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3844 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3845
3846sub rebuild_spell_list {
3847 my ($self) = @_;
3848
3849 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3850 $self->clear;
3851
3852 return unless $::CONN;
3853
3854 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3855 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3856 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3857 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3858 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3859
3860 my $row = 0;
3861
3862 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3863 my $spell = $self->{spell}{$_};
3864
3865 $row++;
3866
3867 my $spell_cb = sub {
3868 my ($widget, $ev) = @_;
3869
3870 if ($ev->{button} == 1) {
3871 $::CONN->user_send ("cast $spell->{name}");
3872 } elsif ($ev->{button} == 2) {
3873 $::CONN->user_send ("invoke $spell->{name}");
3874 } elsif ($ev->{button} == 3) {
3875 my $shortname = CFPlus::shorten $spell->{name}, 14;
3876 (new CFPlus::UI::Menu
3877 items => [
3878 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3879 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3880 ],
3881 )->popup ($ev);
3882 } else {
3883 return 0;
3884 }
3885
3886 1
3887 };
3888
3889 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3890
3891 #TODO: add path info to tooltip
3892 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3893
3894 $self->add (0, $row, new CFPlus::UI::Face
3895 face => $spell->{face},
3896 can_hover => 1,
3897 can_events => 1,
3898 tooltip => $tooltip,
3899 on_button_down => $spell_cb,
3900 );
3901
3902 $self->add (1, $row, new CFPlus::UI::Label
3903 expand => 1,
3904 text => $spell->{name},
3905 can_hover => 1,
3906 can_events => 1,
3907 tooltip => $tooltip,
3908 on_button_down => $spell_cb,
3909 );
3910
3911 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3912 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3913 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3914 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3915 }
3916 });
3917}
3918
3433sub add_spell { 3919sub add_spell {
3434 my ($self, $spell) = @_; 3920 my ($self, $spell) = @_;
3921
3435 $self->{spells}->{$spell->{name}} = $spell; 3922 $self->{spell}->{$spell->{name}} = $spell;
3436 3923 $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} 3924}
3465 3925
3466sub remove_spell { 3926sub remove_spell {
3467 my ($self, $spell) = @_; 3927 my ($self, $spell) = @_;
3928
3468 delete $self->{spells}->{$spell->{name}}; 3929 delete $self->{spell}->{$spell->{name}};
3469 $self->rebuild_spell_list; 3930 $self->rebuild_spell_list;
3470} 3931}
3471 3932
3472############################################################################# 3933sub clear_spells {
3934 my ($self) = @_;
3473 3935
3936 $self->{spell} = {};
3937 $self->rebuild_spell_list;
3938}
3939
3940#############################################################################
3941
3474package CFClient::UI::Root; 3942package CFPlus::UI::Root;
3475 3943
3476our @ISA = CFClient::UI::Container::; 3944our @ISA = CFPlus::UI::Container::;
3477 3945
3946use List::Util qw(min max);
3947
3478use CFClient::OpenGL; 3948use CFPlus::OpenGL;
3479 3949
3480sub new { 3950sub new {
3481 my $class = shift; 3951 my $class = shift;
3482 3952
3483 my $self = $class->SUPER::new ( 3953 my $self = $class->SUPER::new (
… …
3508 $coord = $max - $size if $coord > $max - $size; 3978 $coord = $max - $size if $coord > $max - $size;
3509 3979
3510 int $coord + 0.5 3980 int $coord + 0.5
3511} 3981}
3512 3982
3513sub size_allocate { 3983sub invoke_size_allocate {
3514 my ($self, $w, $h) = @_; 3984 my ($self, $w, $h) = @_;
3515 3985
3516 for my $child ($self->children) { 3986 for my $child ($self->children) {
3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3518 3988
… …
3522 $X = _to_pixel $X, $W, $self->{w}; 3992 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h}; 3993 $Y = _to_pixel $Y, $H, $self->{h};
3524 3994
3525 $child->configure ($X, $Y, $W, $H); 3995 $child->configure ($X, $Y, $W, $H);
3526 } 3996 }
3997
3998 1
3527} 3999}
3528 4000
3529sub coord2local { 4001sub coord2local {
3530 my ($self, $x, $y) = @_; 4002 my ($self, $x, $y) = @_;
3531 4003
… …
3616 4088
3617 delete $queue{$widget+0}; 4089 delete $queue{$widget+0};
3618 4090
3619 my ($w, $h) = $widget->size_request; 4091 my ($w, $h) = $widget->size_request;
3620 4092
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4093 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4094 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4095
4096 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4097 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623 4098
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 4099 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 4100 $h = $widget->{force_h} if exists $widget->{force_h};
3626 4101
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4102 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3653 4128
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4129 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3655 4130
3656 $w = 0 if $w < 0; 4131 $w = 0 if $w < 0;
3657 $h = 0 if $h < 0; 4132 $h = 0 if $h < 0;
4133
4134 $w = max $widget->{min_w}, $w;
4135 $h = max $widget->{min_h}, $h;
4136
4137# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4138# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4139
4140 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4141 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3658 4142
3659 $w = int $w + 0.5; 4143 $w = int $w + 0.5;
3660 $h = int $h + 0.5; 4144 $h = int $h + 0.5;
3661 4145
3662 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4146 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4170 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3687 glMatrixMode GL_MODELVIEW; 4171 glMatrixMode GL_MODELVIEW;
3688 glLoadIdentity; 4172 glLoadIdentity;
3689 4173
3690 { 4174 {
3691 package CFClient::UI::Base; 4175 package CFPlus::UI::Base;
3692 4176
3693 ($draw_x, $draw_y, $draw_w, $draw_h) = 4177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h}); 4178 (0, 0, $self->{w}, $self->{h});
3695 }
3696 4179
3697 $self->_draw; 4180 $self->_draw;
4181 }
3698} 4182}
3699 4183
3700############################################################################# 4184#############################################################################
3701 4185
3702package CFClient::UI; 4186package CFPlus::UI;
3703 4187
3704$ROOT = new CFClient::UI::Root; 4188$ROOT = new CFPlus::UI::Root;
3705$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4189$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3706 4190
37071 41911
3708 4192

Diff Legend

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