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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.353 by root, Thu Nov 16 19:42:45 2006 UTC

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

Diff Legend

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