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

Diff Legend

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