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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

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

Diff Legend

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