ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.428 by root, Mon Aug 20 19:24:22 2007 UTC

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

Diff Legend

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