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

Diff Legend

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