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

Diff Legend

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