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

Diff Legend

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