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

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

Diff Legend

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