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

Diff Legend

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