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.283 by root, Mon Jun 5 02:28:30 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;
… …
1545 1923
1546 delete $self->{ox}; 1924 delete $self->{ox};
1547 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1548} 1926}
1549 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1550sub set_text { 1934sub set_text {
1551 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1552 1936
1553 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
1555 1939
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1940 $self->{layout}->set_text ($text);
1941
1558 delete $self->{req_h}; 1942 delete $self->{size_req};
1559
1560 $self->realloc; 1943 $self->realloc;
1561 $self->update; 1944 $self->update;
1562} 1945}
1563 1946
1564sub set_markup { 1947sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 1950 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 1951 $self->{text} = "M$markup";
1569 1952
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1953 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1954
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1955 $self->{layout}->set_markup ($markup);
1956
1574 delete $self->{req_h}; 1957 delete $self->{size_req};
1575
1576 $self->realloc; 1958 $self->realloc;
1577 $self->update; 1959 $self->update;
1578} 1960}
1579 1961
1580sub size_request { 1962sub size_request {
1581 my ($self) = @_; 1963 my ($self) = @_;
1582 1964
1583 if (exists $self->{req_h}) { 1965 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)} 1966 my ($max_w, $max_h) = $self->get_max_wh;
1585 } else { 1967
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1968 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1969 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1970 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1971 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1591 1973
1592 my ($w, $h) = $self->{layout}->size; 1974 my ($w, $h) = $self->{layout}->size;
1593 1975
1594 if (exists $self->{template}) { 1976 if (exists $self->{template}) {
1595 $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);
1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1979 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1597 1980
1598 my ($w2, $h2) = $self->{template}->size; 1981 my ($w2, $h2) = $self->{template}->size;
1599 1982
1600 $w = List::Util::max $w, $w2; 1983 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1984 $h = List::Util::max $h, $h2;
1602 } 1985 }
1603 1986
1604 ($w, $h) 1987 [$w, $h]
1605 } 1988 };
1606}
1607 1989
1990 @{ $self->{size_req} }
1991}
1992
1993sub baseline_shift {
1994 $_[0]{layout}->descent
1995}
1996
1608sub size_allocate { 1997sub invoke_size_allocate {
1609 my ($self, $w, $h) = @_; 1998 my ($self, $w, $h) = @_;
1610 1999
1611 delete $self->{ox}; 2000 delete $self->{ox};
1612 2001
1613 delete $self->{texture} 2002 delete $self->{texture}
1614 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
1615} 2006}
1616 2007
1617sub set_fontsize { 2008sub set_fontsize {
1618 my ($self, $fontsize) = @_; 2009 my ($self, $fontsize) = @_;
1619 2010
1620 $self->{fontsize} = $fontsize; 2011 $self->{fontsize} = $fontsize;
2012 delete $self->{size_req};
1621 delete $self->{texture}; 2013 delete $self->{texture};
1622 2014
1623 $self->realloc; 2015 $self->realloc;
1624} 2016}
1625 2017
2018sub reconfigure {
2019 my ($self) = @_;
2020
2021 delete $self->{size_req};
2022 delete $self->{texture};
2023
2024 $self->SUPER::reconfigure;
2025}
2026
1626sub _draw { 2027sub _draw {
1627 my ($self) = @_; 2028 my ($self) = @_;
1628 2029
1629 $self->SUPER::_draw; # draw background, if applicable 2030 $self->SUPER::_draw; # draw background, if applicable
1630 2031
1631 my $tex = $self->{texture} ||= do { 2032 my $size = $self->{texture} ||= do {
1632 $self->{layout}->set_foreground (@{$self->{fg}}); 2033 $self->{layout}->set_foreground (@{$self->{fg}});
1633 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2034 $self->{layout}->set_font ($self->{font}) if $self->{font};
1634 $self->{layout}->set_width ($self->{w}); 2035 $self->{layout}->set_width ($self->{w});
1635 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2036 $self->{layout}->set_ellipsise ($self->{ellipsise});
1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2037 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2038 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1638 2039
1639 new_from_layout CFClient::Texture $self->{layout} 2040 [$self->{layout}->size]
1640 }; 2041 };
1641 2042
1642 unless (exists $self->{ox}) { 2043 unless (exists $self->{ox}) {
1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2044 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2045 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1645 : ($self->{w} - $tex->{w}) * 0.5); 2046 : ($self->{w} - $size->[0]) * 0.5);
1646 2047
1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 2050 : ($self->{h} - $size->[1]) * 0.5);
2051
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1650 }; 2053 };
1651 2054
1652 glEnable GL_TEXTURE_2D; 2055# unless ($self->{list}) {
1653 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};
1654 2063
1655 glColor_premultiply @{$self->{fg}} 2064 $self->{layout}->draw;
1656 if $tex->{format} == GL_ALPHA;
1657
1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1659
1660 glDisable GL_TEXTURE_2D;
1661} 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#}
1662 2074
1663############################################################################# 2075#############################################################################
1664 2076
1665package CFClient::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1666 2078
1667our @ISA = CFClient::UI::Label::; 2079our @ISA = CFPlus::UI::Label::;
1668 2080
1669use CFClient::OpenGL; 2081use CFPlus::OpenGL;
1670 2082
1671sub new { 2083sub new {
1672 my $class = shift; 2084 my $class = shift;
1673 2085
1674 $class->SUPER::new ( 2086 $class->SUPER::new (
1675 fg => [1, 1, 1], 2087 fg => [1, 1, 1],
1676 bg => [0, 0, 0, 0.2], 2088 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1],
1677 active_bg => [1, 1, 1, 0.5], 2090 active_bg => [0, 0, 1, .2],
1678 active_fg => [0, 0, 0], 2091 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0],
1679 can_hover => 1, 2093 can_hover => 1,
1680 can_focus => 1, 2094 can_focus => 1,
1681 valign => 0, 2095 valign => 0,
1682 can_events => 1, 2096 can_events => 1,
2097 ellipsise => 0,
1683 #text => ... 2098 #text => ...
2099 #hidden => "*",
1684 @_ 2100 @_
1685 ) 2101 )
1686} 2102}
1687 2103
1688sub _set_text { 2104sub _set_text {
… …
1695 $self->{last_activity} = $::NOW; 2111 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 2112 $self->{text} = $text;
1697 2113
1698 $text =~ s/./*/g if $self->{hidden}; 2114 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 2115 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 2116 delete $self->{size_req};
1701 2117
1702 $self->_emit (changed => $self->{text}); 2118 $self->emit (changed => $self->{text});
1703 2119
1704 $self->realloc; 2120 $self->realloc;
1705 $self->update; 2121 $self->update;
1706} 2122}
1707 2123
… …
1722 my ($w, $h) = $self->SUPER::size_request; 2138 my ($w, $h) = $self->SUPER::size_request;
1723 2139
1724 ($w + 1, $h) # add 1 for cursor 2140 ($w + 1, $h) # add 1 for cursor
1725} 2141}
1726 2142
1727sub key_down { 2143sub invoke_key_down {
1728 my ($self, $ev) = @_; 2144 my ($self, $ev) = @_;
1729 2145
1730 my $mod = $ev->{mod}; 2146 my $mod = $ev->{mod};
1731 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1732 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1733 2149
1734 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;
1735 2153
1736 if ($uni == 8) { 2154 if ($uni == 8) {
1737 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1738 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1739 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1740 } elsif ($sym == CFClient::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1741 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1742 } elsif ($sym == CFClient::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1743 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1744 } 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 = "";
1745 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1746 } elsif ($sym == CFClient::SDLK_END) {
1747 $self->{cursor} = length $text;
1748 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1749 $self->_emit ('escape'); 2178 $self->emit ('escape');
1750 } elsif ($uni) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1751 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else { 2183 } else {
1753 return 0; 2184 return 0;
1754 } 2185 }
1755 2186
1756 $self->_set_text ($text); 2187 $self->_set_text ($text);
1757 2188
1758 $self->realloc; 2189 $self->realloc;
2190 $self->update;
1759 2191
1760 1 2192 1
1761} 2193}
1762 2194
1763sub focus_in { 2195sub invoke_focus_in {
1764 my ($self) = @_; 2196 my ($self) = @_;
1765 2197
1766 $self->{last_activity} = $::NOW; 2198 $self->{last_activity} = $::NOW;
1767 2199
1768 $self->SUPER::focus_in; 2200 $self->SUPER::invoke_focus_in
1769} 2201}
1770 2202
1771sub button_down { 2203sub invoke_button_down {
1772 my ($self, $ev, $x, $y) = @_; 2204 my ($self, $ev, $x, $y) = @_;
1773 2205
1774 $self->SUPER::button_down ($ev, $x, $y); 2206 $self->SUPER::invoke_button_down ($ev, $x, $y);
1775 2207
1776 my $idx = $self->{layout}->xy_to_index ($x, $y); 2208 my $idx = $self->{layout}->xy_to_index ($x, $y);
1777 2209
1778 # byte-index to char-index 2210 # byte-index to char-index
1779 my $text = $self->{text}; 2211 my $text = $self->{text};
1780 utf8::encode $text; 2212 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1781 $self->{cursor} = length substr $text, 0, $idx; 2213 $self->{cursor} = length $text;
1782 2214
1783 $self->_set_text ($self->{text}); 2215 $self->_set_text ($self->{text});
1784 $self->update; 2216 $self->update;
1785 2217
1786 1 2218 1
1787} 2219}
1788 2220
1789sub mouse_motion { 2221sub invoke_mouse_motion {
1790 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1791# 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#
1792 2224
1793 0 2225 1
1794} 2226}
1795 2227
1796sub _draw { 2228sub _draw {
1797 my ($self) = @_; 2229 my ($self) = @_;
1798 2230
… …
1805 glColor_premultiply @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
1806 } 2238 }
1807 2239
1808 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1810 glBegin GL_QUADS;
1811 glVertex 0 , 0;
1812 glVertex 0 , $self->{h};
1813 glVertex $self->{w}, $self->{h}; 2242 glRect 0, 0, $self->{w}, $self->{h};
1814 glVertex $self->{w}, 0;
1815 glEnd;
1816 glDisable GL_BLEND; 2243 glDisable GL_BLEND;
1817 2244
1818 $self->SUPER::_draw; 2245 $self->SUPER::_draw;
1819 2246
1820 #TODO: force update every cursor change :( 2247 #TODO: force update every cursor change :(
… …
1822 2249
1823 unless (exists $self->{cur_h}) { 2250 unless (exists $self->{cur_h}) {
1824 my $text = substr $self->{text}, 0, $self->{cursor}; 2251 my $text = substr $self->{text}, 0, $self->{cursor};
1825 utf8::encode $text; 2252 utf8::encode $text;
1826 2253
1827 @$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);
1828 } 2255 }
1829 2256
1830 glColor @{$self->{fg}}; 2257 glColor_premultiply @{$self->{active_fg}};
1831 glBegin GL_LINES; 2258 glBegin GL_LINES;
1832 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1833 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};
1834 glEnd; 2261 glEnd;
1835 }
1836}
1837 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
1838package CFClient::UI::Entry; 2281package CFPlus::UI::Entry;
1839 2282
1840our @ISA = CFClient::UI::EntryBase::; 2283our @ISA = CFPlus::UI::EntryBase::;
1841 2284
1842use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1843 2286
1844sub key_down { 2287sub invoke_key_down {
1845 my ($self, $ev) = @_; 2288 my ($self, $ev) = @_;
1846 2289
1847 my $sym = $ev->{sym}; 2290 my $sym = $ev->{sym};
1848 2291
1849 if ($sym == 13) { 2292 if ($ev->{uni} == 0x0d || $sym == 13) {
1850 unshift @{$self->{history}}, 2293 unshift @{$self->{history}},
1851 my $txt = $self->get_text; 2294 my $txt = $self->get_text;
2295
1852 $self->{history_pointer} = -1; 2296 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = ''; 2297 $self->{history_saveback} = '';
1854 $self->_emit (activate => $txt); 2298 $self->emit (activate => $txt);
1855 $self->update; 2299 $self->update;
1856 2300
1857 } elsif ($sym == CFClient::SDLK_UP) { 2301 } elsif ($sym == CFPlus::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) { 2302 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text; 2303 $self->{history_saveback} = $self->get_text;
1860 } 2304 }
1861 if (@{$self->{history} || []} > 0) { 2305 if (@{$self->{history} || []} > 0) {
1862 $self->{history_pointer}++; 2306 $self->{history_pointer}++;
… …
1864 $self->{history_pointer} = @{$self->{history} || []} - 1; 2308 $self->{history_pointer} = @{$self->{history} || []} - 1;
1865 } 2309 }
1866 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2310 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1867 } 2311 }
1868 2312
1869 } elsif ($sym == CFClient::SDLK_DOWN) { 2313 } elsif ($sym == CFPlus::SDLK_DOWN) {
1870 $self->{history_pointer}--; 2314 $self->{history_pointer}--;
1871 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2315 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1872 2316
1873 if ($self->{history_pointer} >= 0) { 2317 if ($self->{history_pointer} >= 0) {
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2318 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } else { 2319 } else {
1876 $self->set_text ($self->{history_saveback}); 2320 $self->set_text ($self->{history_saveback});
1877 } 2321 }
1878 2322
1879 } else { 2323 } else {
1880 return $self->SUPER::key_down ($ev) 2324 return $self->SUPER::invoke_key_down ($ev)
1881 } 2325 }
1882 2326
1883 1 2327 1
1884} 2328}
1885 2329
1886############################################################################# 2330#############################################################################
1887 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
1888package CFClient::UI::Button; 2371package CFPlus::UI::ButtonBin;
1889 2372
1890our @ISA = CFClient::UI::Label::; 2373our @ISA = CFPlus::UI::Bin::;
1891 2374
1892use CFClient::OpenGL; 2375use CFPlus::OpenGL;
1893 2376
1894my @tex = 2377my @tex =
1895 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1896 qw(b1_button_active.png); 2379 qw(b1_button_inactive.png b1_button_active.png);
1897 2380
1898sub new { 2381sub new {
1899 my $class = shift; 2382 my $class = shift;
1900 2383
1901 $class->SUPER::new ( 2384 $class->SUPER::new (
1902 padding_x => 4,
1903 padding_y => 4,
1904 fg => [1, 1, 1],
1905 active_fg => [0, 0, 1],
1906 can_hover => 1, 2385 can_hover => 1,
1907 align => 0, 2386 align => 0,
1908 valign => 0, 2387 valign => 0,
1909 can_events => 1, 2388 can_events => 1,
1910 @_ 2389 @_
1911 ) 2390 )
1912} 2391}
1913 2392
1914sub activate { }
1915
1916sub button_up { 2393sub invoke_button_up {
1917 my ($self, $ev, $x, $y) = @_; 2394 my ($self, $ev, $x, $y) = @_;
1918 2395
1919 $self->emit ("activate") 2396 $self->emit ("activate")
1920 if $x >= 0 && $x < $self->{w} 2397 if $x >= 0 && $x < $self->{w}
1921 && $y >= 0 && $y < $self->{h}; 2398 && $y >= 0 && $y < $self->{h};
… …
1924} 2401}
1925 2402
1926sub _draw { 2403sub _draw {
1927 my ($self) = @_; 2404 my ($self) = @_;
1928 2405
1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1930
1931 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1933 glColor 0, 0, 0, 1; 2408 glColor 0, 0, 0, 1;
1934 2409
2410 my $tex = $tex[$GRAB == $self];
1935 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2411 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1936 2412
1937 glDisable GL_TEXTURE_2D; 2413 glDisable GL_TEXTURE_2D;
1938 2414
1939 $self->SUPER::_draw; 2415 $self->SUPER::_draw;
1940} 2416}
1941 2417
1942############################################################################# 2418#############################################################################
1943 2419
1944package CFClient::UI::CheckBox; 2420package CFPlus::UI::Button;
1945 2421
1946our @ISA = CFClient::UI::DrawBG::; 2422our @ISA = CFPlus::UI::Label::;
2423
2424use CFPlus::OpenGL;
1947 2425
1948my @tex = 2426my @tex =
1949 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 }
1950 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2481 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1951 2482
1952use CFClient::OpenGL; 2483use CFPlus::OpenGL;
1953 2484
1954sub new { 2485sub new {
1955 my $class = shift; 2486 my $class = shift;
1956 2487
1957 $class->SUPER::new ( 2488 $class->SUPER::new (
… …
1971 my ($self) = @_; 2502 my ($self) = @_;
1972 2503
1973 (6) x 2 2504 (6) x 2
1974} 2505}
1975 2506
2507sub toggle {
2508 my ($self) = @_;
2509
2510 $self->{state} = !$self->{state};
2511 $self->emit (changed => $self->{state});
2512 $self->update;
2513}
2514
1976sub button_down { 2515sub invoke_button_down {
1977 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
1978 2517
1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2518 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2519 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981 $self->{state} = !$self->{state}; 2520 $self->toggle;
1982 $self->_emit (changed => $self->{state});
1983 } else { 2521 } else {
1984 return 0 2522 return 0
1985 } 2523 }
1986 2524
1987 1 2525 1
… …
1990sub _draw { 2528sub _draw {
1991 my ($self) = @_; 2529 my ($self) = @_;
1992 2530
1993 $self->SUPER::_draw; 2531 $self->SUPER::_draw;
1994 2532
1995 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2533 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
1996 2534
1997 my ($w, $h) = @$self{qw(w h)}; 2535 my ($w, $h) = @$self{qw(w h)};
1998 2536
1999 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;
2000 2538
… …
2007 glDisable GL_TEXTURE_2D; 2545 glDisable GL_TEXTURE_2D;
2008} 2546}
2009 2547
2010############################################################################# 2548#############################################################################
2011 2549
2012package CFClient::UI::Image; 2550package CFPlus::UI::Image;
2013 2551
2014our @ISA = CFClient::UI::Base::; 2552our @ISA = CFPlus::UI::Base::;
2015 2553
2016use CFClient::OpenGL; 2554use CFPlus::OpenGL;
2017use Carp qw/confess/;
2018 2555
2019our %loaded_images; 2556our %texture_cache;
2020 2557
2021sub new { 2558sub new {
2022 my $class = shift; 2559 my $class = shift;
2023 2560
2024 my $self = $class->SUPER::new (can_events => 0, @_); 2561 my $self = $class->SUPER::new (
2562 can_events => 0,
2563 scale => 1,
2564 @_,
2565 );
2025 2566
2026 $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";
2027 2569
2028 $loaded_images{$self->{image}} ||= 2570 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2029 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;
2030 2572
2031 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2573 CFPlus::weaken $texture_cache{$self->{path}};
2032 2574
2033 Scalar::Util::weaken $loaded_images{$self->{image}}; 2575 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035 $self->{aspect} = $tex->{w} / $tex->{h};
2036 2576
2037 $self 2577 $self
2038} 2578}
2039 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
2040sub size_request { 2595sub size_request {
2041 my ($self) = @_; 2596 my ($self) = @_;
2042 2597
2043 ($self->{tex}->{w}, $self->{tex}->{h}) 2598 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2044} 2599}
2045 2600
2046sub _draw { 2601sub _draw {
2047 my ($self) = @_; 2602 my ($self) = @_;
2048 2603
… …
2065 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2066} 2621}
2067 2622
2068############################################################################# 2623#############################################################################
2069 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
2070package CFClient::UI::VGauge; 2667package CFPlus::UI::VGauge;
2071 2668
2072our @ISA = CFClient::UI::Base::; 2669our @ISA = CFPlus::UI::Base::;
2073 2670
2074use List::Util qw(min max); 2671use List::Util qw(min max);
2075 2672
2076use CFClient::OpenGL; 2673use CFPlus::OpenGL;
2077 2674
2078my %tex = ( 2675my %tex = (
2079 food => [ 2676 food => [
2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2677 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2081 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2678 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2082 ], 2679 ],
2083 grace => [ 2680 grace => [
2084 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2681 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2085 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/
2086 ], 2683 ],
2087 hp => [ 2684 hp => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2685 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2686 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2090 ], 2687 ],
2091 mana => [ 2688 mana => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2689 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093 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/
2094 ], 2691 ],
2095); 2692);
2096 2693
2097# eg. VGauge->new (gauge => 'food'), default gauge: food 2694# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2157 my $ycut1 = max 0, min 1, $ycut; 2754 my $ycut1 = max 0, min 1, $ycut;
2158 my $ycut2 = max 0, min 1, $ycut - 1; 2755 my $ycut2 = max 0, min 1, $ycut - 1;
2159 2756
2160 my $h1 = $self->{h} * (1 - $ycut1); 2757 my $h1 = $self->{h} * (1 - $ycut1);
2161 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);
2162 2762
2163 glEnable GL_BLEND; 2763 glEnable GL_BLEND;
2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2764 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2765 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2166 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
… …
2185 2785
2186 if ($t3) { 2786 if ($t3) {
2187 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2787 glBindTexture GL_TEXTURE_2D, $t3->{name};
2188 glBegin GL_QUADS; 2788 glBegin GL_QUADS;
2189 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2789 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2190 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2790 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2191 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2791 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2192 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2792 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2193 glEnd; 2793 glEnd;
2194 } 2794 }
2195 2795
2196 glDisable GL_BLEND; 2796 glDisable GL_BLEND;
2197 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2198} 2798}
2199 2799
2200############################################################################# 2800#############################################################################
2201 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
2202package CFClient::UI::Gauge; 2940package CFPlus::UI::Gauge;
2203 2941
2204our @ISA = CFClient::UI::VBox::; 2942our @ISA = CFPlus::UI::VBox::;
2205 2943
2206sub new { 2944sub new {
2207 my ($class, %arg) = @_; 2945 my ($class, %arg) = @_;
2208 2946
2209 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2211 can_hover => 1, 2949 can_hover => 1,
2212 can_events => 1, 2950 can_events => 1,
2213 %arg, 2951 %arg,
2214 ); 2952 );
2215 2953
2216 $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");
2217 $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);
2218 $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");
2219 2957
2220 $self 2958 $self
2221} 2959}
2222 2960
2223sub set_fontsize { 2961sub set_fontsize {
… …
2244 $self->{value}->set_text ($val); 2982 $self->{value}->set_text ($val);
2245} 2983}
2246 2984
2247############################################################################# 2985#############################################################################
2248 2986
2249package CFClient::UI::Slider; 2987package CFPlus::UI::Slider;
2250 2988
2251use strict; 2989use strict;
2252 2990
2253use CFClient::OpenGL; 2991use CFPlus::OpenGL;
2254 2992
2255our @ISA = CFClient::UI::DrawBG::; 2993our @ISA = CFPlus::UI::DrawBG::;
2256 2994
2257my @tex = 2995my @tex =
2258 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2996 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2259 qw(s1_slider.png s1_slider_bg.png); 2997 qw(s1_slider.png s1_slider_bg.png);
2260 2998
2261sub new { 2999sub new {
2262 my $class = shift; 3000 my $class = shift;
2263 3001
… …
2284 $self->update; 3022 $self->update;
2285 3023
2286 $self 3024 $self
2287} 3025}
2288 3026
2289sub changed { }
2290
2291sub set_range { 3027sub set_range {
2292 my ($self, $range) = @_; 3028 my ($self, $range) = @_;
2293 3029
2294 ($range, $self->{range}) = ($self->{range}, $range); 3030 ($range, $self->{range}) = ($self->{range}, $range);
2295 3031
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 3032 if ("@$range" ne "@{$self->{range}}") {
3033 $self->update;
3034 $self->set_value ($self->{range}[0]);
3035 }
2298} 3036}
2299 3037
2300sub set_value { 3038sub set_value {
2301 my ($self, $value) = @_; 3039 my ($self, $value) = @_;
2302 3040
… …
2313 if $unit; 3051 if $unit;
2314 3052
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316 3054
2317 if ($value != $old_value) { 3055 if ($value != $old_value) {
2318 $self->_emit (changed => $value); 3056 $self->emit (changed => $value);
2319 $self->update; 3057 $self->update;
2320 } 3058 }
2321} 3059}
2322 3060
2323sub size_request { 3061sub size_request {
2324 my ($self) = @_; 3062 my ($self) = @_;
2325 3063
2326 ($self->{req_w}, $self->{req_h}) 3064 ($self->{req_w}, $self->{req_h})
2327} 3065}
2328 3066
2329sub button_down { 3067sub invoke_button_down {
2330 my ($self, $ev, $x, $y) = @_; 3068 my ($self, $ev, $x, $y) = @_;
2331 3069
2332 $self->SUPER::button_down ($ev, $x, $y); 3070 $self->SUPER::invoke_button_down ($ev, $x, $y);
2333 3071
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3072 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335 3073
2336 $self->mouse_motion ($ev, $x, $y) 3074 $self->invoke_mouse_motion ($ev, $x, $y);
2337}
2338 3075
3076 1
3077}
3078
2339sub mouse_motion { 3079sub invoke_mouse_motion {
2340 my ($self, $ev, $x, $y) = @_; 3080 my ($self, $ev, $x, $y) = @_;
2341 3081
2342 if ($GRAB == $self) { 3082 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3083 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344 3084
… …
2348 3088
2349 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3089 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2350 } else { 3090 } else {
2351 return 0; 3091 return 0;
2352 } 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);
2353 3105
2354 1 3106 1
2355} 3107}
2356 3108
2357sub update { 3109sub update {
… …
2408 glDisable GL_TEXTURE_2D; 3160 glDisable GL_TEXTURE_2D;
2409} 3161}
2410 3162
2411############################################################################# 3163#############################################################################
2412 3164
2413package CFClient::UI::ValSlider; 3165package CFPlus::UI::ValSlider;
2414 3166
2415our @ISA = CFClient::UI::HBox::; 3167our @ISA = CFPlus::UI::HBox::;
2416 3168
2417sub new { 3169sub new {
2418 my ($class, %arg) = @_; 3170 my ($class, %arg) = @_;
2419 3171
2420 my $range = delete $arg{range}; 3172 my $range = delete $arg{range};
2421 3173
2422 my $self = $class->SUPER::new ( 3174 my $self = $class->SUPER::new (
2423 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3175 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2424 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3176 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2425 to_value => sub { shift }, 3177 to_value => sub { shift },
2426 from_value => sub { shift }, 3178 from_value => sub { shift },
2427 %arg, 3179 %arg,
2428 ); 3180 );
2429 3181
… …
2449sub set_range { shift->{slider}->set_range (@_) } 3201sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 3202sub set_value { shift->{slider}->set_value (@_) }
2451 3203
2452############################################################################# 3204#############################################################################
2453 3205
2454package CFClient::UI::TextView; 3206package CFPlus::UI::TextScroller;
2455 3207
2456our @ISA = CFClient::UI::HBox::; 3208our @ISA = CFPlus::UI::HBox::;
2457 3209
2458use CFClient::OpenGL; 3210use CFPlus::OpenGL;
2459 3211
2460sub new { 3212sub new {
2461 my $class = shift; 3213 my $class = shift;
2462 3214
2463 my $self = $class->SUPER::new ( 3215 my $self = $class->SUPER::new (
2464 fontsize => 1, 3216 fontsize => 1,
2465 can_events => 0, 3217 can_events => 1,
3218 indent => 0,
2466 #font => default_font 3219 #font => default_font
2467 @_, 3220 @_,
2468 3221
2469 layout => (new CFClient::Layout 1), 3222 layout => (new CFPlus::Layout),
2470 par => [], 3223 par => [],
3224 max_par => 0,
2471 height => 0, 3225 height => 0,
2472 children => [ 3226 children => [
2473 (new CFClient::UI::Empty expand => 1), 3227 (new CFPlus::UI::Empty expand => 1),
2474 (new CFClient::UI::Slider vertical => 1), 3228 (new CFPlus::UI::Slider vertical => 1),
2475 ], 3229 ],
2476 ); 3230 );
2477 3231
2478 $self->{children}[1]->connect (changed => sub { $self->update }); 3232 $self->{children}[1]->connect (changed => sub { $self->update });
2479 3233
… …
2485 3239
2486 $self->{fontsize} = $fontsize; 3240 $self->{fontsize} = $fontsize;
2487 $self->reflow; 3241 $self->reflow;
2488} 3242}
2489 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
2490sub size_allocate { 3253sub invoke_size_allocate {
2491 my ($self, $w, $h) = @_; 3254 my ($self, $w, $h) = @_;
2492 3255
2493 $self->SUPER::size_allocate ($w, $h); 3256 my ($empty, $slider, @other) = @{ $self->{children} };
3257 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494 3258
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3259 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3260 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $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});
2498 3263
2499 $self->reflow; 3264 $self->reflow;
2500}
2501 3265
2502sub text_size { 3266 local $self->{children} = [$empty, $slider];
3267 $self->SUPER::invoke_size_allocate ($w, $h)
3268}
3269
3270sub invoke_mouse_wheel {
2503 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) = @_;
2504 3282
2505 my $layout = $self->{layout}; 3283 my $layout = $self->{layout};
2506 3284
3285 $layout->set_font ($self->{font}) if $self->{font};
3286 $layout->set_foreground (@{$para->{fg}});
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3287 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $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});
2509 $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}}
2510 3296 );
3297
2511 $layout->size 3298 $layout
2512} 3299}
2513 3300
2514sub reflow { 3301sub reflow {
2515 my ($self) = @_; 3302 my ($self) = @_;
2516 3303
… …
2523 3310
2524 # todo: base offset on lines or so, not on pixels 3311 # todo: base offset on lines or so, not on pixels
2525 $self->{children}[1]->set_value ($offset); 3312 $self->{children}[1]->set_value ($offset);
2526} 3313}
2527 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
2528sub clear { 3330sub clear {
2529 my ($self) = @_; 3331 my ($self) = @_;
3332
3333 my (undef, undef, @other) = @{ $self->{children} };
3334 $self->remove ($_) for @other;
2530 3335
2531 $self->{par} = []; 3336 $self->{par} = [];
2532 $self->{height} = 0; 3337 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3338 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534} 3339}
2535 3340
2536sub add_paragraph { 3341sub add_paragraph {
2537 my ($self, $color, $text, $indent) = @_; 3342 my $self = shift;
2538 3343
2539 for my $line (split /\n/, $text) { 3344 for my $para (@_) {
2540 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
2541 $self->{height} += $h; 3396 $self->{height} = $height;
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3397 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2543 }
2544 3398
2545 $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 }
2546} 3405}
2547 3406
2548sub update { 3407sub update {
2549 my ($self) = @_; 3408 my ($self) = @_;
2550 3409
… …
2552 3411
2553 return unless $self->{h} > 0; 3412 return unless $self->{h} > 0;
2554 3413
2555 delete $self->{texture}; 3414 delete $self->{texture};
2556 3415
2557 $ROOT->on_post_alloc ($self, sub { 3416 $ROOT->on_post_alloc ($self => sub {
3417 $self->force_uptodate;
3418
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3419 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 3420
2560 if (delete $self->{need_reflow}) {
2561 my $height = 0;
2562
2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2567 for (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569 $layout->set_width ($W - $_->[3]);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3];
2573 $_->[1] = $h;
2574 }
2575
2576 $height += $_->[1];
2577 }
2578
2579 $self->{height} = $height;
2580
2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2582
2583 delete $self->{texture};
2584 }
2585
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3421 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 3422 glClearColor 0, 0, 0, 0;
2588 glClear GL_COLOR_BUFFER_BIT; 3423 glClear GL_COLOR_BUFFER_BIT;
2589 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;
2590 my $top = int $self->{children}[1]{range}[0]; 3433 my $top = int $self->{children}[1]{range}[0];
2591 3434
2592 my $y0 = $top; 3435 my $y0 = $top;
2593 my $y1 = $top + $H; 3436 my $y1 = $top + $H;
2594 3437
2595 my $y = 0;
2596
2597 my $layout = $self->{layout};
2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2600
2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2604
2605 for my $par (@{$self->{par}}) { 3438 for my $para (@{$self->{par}}) {
2606 my $h = $par->[1]; 3439 my $h = $para->{h};
3440 my $y = $para->{y};
2607 3441
2608 if ($y0 < $y + $h && $y < $y1) { 3442 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] }); 3443 my $layout = $self->get_layout ($para);
2610 $layout->set_width ($W - $par->[3]);
2611 $layout->set_markup ($par->[4]);
2612 3444
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3445 $layout->render ($para->{indent}, $y - $y0);
3446 $layout->draw;
2614 3447
2615 glRasterPos $par->[3], $y - $y0; 3448 if (my @w = @{ $para->{widget} }) {
2616 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 }
2617 } 3460 }
2618 3461
2619 $y += $h; 3462 $paridx++;
3463 $top_paragraph ||= $paridx if $y >= $top;
2620 } 3464 }
2621 3465
2622 glDisable GL_BLEND; 3466 $self->{top_paragraph} = $top_paragraph;
2623 }; 3467 };
2624 }); 3468 });
3469}
3470
3471sub reconfigure {
3472 my ($self) = @_;
3473
3474 $self->SUPER::reconfigure;
3475
3476 $_->{w} = 1e10 for @{ $self->{par} };
3477 $self->reflow;
2625} 3478}
2626 3479
2627sub _draw { 3480sub _draw {
2628 my ($self) = @_; 3481 my ($self) = @_;
2629 3482
… …
2632 glColor 0, 0, 0, 1; 3485 glColor 0, 0, 0, 1;
2633 $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});
2634 glDisable GL_TEXTURE_2D; 3487 glDisable GL_TEXTURE_2D;
2635 3488
2636 $self->{children}[1]->draw; 3489 $self->{children}[1]->draw;
2637
2638} 3490}
2639 3491
2640############################################################################# 3492#############################################################################
2641 3493
2642package CFClient::UI::Animator; 3494package CFPlus::UI::Animator;
2643 3495
2644use CFClient::OpenGL; 3496use CFPlus::OpenGL;
2645 3497
2646our @ISA = CFClient::UI::Bin::; 3498our @ISA = CFPlus::UI::Bin::;
2647 3499
2648sub moveto { 3500sub moveto {
2649 my ($self, $x, $y) = @_; 3501 my ($self, $x, $y) = @_;
2650 3502
2651 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3503 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2679 glPopMatrix; 3531 glPopMatrix;
2680} 3532}
2681 3533
2682############################################################################# 3534#############################################################################
2683 3535
2684package CFClient::UI::Flopper; 3536package CFPlus::UI::Flopper;
2685 3537
2686our @ISA = CFClient::UI::Button::; 3538our @ISA = CFPlus::UI::Button::;
2687 3539
2688sub new { 3540sub new {
2689 my $class = shift; 3541 my $class = shift;
2690 3542
2691 my $self = $class->SUPER::new ( 3543 my $self = $class->SUPER::new (
… …
2703 $self->{other}->toggle_visibility; 3555 $self->{other}->toggle_visibility;
2704} 3556}
2705 3557
2706############################################################################# 3558#############################################################################
2707 3559
2708package CFClient::UI::Tooltip; 3560package CFPlus::UI::Tooltip;
2709 3561
2710our @ISA = CFClient::UI::Bin::; 3562our @ISA = CFPlus::UI::Bin::;
2711 3563
2712use CFClient::OpenGL; 3564use CFPlus::OpenGL;
2713 3565
2714sub new { 3566sub new {
2715 my $class = shift; 3567 my $class = shift;
2716 3568
2717 $class->SUPER::new ( 3569 $class->SUPER::new (
… …
2721} 3573}
2722 3574
2723sub set_tooltip_from { 3575sub set_tooltip_from {
2724 my ($self, $widget) = @_; 3576 my ($self, $widget) = @_;
2725 3577
2726 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 =~ /^#(.*)$/;
2727 3583
2728 if ($ENV{CFPLUS_DEBUG} & 2) { 3584 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 3585 $tip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3586 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 3587 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 3588 . "visible $widget->{visible}";
2733 } 3589 }
2734 3590
3591 $tip =~ s/^\n+//;
3592 $tip =~ s/\n+$//;
3593
2735 $self->add (new CFClient::UI::Label 3594 $self->add (new CFPlus::UI::Label
2736 markup => $tooltip, 3595 markup => $tip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3596 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 3597 fontsize => 0.8,
2739 fg => [0, 0, 0, 1], 3598 style => 1, # FLAG_INVERSE
2740 ellipsise => 0, 3599 ellipsise => 0,
2741 font => ($widget->{tooltip_font} || $::FONT_PROP), 3600 font => ($widget->{tooltip_font} || $::FONT_PROP),
2742 ); 3601 );
2743} 3602}
2744 3603
… …
2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3607 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749 3608
2750 ($w + 4, $h + 4) 3609 ($w + 4, $h + 4)
2751} 3610}
2752 3611
2753sub size_allocate { 3612sub invoke_size_allocate {
2754 my ($self, $w, $h) = @_; 3613 my ($self, $w, $h) = @_;
2755 3614
2756 $self->SUPER::size_allocate ($w - 4, $h - 4); 3615 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757} 3616}
2758 3617
2759sub visibility_change { 3618sub invoke_visibility_change {
2760 my ($self, $visible) = @_; 3619 my ($self, $visible) = @_;
2761 3620
2762 return unless $visible; 3621 return unless $visible;
2763 3622
2764 $self->{root}->on_post_alloc ("move_$self" => sub { 3623 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner} 3624 my $widget = $self->{owner}
2766 or return; 3625 or return;
2767 3626
3627 if ($widget->{visible}) {
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3628 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 3629
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3630 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 3631 if $x + $self->{w} > $self->{root}{w};
2772 3632
2773 $self->move_abs ($x, $y); 3633 $self->move_abs ($x, $y);
3634 } else {
3635 $self->hide;
3636 }
2774 }); 3637 });
2775} 3638}
2776 3639
2777sub _draw { 3640sub _draw {
2778 my ($self) = @_; 3641 my ($self) = @_;
2779 3642
2780 glTranslate 0.375, 0.375;
2781
2782 my ($w, $h) = @$self{qw(w h)}; 3643 my ($w, $h) = @$self{qw(w h)};
2783 3644
2784 glColor 1, 0.8, 0.4; 3645 glColor 1, 0.8, 0.4;
2785 glBegin GL_QUADS; 3646 glRect 0, 0, $w, $h;
2786 glVertex 0 , 0;
2787 glVertex 0 , $h;
2788 glVertex $w, $h;
2789 glVertex $w, 0;
2790 glEnd;
2791 3647
2792 glColor 0, 0, 0; 3648 glColor 0, 0, 0;
2793 glBegin GL_LINE_LOOP; 3649 glRect_lineloop .5, .5, $w + .5, $h + .5;
2794 glVertex 0 , 0;
2795 glVertex 0 , $h;
2796 glVertex $w, $h;
2797 glVertex $w, 0;
2798 glEnd;
2799 3650
2800 glTranslate 2 - 0.375, 2 - 0.375; 3651 glTranslate 2, 2;
2801 3652
2802 $self->SUPER::_draw; 3653 $self->SUPER::_draw;
2803} 3654}
2804 3655
2805############################################################################# 3656#############################################################################
2806 3657
2807package CFClient::UI::Face; 3658package CFPlus::UI::Face;
2808 3659
2809our @ISA = CFClient::UI::Base::; 3660our @ISA = CFPlus::UI::DrawBG::;
2810 3661
2811use CFClient::OpenGL; 3662use CFPlus::OpenGL;
2812 3663
2813sub new { 3664sub new {
2814 my $class = shift; 3665 my $class = shift;
2815 3666
2816 my $self = $class->SUPER::new ( 3667 my $self = $class->SUPER::new (
3668 size_w => 32,
3669 size_h => 8,
2817 aspect => 1, 3670 aspect => 1,
2818 can_events => 0, 3671 can_events => 0,
2819 @_, 3672 @_,
2820 ); 3673 );
2821 3674
2822 if ($self->{anim} && $self->{animspeed}) { 3675 if ($self->{anim} && $self->{animspeed}) {
2823 Scalar::Util::weaken (my $widget = $self); 3676 CFPlus::weaken (my $widget = $self);
2824 3677
2825 $self->{timer} = Event->timer ( 3678 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
2826 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3679 $widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
2827 hard => 1, 3680 $self->{timer} = EV::timer_ns 0, 0, sub {
2828 interval => $self->{animspeed}, 3681 return unless $::CONN;
2829 cb => sub { 3682
3683 my $w = $widget
3684 or return;
3685
2830 ++$widget->{frame}; 3686 ++$w->{frame};
3687 $w->update_face;
3688
3689 # somehow, $widget can go away
2831 $widget->update; 3690 $w->update;
2832 }, 3691 $w->update_timer;
2833 ); 3692 };
3693
3694 $self->update_face;
3695 $self->update_timer;
2834 } 3696 }
2835 3697
2836 $self 3698 $self
2837} 3699}
2838 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
2839sub size_request { 3736sub size_request {
2840 (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)
2841} 3754}
2842 3755
2843sub update { 3756sub update {
2844 my ($self) = @_; 3757 my ($self) = @_;
2845 3758
2846 return unless $self->{visible}; 3759 return unless $self->{visible};
2847 3760
2848 $self->SUPER::update; 3761 $self->SUPER::update;
2849} 3762}
2850 3763
3764sub invoke_visibility_change {
3765 my ($self) = @_;
3766
3767 $self->update_timer;
3768
3769 0
3770}
3771
2851sub _draw { 3772sub _draw {
2852 my ($self) = @_; 3773 my ($self) = @_;
2853 3774
2854 return unless $::CONN; 3775 $self->SUPER::_draw;
2855 3776
2856 my $face; 3777 if (my $tex = $self->{tex}) {
2857
2858 if ($self->{frame}) {
2859 my $anim = $::CONN->{anim}[$self->{anim}];
2860
2861 $face = $anim->[ $self->{frame} % @$anim ]
2862 if $anim && @$anim;
2863 }
2864
2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2866
2867 if ($tex) {
2868 glEnable GL_TEXTURE_2D; 3778 glEnable GL_TEXTURE_2D;
2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2870 glColor 0, 0, 0, 1; 3780 glColor 0, 0, 0, 1;
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3781 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 3782 glDisable GL_TEXTURE_2D;
2873 } 3783 }
2874} 3784}
2875 3785
2876sub DESTROY { 3786sub destroy {
2877 my ($self) = @_; 3787 my ($self) = @_;
2878 3788
2879 $self->{timer}->cancel 3789 (delete $self->{timer})->cancel
2880 if $self->{timer}; 3790 if $self->{timer};
2881 3791
2882 $self->SUPER::DESTROY; 3792 $self->SUPER::destroy;
2883} 3793}
2884 3794
2885############################################################################# 3795#############################################################################
2886 3796
2887package CFClient::UI::Buttonbar; 3797package CFPlus::UI::Buttonbar;
2888 3798
2889our @ISA = CFClient::UI::HBox::; 3799our @ISA = CFPlus::UI::HBox::;
2890 3800
2891# TODO: should actualyl wrap buttons and other goodies. 3801# TODO: should actually wrap buttons and other goodies.
2892 3802
2893############################################################################# 3803#############################################################################
2894 3804
2895package CFClient::UI::Menu; 3805package CFPlus::UI::Menu;
2896 3806
2897our @ISA = CFClient::UI::FancyFrame::; 3807our @ISA = CFPlus::UI::Toplevel::;
2898 3808
2899use CFClient::OpenGL; 3809use CFPlus::OpenGL;
2900 3810
2901sub new { 3811sub new {
2902 my $class = shift; 3812 my $class = shift;
2903 3813
2904 my $self = $class->SUPER::new ( 3814 my $self = $class->SUPER::new (
2905 items => [], 3815 items => [],
2906 z => 100, 3816 z => 100,
2907 @_, 3817 @_,
2908 ); 3818 );
2909 3819
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3820 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2911 3821
2912 for my $item (@{ $self->{items} }) { 3822 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3823 my ($widget, $cb, $tooltip) = @$item;
2914 3824
2915 # handle various types of items, only text for now 3825 # handle various types of items, only text for now
2916 if (!ref $widget) { 3826 if (!ref $widget) {
3827 if ($widget =~ /\t/) {
3828 my ($left, $right) = split /\t/, $widget, 2;
3829
2917 $widget = new CFClient::UI::Label 3830 $widget = new CFPlus::UI::HBox
2918 can_hover => 1, 3831 can_hover => 1,
2919 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,
2920 text => $widget; 3844 markup => $widget,
3845 tooltip => $tooltip;
3846 }
2921 } 3847 }
2922 3848
2923 $self->{item}{$widget} = $item; 3849 $self->{item}{$widget} = $item;
2924 3850
2925 $self->{vbox}->add ($widget); 3851 $self->{vbox}->add ($widget);
… …
2930 3856
2931# 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)
2932sub popup { 3858sub popup {
2933 my ($self, $ev) = @_; 3859 my ($self, $ev) = @_;
2934 3860
2935 $self->_emit ("popdown"); 3861 $self->emit ("popdown");
2936 3862
2937 # maybe save $GRAB? must be careful about events... 3863 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self; 3864 $GRAB = $self;
2939 $self->{button} = $ev->{button}; 3865 $self->{button} = $ev->{button};
2940 3866
2941 $self->show; 3867 $self->show;
2942 $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);
2943} 3869}
2944 3870
2945sub mouse_motion { 3871sub invoke_mouse_motion {
2946 my ($self, $ev, $x, $y) = @_; 3872 my ($self, $ev, $x, $y) = @_;
2947 3873
2948 # TODO: should use vbox->find_widget or so 3874 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3875 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER}; 3876 $self->{hover} = $self->{item}{$HOVER};
2951 3877
2952 0 3878 0
2953} 3879}
2954 3880
2955sub button_up { 3881sub invoke_button_up {
2956 my ($self, $ev, $x, $y) = @_; 3882 my ($self, $ev, $x, $y) = @_;
2957 3883
2958 if ($ev->{button} == $self->{button}) { 3884 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB; 3885 undef $GRAB;
2960 $self->hide; 3886 $self->hide;
2961 3887
2962 $self->_emit ("popdown"); 3888 $self->emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover}; 3889 $self->{hover}[1]->() if $self->{hover};
2964 } else { 3890 } else {
2965 return 0 3891 return 0
2966 } 3892 }
2967 3893
2968 1 3894 1
2969} 3895}
2970 3896
2971############################################################################# 3897#############################################################################
2972 3898
2973package CFClient::UI::Multiplexer; 3899package CFPlus::UI::Multiplexer;
2974 3900
2975our @ISA = CFClient::UI::Container::; 3901our @ISA = CFPlus::UI::Container::;
2976 3902
2977sub new { 3903sub new {
2978 my $class = shift; 3904 my $class = shift;
2979 3905
2980 my $self = $class->SUPER::new ( 3906 my $self = $class->SUPER::new (
… …
2994 3920
2995 $self->{current} = $self->{children}[0] 3921 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} }; 3922 if @{ $self->{children} };
2997} 3923}
2998 3924
3925sub get_current_page {
3926 my ($self) = @_;
3927
3928 $self->{current}
3929}
3930
2999sub set_current_page { 3931sub set_current_page {
3000 my ($self, $page_or_widget) = @_; 3932 my ($self, $page_or_widget) = @_;
3001 3933
3002 my $widget = ref $page_or_widget 3934 my $widget = ref $page_or_widget
3003 ? $page_or_widget 3935 ? $page_or_widget
3004 : $self->{children}[$page_or_widget]; 3936 : $self->{children}[$page_or_widget];
3005 3937
3006 $self->{current} = $widget; 3938 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3939 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008 3940
3009 $self->_emit (page_changed => $self->{current}); 3941 $self->emit (page_changed => $self->{current});
3010 3942
3011 $self->realloc; 3943 $self->realloc;
3012} 3944}
3013 3945
3014sub visible_children { 3946sub visible_children {
… …
3019 my ($self) = @_; 3951 my ($self) = @_;
3020 3952
3021 $self->{current}->size_request 3953 $self->{current}->size_request
3022} 3954}
3023 3955
3024sub size_allocate { 3956sub invoke_size_allocate {
3025 my ($self, $w, $h) = @_; 3957 my ($self, $w, $h) = @_;
3026 3958
3027 $self->{current}->configure (0, 0, $w, $h); 3959 $self->{current}->configure (0, 0, $w, $h);
3960
3961 1
3028} 3962}
3029 3963
3030sub _draw { 3964sub _draw {
3031 my ($self) = @_; 3965 my ($self) = @_;
3032 3966
3033 $self->{current}->draw; 3967 $self->{current}->draw;
3034} 3968}
3035 3969
3036############################################################################# 3970#############################################################################
3037 3971
3038package CFClient::UI::Notebook; 3972package CFPlus::UI::Notebook;
3039 3973
3974use CFPlus::OpenGL;
3975
3040our @ISA = CFClient::UI::VBox::; 3976our @ISA = CFPlus::UI::VBox::;
3041 3977
3042sub new { 3978sub new {
3043 my $class = shift; 3979 my $class = shift;
3044 3980
3045 my $self = $class->SUPER::new ( 3981 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar), 3982 buttonbar => (new CFPlus::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3983 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3984 active_outline => [.7, .7, 0.2],
3048 # filter => # will be put between multiplexer and $self 3985 # filter => # will be put between multiplexer and $self
3049 @_, 3986 @_,
3050 ); 3987 );
3051 3988
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3989 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3053 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3990 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3054 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
3055 $self 4026 $self
3056} 4027}
3057 4028
3058sub 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 {
3059 my ($self, $title, $widget, $tooltip) = @_; 4047 my ($self, $title, $widget, $tooltip) = @_;
3060 4048
3061 Scalar::Util::weaken $self; 4049 $title = [$title, $tooltip] unless ref $title;
4050 $widget->{c_tab} = $title;
3062 4051
3063 $self->{buttonbar}->add (new CFClient::UI::Button
3064 markup => $title,
3065 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) },
3067 );
3068
3069 $self->{multiplexer}->add ($widget); 4052 $self->add ($widget);
4053}
4054
4055sub get_current_page {
4056 my ($self) = @_;
4057
4058 $self->{multiplexer}->get_current_page
3070} 4059}
3071 4060
3072sub set_current_page { 4061sub set_current_page {
3073 my ($self, $page) = @_; 4062 my ($self, $page) = @_;
3074 4063
3075 $self->{multiplexer}->set_current_page ($page); 4064 $self->{multiplexer}->set_current_page ($page);
3076 $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 }
3077} 4086}
3078 4087
3079############################################################################# 4088#############################################################################
3080 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
3081package CFClient::UI::Statusbox; 4154package CFPlus::UI::Statusbox;
3082 4155
3083our @ISA = CFClient::UI::VBox::; 4156our @ISA = CFPlus::UI::VBox::;
3084 4157
3085sub new { 4158sub new {
3086 my $class = shift; 4159 my $class = shift;
3087 4160
3088 my $self = $class->SUPER::new ( 4161 my $self = $class->SUPER::new (
3089 fontsize => 0.8, 4162 fontsize => 0.8,
3090 @_, 4163 @_,
3091 ); 4164 );
3092 4165
3093 Scalar::Util::weaken (my $this = $self); 4166 CFPlus::weaken (my $this = $self);
3094 4167
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4168 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3096 4169
3097 $self 4170 $self
3098} 4171}
3099 4172
3100sub reorder { 4173sub reorder {
3101 my ($self) = @_; 4174 my ($self) = @_;
3102 my $NOW = Time::HiRes::time; 4175 my $NOW = Time::HiRes::time;
3103 4176
3104 # freeze display when hovering over any label 4177 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner} 4178 return if $CFPlus::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4179 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} }; 4180 values %{ $self->{item} };
3108 4181
3109 while (my ($k, $v) = each %{ $self->{item} }) { 4182 while (my ($k, $v) = each %{ $self->{item} }) {
3110 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4183 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3111 } 4184 }
… …
3114 4187
3115 my @items = sort { 4188 my @items = sort {
3116 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
3117 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
3118 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
3119
3120 $self->{timer}->interval (1);
3121 4192
3122 my $count = 10 + 1; 4193 my $count = 10 + 1;
3123 for my $item (@items) { 4194 for my $item (@items) {
3124 last unless --$count; 4195 last unless --$count;
3125 4196
… …
3132 for ($short) { 4203 for ($short) {
3133 s/^\s+//; 4204 s/^\s+//;
3134 s/\s+/ /g; 4205 s/\s+/ /g;
3135 } 4206 }
3136 4207
3137 new CFClient::UI::Label 4208 new CFPlus::UI::Label
3138 markup => $short, 4209 markup => $short,
3139 tooltip => $item->{tooltip}, 4210 tooltip => $item->{tooltip},
3140 tooltip_font => $::FONT_PROP, 4211 tooltip_font => $::FONT_PROP,
3141 tooltip_width => 0.67, 4212 tooltip_width => 0.67,
3142 fontsize => $item->{fontsize} || $self->{fontsize}, 4213 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3149 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3150 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3151 $label->update; 4222 $label->update;
3152 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
3153 if $diff < 1; 4224 if $diff < 1;
3154 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
3155 } else { 4226 } else {
3156 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
3157 } 4228 }
3158 4229
3159 push @widgets, $label; 4230 push @widgets, $label;
… …
3180 $item->{count}++; 4251 $item->{count}++;
3181 } else { 4252 } else {
3182 $item->{count} = 1; 4253 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 4254 $item->{text} = $item->{tooltip} = $text;
3184 } 4255 }
3185 $item->{id} = ++$self->{id}; 4256 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 4257 $item->{timeout} = $timeout;
3187 delete $item->{label}; 4258 delete $item->{label};
3188 } else { 4259 } else {
3189 $self->{item}{$group} = { 4260 $self->{item}{$group} = {
3190 id => ++$self->{id}, 4261 id => ++$self->{id},
… …
3196 count => 1, 4267 count => 1,
3197 %arg, 4268 %arg,
3198 }; 4269 };
3199 } 4270 }
3200 4271
4272 $ROOT->on_refresh (reorder => sub {
3201 $self->reorder; 4273 $self->reorder;
4274 });
3202} 4275}
3203 4276
3204sub reconfigure { 4277sub reconfigure {
3205 my ($self) = @_; 4278 my ($self) = @_;
3206 4279
… …
3209 4282
3210 $self->reorder; 4283 $self->reorder;
3211 $self->SUPER::reconfigure; 4284 $self->SUPER::reconfigure;
3212} 4285}
3213 4286
3214sub DESTROY { 4287sub destroy {
3215 my ($self) = @_; 4288 my ($self) = @_;
3216 4289
3217 $self->{timer}->cancel; 4290 $self->{timer}->cancel;
3218 4291
3219 $self->SUPER::DESTROY; 4292 $self->SUPER::destroy;
3220} 4293}
3221 4294
3222############################################################################# 4295#############################################################################
3223 4296
3224package CFClient::UI::Inventory;
3225
3226our @ISA = CFClient::UI::ScrolledWindow::;
3227
3228sub new {
3229 my $class = shift;
3230
3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
3473 @_,
3474 )
3475}
3476
3477# XXX: Do sorting? Argl...
3478sub add_spell {
3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
3481
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::Root; 4297package CFPlus::UI::Root;
3520 4298
3521our @ISA = CFClient::UI::Container::; 4299our @ISA = CFPlus::UI::Container::;
3522 4300
3523use List::Util qw(min max); 4301use List::Util qw(min max);
3524 4302
3525use CFClient::OpenGL; 4303use CFPlus::OpenGL;
3526 4304
3527sub new { 4305sub new {
3528 my $class = shift; 4306 my $class = shift;
3529 4307
3530 my $self = $class->SUPER::new ( 4308 my $self = $class->SUPER::new (
3531 visible => 1, 4309 visible => 1,
3532 @_, 4310 @_,
3533 ); 4311 );
3534 4312
3535 Scalar::Util::weaken ($self->{root} = $self); 4313 CFPlus::weaken ($self->{root} = $self);
3536 4314
3537 $self 4315 $self
3538} 4316}
3539 4317
3540sub size_request { 4318sub size_request {
… …
3555 $coord = $max - $size if $coord > $max - $size; 4333 $coord = $max - $size if $coord > $max - $size;
3556 4334
3557 int $coord + 0.5 4335 int $coord + 0.5
3558} 4336}
3559 4337
3560sub size_allocate { 4338sub invoke_size_allocate {
3561 my ($self, $w, $h) = @_; 4339 my ($self, $w, $h) = @_;
3562 4340
3563 for my $child ($self->children) { 4341 for my $child ($self->children) {
3564 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)};
3565 4343
… …
3569 $X = _to_pixel $X, $W, $self->{w}; 4347 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h}; 4348 $Y = _to_pixel $Y, $H, $self->{h};
3571 4349
3572 $child->configure ($X, $Y, $W, $H); 4350 $child->configure ($X, $Y, $W, $H);
3573 } 4351 }
4352
4353 1
3574} 4354}
3575 4355
3576sub coord2local { 4356sub coord2local {
3577 my ($self, $x, $y) = @_; 4357 my ($self, $x, $y) = @_;
3578 4358
… …
3586} 4366}
3587 4367
3588sub update { 4368sub update {
3589 my ($self) = @_; 4369 my ($self) = @_;
3590 4370
3591 $::WANT_REFRESH++; 4371 $::WANT_REFRESH->start;
3592} 4372}
3593 4373
3594sub add { 4374sub add {
3595 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
3596 4376
… …
3633 while ($self->{refresh_hook}) { 4413 while ($self->{refresh_hook}) {
3634 $_->() 4414 $_->()
3635 for values %{delete $self->{refresh_hook}}; 4415 for values %{delete $self->{refresh_hook}};
3636 } 4416 }
3637 4417
3638 if ($self->{realloc}) { 4418 while ($self->{realloc}) {
3639 my %queue; 4419 my %queue;
3640 my @queue; 4420 my @queue;
3641 my $widget; 4421 my $widget;
3642 4422
3643 outer: 4423 outer:
… …
3690 } 4470 }
3691 } 4471 }
3692 4472
3693 delete $self->{realloc}{$widget+0}; 4473 delete $self->{realloc}{$widget+0};
3694 } 4474 }
3695 }
3696 4475
3697 while (my $size_alloc = delete $self->{size_alloc}) { 4476 while (my $size_alloc = delete $self->{size_alloc}) {
3698 my @queue = sort { $b->{visible} <=> $a->{visible} } 4477 my @queue = sort { $a->{visible} <=> $b->{visible} }
3699 values %$size_alloc; 4478 values %$size_alloc;
3700 4479
3701 while () { 4480 while () {
3702 my $widget = pop @queue || last; 4481 my $widget = pop @queue || last;
3703 4482
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4483 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3705 4484
3706 $w = 0 if $w < 0; 4485 $w = max $widget->{min_w}, $w;
3707 $h = 0 if $h < 0; 4486 $h = max $widget->{min_h}, $h;
3708 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
3709 $w = int $w + 0.5; 4494 $w = int $w + 0.5;
3710 $h = int $h + 0.5; 4495 $h = int $h + 0.5;
3711 4496
3712 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}) {
3713 $widget->{old_w} = $widget->{w}; 4498 $widget->{old_w} = $widget->{w};
3714 $widget->{old_h} = $widget->{h}; 4499 $widget->{old_h} = $widget->{h};
3715 4500
3716 $widget->{w} = $w; 4501 $widget->{w} = $w;
3717 $widget->{h} = $h; 4502 $widget->{h} = $h;
3718 4503
3719 $widget->emit (size_allocate => $w, $h); 4504 $widget->emit (size_allocate => $w, $h);
4505 }
3720 } 4506 }
3721 } 4507 }
3722 } 4508 }
3723 4509
3724 while ($self->{post_alloc_hook}) { 4510 while ($self->{post_alloc_hook}) {
3725 $_->() 4511 $_->()
3726 for values %{delete $self->{post_alloc_hook}}; 4512 for values %{delete $self->{post_alloc_hook}};
3727 } 4513 }
3728
3729 4514
3730 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4515 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4516 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3732 glClear GL_COLOR_BUFFER_BIT; 4517 glClear GL_COLOR_BUFFER_BIT;
3733 4518
… …
3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4521 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3737 glMatrixMode GL_MODELVIEW; 4522 glMatrixMode GL_MODELVIEW;
3738 glLoadIdentity; 4523 glLoadIdentity;
3739 4524
3740 { 4525 {
3741 package CFClient::UI::Base; 4526 package CFPlus::UI::Base;
3742 4527
3743 ($draw_x, $draw_y, $draw_w, $draw_h) = 4528 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h}); 4529 (0, 0, $self->{w}, $self->{h});
3745 }
3746 4530
3747 $self->_draw; 4531 $self->_draw;
4532 }
3748} 4533}
3749 4534
3750############################################################################# 4535#############################################################################
3751 4536
3752package CFClient::UI; 4537package CFPlus::UI;
3753 4538
3754$ROOT = new CFClient::UI::Root; 4539$ROOT = new CFPlus::UI::Root;
3755$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4540$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3756 4541
37571 45421
3758 4543

Diff Legend

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