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

Diff Legend

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