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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.326 by root, Sun Jul 16 20:04:08 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $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}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
185 } 190 }
186 } 191 }
187 192
188 reconfigure_widgets; 193 reconfigure_widgets;
189} 194}
… …
198 203
199sub new { 204sub new {
200 my $class = shift; 205 my $class = shift;
201 206
202 my $self = bless { 207 my $self = bless {
203 x => 0, 208 x => "center",
204 y => 0, 209 y => "center",
205 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
206 can_events => 1, 213 can_events => 1,
207 @_ 214 @_
208 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 218
210 for (keys %$self) { 219 for (keys %$self) {
211 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
213 } 222 }
214 } 223 }
215 224
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
223 } 235 }
224 236
225 $self 237 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 238}
237 239
238sub destroy { 240sub destroy {
239 my ($self) = @_; 241 my ($self) = @_;
240 242
… …
242 %$self = (); 244 %$self = ();
243} 245}
244 246
245sub show { 247sub show {
246 my ($self) = @_; 248 my ($self) = @_;
249
247 return if $self->{parent}; 250 return if $self->{parent};
248 251
249 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
250} 253}
251 254
252sub show_centered { 255sub set_visible {
253 my ($self) = @_; 256 my ($self) = @_;
257
254 return if $self->{parent}; 258 return if $self->{visible};
255 259
256 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
257 262
258 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
259 "centered $self" => sub { 264
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
261 }, 266
262 ); 267 $_->set_visible for $self->children;
263} 268}
264 269
265sub set_invisible { 270sub set_invisible {
266 my ($self) = @_; 271 my ($self) = @_;
267 272
268 return unless $self->{visible}; 273 return unless $self->{visible};
269 274
270 # broken show/hide model 275 $_->set_invisible for $self->children;
271 276
277 delete $self->{visible};
272 delete $self->{root}; 278 delete $self->{root};
273 delete $self->{visible};
274 279
275 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
277 282
278 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
280 285
281 $self->focus_out; 286 $self->emit ("focus_out");
282
283 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
284} 305}
285 306
286sub hide { 307sub hide {
287 my ($self) = @_; 308 my ($self) = @_;
288 309
… …
290 311
291 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
292 if $self->{parent}; 313 if $self->{parent};
293} 314}
294 315
295sub move { 316sub move_abs {
296 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
297 318
298 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
299 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
300 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
301 322
302 $self->update; 323 $self->update;
303} 324}
304 325
305sub set_size { 326sub set_size {
306 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
307 328
308 $self->{user_w} = $w; 329 $self->{force_w} = $w;
309 $self->{user_h} = $h; 330 $self->{force_h} = $h;
310 331
311 $self->check_size; 332 $self->realloc;
312} 333}
313 334
314sub size_request { 335sub size_request {
315 require Carp; 336 require Carp;
316 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
317} 338}
318 339
340sub baseline_shift {
341 0
342}
343
319sub configure { 344sub configure {
320 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
321 346
322 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
323 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
324 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
325 352
326 # use alignment to adjust x, y 353 # use alignment to adjust x, y
327 354
328 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
329 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
330
331 ($w, $h) = ($w2, $h2);
332 } 357 }
333 358
334 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
335 $self->{x} = $x; 360 $self->{x} = $x;
336 $self->{y} = $y; 361 $self->{y} = $y;
337 $self->update; 362 $self->update;
338 } 363 }
339 364
340 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
341 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
342 }
343}
344 367
345sub size_allocate { 368 $self->{alloc_w} = $w;
346 # nothing to be done 369 $self->{alloc_h} = $h;
347}
348 370
349sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
350 my ($self) = @_; 372 }
351
352 $self->check_size (1);
353 $self->update;
354} 373}
355 374
356sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
357} 381}
358 382
359sub set_max_size { 383sub set_max_size {
360 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
361 385
362 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
363 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
364} 390}
365 391
366sub set_tooltip { 392sub set_tooltip {
367 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
368 394
… …
373 399
374 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
375 401
376 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
377 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
378 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
379 } 405 }
380} 406}
381 407
382# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
383sub coord2local { 409sub coord2local {
… …
391 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
392 418
393 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
394} 420}
395 421
396sub focus_in { 422sub invoke_focus_in {
397 my ($self) = @_; 423 my ($self) = @_;
398 424
399 return if $FOCUS == $self; 425 return if $FOCUS == $self;
400 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
401 427
402 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
403 429
404 $self->_emit (focus_in => $focus); 430 $self->update;
405 431
406 $focus->update if $focus; 432 0
407 $FOCUS->update;
408} 433}
409 434
410sub focus_out { 435sub invoke_focus_out {
411 my ($self) = @_; 436 my ($self) = @_;
412 437
413 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
414 439
415 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
416 441
417 $self->_emit (focus_out => $focus); 442 $self->update;
418 443
419 $focus->update if $focus; #?
420
421 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
422 unless $FOCUS; 445 unless $FOCUS;
423}
424 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
425sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
426sub button_up { } 458sub invoke_button_up { 1 }
427sub key_down { } 459sub invoke_key_down { 1 }
428sub key_up { } 460sub invoke_key_up { 1 }
429 461
430sub button_down { 462sub invoke_button_down {
431 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
432 464
433 $self->focus_in; 465 $self->grab_focus;
434}
435 466
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
440sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
484
485sub find_widget {
486 my ($self, $x, $y) = @_;
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496
497sub set_parent {
498 my ($self, $parent) = @_;
499
500 Scalar::Util::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible};
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
441 535
442sub draw { 536sub draw {
443 my ($self) = @_; 537 my ($self) = @_;
444 538
445 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
446 548
447 glPushMatrix; 549 glPushMatrix;
448 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
449 $self->_draw;
450 glPopMatrix;
451 551
452 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
453 my ($x, $y) = @$self{qw(x y)};
454
455 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
456 glEnable GL_BLEND; 554 glEnable GL_BLEND;
457 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
458 glBegin GL_QUADS; 556 glBegin GL_QUADS;
459 glVertex $x , $y; 557 glVertex 0 , 0;
460 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
461 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
462 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
463 glEnd; 561 glEnd;
464 glDisable GL_BLEND; 562 glDisable GL_BLEND;
465 } 563 }
466 564
467 if ($ENV{PCLIENT_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
468 glPushMatrix; 566 glPushMatrix;
469 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
471 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
472 glVertex 0 , 0; 570 glVertex 0 , 0;
473 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
474 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
475 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
476 glEnd; 574 glEnd;
477 glPopMatrix; 575 glPopMatrix;
478 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
479 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
480} 581}
481 582
482sub _draw { 583sub _draw {
483 my ($self) = @_; 584 my ($self) = @_;
484 585
485 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
486} 587}
487 588
488sub find_widget {
489 my ($self, $x, $y) = @_;
490
491 return () unless $self->{can_events};
492
493 return $self
494 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497 ()
498}
499
500sub set_parent {
501 my ($self, $parent) = @_;
502
503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 589sub DESTROY {
558 my ($self) = @_; 590 my ($self) = @_;
559 591
592 return if CFClient::in_destruct;
593
560 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
561 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
562} 598}
563 599
564############################################################################# 600#############################################################################
565 601
566package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
591 627
592 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
593 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
594 630
595 glEnable GL_BLEND; 631 glEnable GL_BLEND;
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597 glColor @$color; 633 glColor_premultiply @$color;
598 634
599 glBegin GL_QUADS; 635 glBegin GL_QUADS;
600 glVertex 0 , 0; 636 glVertex 0 , 0;
601 glVertex 0 , $h; 637 glVertex 0 , $h;
602 glVertex $w, $h; 638 glVertex $w, $h;
… …
617 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
619} 655}
620 656
621sub size_request { 657sub size_request {
622 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
623} 661}
624 662
625sub draw { } 663sub draw { }
626 664
627############################################################################# 665#############################################################################
… …
631our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
632 670
633sub new { 671sub new {
634 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
635 673
636 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
637 675
638 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
639 children => [], 677 children => [],
640 can_events => 0, 678 can_events => 0,
641 %arg, 679 %arg,
642 ); 680 );
681
643 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
644 684
645 $self 685 $self
646} 686}
647 687
648sub add { 688sub add {
… …
656 $self->{children} = [ 696 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
659 ]; 699 ];
660 700
661 $self->check_size (1); 701 $self->realloc;
662 $self->update;
663} 702}
664 703
665sub children { 704sub children {
666 @{ $_[0]{children} } 705 @{ $_[0]{children} }
667} 706}
… …
672 delete $child->{parent}; 711 delete $child->{parent};
673 $child->hide; 712 $child->hide;
674 713
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 715
677 $self->check_size (1); 716 $self->realloc;
678 $self->update;
679} 717}
680 718
681sub clear { 719sub clear {
682 my ($self) = @_; 720 my ($self) = @_;
683 721
… …
687 for (@$children) { 725 for (@$children) {
688 delete $_->{parent}; 726 delete $_->{parent};
689 $_->hide; 727 $_->hide;
690 } 728 }
691 729
692 $self->check_size; 730 $self->realloc;
693 $self->update;
694} 731}
695 732
696sub find_widget { 733sub find_widget {
697 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
698 735
699 $x -= $self->{x}; 736 $x -= $self->{x};
700 $y -= $self->{y}; 737 $y -= $self->{y};
701 738
702 my $res; 739 my $res;
703 740
704 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
705 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
706 and return $res; 743 and return $res;
707 } 744 }
708 745
709 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
730} 767}
731 768
732sub add { 769sub add {
733 my ($self, $child) = @_; 770 my ($self, $child) = @_;
734 771
735 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
736
737 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
738} 774}
739 775
740sub remove { 776sub remove {
741 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
750 786
751sub size_request { 787sub size_request {
752 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
753} 789}
754 790
755sub size_allocate { 791sub invoke_size_allocate {
756 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
757 793
758 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
759} 797}
760 798
761############################################################################# 799#############################################################################
800
801# back-buffered drawing area
762 802
763package CFClient::UI::Window; 803package CFClient::UI::Window;
764 804
765our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
766 806
… …
777 817
778 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
779 $self->SUPER::update; 819 $self->SUPER::update;
780} 820}
781 821
782sub size_allocate { 822sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
784 824
785 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
787} 828}
788 829
789sub _render { 830sub _render {
831 my ($self) = @_;
832
790 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
791} 834}
792 835
793sub render_child { 836sub render_child {
794 my ($self) = @_; 837 my ($self) = @_;
795 838
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
799 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
800 $self->_render; 850 $self->_render;
801 }; 851 };
802} 852}
803 853
804sub _draw { 854sub _draw {
805 my ($self) = @_; 855 my ($self) = @_;
806 856
807 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
808 858
809 my $tex = $self->{texture} 859 my $tex = $self->{texture}
810 or return; 860 or return;
811 861
812 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
815 865
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 867
818 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
819} 869}
… …
835} 885}
836 886
837sub size_request { 887sub size_request {
838 my ($self) = @_; 888 my ($self) = @_;
839 889
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 891
842 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
843} 893 $h = 10 if $self->{scroll_y};
844 894
895 ($w, $h)
896}
897
845sub size_allocate { 898sub invoke_size_allocate {
846 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
847 900
901 my $child = $self->child;
902
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 905
851 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
852 $self->update; 907 $self->update;
908
909 1
853} 910}
854 911
855sub set_offset { 912sub set_offset {
856 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
857 914
… …
890} 947}
891 948
892sub _render { 949sub _render {
893 my ($self) = @_; 950 my ($self) = @_;
894 951
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
954
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 956
897 $self->SUPER::_render; 957 $self->SUPER::_render;
898} 958}
899 959
… …
902package CFClient::UI::ScrolledWindow; 962package CFClient::UI::ScrolledWindow;
903 963
904our @ISA = CFClient::UI::HBox::; 964our @ISA = CFClient::UI::HBox::;
905 965
906sub new { 966sub new {
907 my $class = shift; 967 my ($class, %arg) = @_;
968
969 my $child = delete $arg{child};
908 970
909 my $self; 971 my $self;
910 972
911 my $slider = new CFClient::UI::Slider 973 my $slider = new CFClient::UI::Slider
912 vertical => 1, 974 vertical => 1,
… …
917 ; 979 ;
918 980
919 $self = $class->SUPER::new ( 981 $self = $class->SUPER::new (
920 vp => (new CFClient::UI::ViewPort expand => 1), 982 vp => (new CFClient::UI::ViewPort expand => 1),
921 slider => $slider, 983 slider => $slider,
922 @_, 984 %arg,
923 ); 985 );
924 986
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider}); 987 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child;
928 989
929 $self 990 $self
930} 991}
931 992
993#TODO# update range on size_allocate depending on child
994
995sub add {
996 my ($self, $widget) = @_;
997
998 $self->{vp}->add ($self->{child} = $widget);
999}
1000
1001sub update_slider {
1002 my ($self) = @_;
1003
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005}
1006
932sub update { 1007sub update {
933 my ($self) = @_; 1008 my ($self) = @_;
934 1009
935 $self->SUPER::update; 1010 $self->SUPER::update;
936 1011
937 # todo: overwrite size_allocate of child 1012 $self->update_slider;
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940} 1013}
941 1014
942sub size_allocate { 1015sub invoke_size_allocate {
943 my ($self, $w, $h) = @_; 1016 my ($self, $w, $h) = @_;
944 1017
1018 $self->update_slider;
1019
945 $self->SUPER::size_allocate ($w, $h); 1020 $self->SUPER::invoke_size_allocate ($w, $h)
946
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1021}
950
951#TODO# update range on size_allocate depending on child
952# update viewport offset on scroll
953 1022
954############################################################################# 1023#############################################################################
955 1024
956package CFClient::UI::Frame; 1025package CFClient::UI::Frame;
957 1026
… …
973 1042
974 if ($self->{bg}) { 1043 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)}; 1044 my ($w, $h) = @$self{qw(w h)};
976 1045
977 glEnable GL_BLEND; 1046 glEnable GL_BLEND;
978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1047 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979 glColor @{ $self->{bg} }; 1048 glColor_premultiply @{ $self->{bg} };
980 1049
981 glBegin GL_QUADS; 1050 glBegin GL_QUADS;
982 glVertex 0 , 0; 1051 glVertex 0 , 0;
983 glVertex 0 , $h; 1052 glVertex 0 , $h;
984 glVertex $w, $h; 1053 glVertex $w, $h;
… …
997 1066
998our @ISA = CFClient::UI::Bin::; 1067our @ISA = CFClient::UI::Bin::;
999 1068
1000use CFClient::OpenGL; 1069use CFClient::OpenGL;
1001 1070
1002my @tex = 1071my $bg =
1072 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1073 mipmap => 1, wrap => 1;
1074
1075my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1077 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1078
1006sub new { 1079sub new {
1007 my $class = shift; 1080 my ($class, %arg) = @_;
1008
1009 # TODO: user_x, user_y, overwrite moveto?
1010 1081
1011 my $self = $class->SUPER::new ( 1082 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1083 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1084 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1085 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1086 can_events => 1,
1017 @_ 1087 min_w => 64,
1088 min_h => 32,
1089 %arg,
1018 ); 1090 );
1019 1091
1020 $self->{title} &&= new CFClient::UI::Label 1092 $self->{title_widget} = new CFClient::UI::Label
1021 align => 0, 1093 align => 0,
1022 valign => 1, 1094 valign => 1,
1023 text => $self->{title}, 1095 text => $self->{title},
1024 fontsize => $self->{border}; 1096 fontsize => $self->{border},
1097 if exists $self->{title};
1098
1099 if ($self->{has_close_button}) {
1100 $self->{close_button} =
1101 new CFClient::UI::ImageButton
1102 path => 'x1_close.png',
1103 on_activate => sub { $self->emit ("delete") };
1104
1105 $self->CFClient::UI::Container::add ($self->{close_button});
1106 }
1025 1107
1026 $self 1108 $self
1109}
1110
1111sub add {
1112 my ($self, @widgets) = @_;
1113
1114 $self->SUPER::add (@widgets);
1115 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1116 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1027} 1117}
1028 1118
1029sub border { 1119sub border {
1030 int $_[0]{border} * $::FONTSIZE 1120 int $_[0]{border} * $::FONTSIZE
1031} 1121}
1032 1122
1033sub size_request { 1123sub size_request {
1034 my ($self) = @_; 1124 my ($self) = @_;
1125
1126 $self->{title_widget}->size_request
1127 if $self->{title_widget};
1128
1129 $self->{close_button}->size_request
1130 if $self->{close_button};
1035 1131
1036 my ($w, $h) = $self->SUPER::size_request; 1132 my ($w, $h) = $self->SUPER::size_request;
1037 1133
1038 ( 1134 (
1039 $w + $self->border * 2, 1135 $w + $self->border * 2,
1040 $h + $self->border * 2, 1136 $h + $self->border * 2,
1041 ) 1137 )
1042} 1138}
1043 1139
1044sub size_allocate { 1140sub invoke_size_allocate {
1045 my ($self, $w, $h) = @_; 1141 my ($self, $w, $h) = @_;
1046 1142
1143 if ($self->{title_widget}) {
1144 $self->{title_widget}{w} = $w;
1145 $self->{title_widget}{h} = $h;
1146 $self->{title_widget}->invoke_size_allocate ($w, $h);
1147 }
1148
1149 my $border = $self->border;
1150
1047 $h -= List::Util::max 0, $self->border * 2; 1151 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1152 $w -= List::Util::max 0, $border * 2;
1049 1153
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051 if $self->{title};
1052
1053 $self->child->configure ($self->border, $self->border, $w, $h); 1154 $self->child->configure ($border, $border, $w, $h);
1054}
1055 1155
1156 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1157 if $self->{close_button};
1158
1159 1
1160}
1161
1162sub invoke_delete {
1163 my ($self) = @_;
1164
1165 $self->hide;
1166
1167 1
1168}
1169
1056sub button_down { 1170sub invoke_button_down {
1057 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
1058 1172
1059 my ($w, $h) = @$self{qw(w h)}; 1173 my ($w, $h) = @$self{qw(w h)};
1060 my $border = $self->border; 1174 my $border = $self->border;
1061 1175
… …
1074 my ($ev, $x, $y) = @_; 1188 my ($ev, $x, $y) = @_;
1075 1189
1076 my $dx = $ev->{x} - $ox; 1190 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1191 my $dy = $ev->{y} - $oy;
1078 1192
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1193 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1194 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1195
1084 $self->check_size; 1196 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1197 $self->realloc;
1085 }; 1198 };
1086 1199
1087 } elsif ($lr ^ $td) { 1200 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1201 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1202 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1204 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1205 my ($ev, $x, $y) = @_;
1093 1206
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1207 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1208
1096 $self->{user_x} = $bx + $x - $ox; 1209 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy; 1210 # HACK: the next line is required to enforce placement
1098 $self->move ($self->{user_x}, $self->{user_y}); 1211 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099 $self->update;
1100 }; 1212 };
1213 } else {
1214 return 0;
1215 }
1216
1101 } 1217 1
1102} 1218}
1103 1219
1104sub button_up { 1220sub invoke_button_up {
1105 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1106 1222
1107 delete $self->{motion}; 1223 ! ! delete $self->{motion}
1108} 1224}
1109 1225
1110sub mouse_motion { 1226sub invoke_mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1227 my ($self, $ev, $x, $y) = @_;
1112 1228
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1229 $self->{motion}->($ev, $x, $y) if $self->{motion};
1230
1231 ! ! $self->{motion}
1114} 1232}
1115 1233
1116sub _draw { 1234sub _draw {
1117 my ($self) = @_; 1235 my ($self) = @_;
1118 1236
1237 my $child = $self->{children}[0];
1238
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1239 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1240 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1241
1122 glEnable GL_TEXTURE_2D; 1242 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1244
1125 my $border = $self->border; 1245 my $border = $self->border;
1126 1246
1127 glColor @{ $self->{border_bg} }; 1247 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1248 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1249 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1250 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1251 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1252
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1253 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1254 glColor @{ $self->{bg} };
1135 1255
1136 # TODO: repeat texture not scale 1256 # TODO: repeat texture not scale
1257 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1258 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1259 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1260 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1261 }
1147 1262
1148 glDisable GL_TEXTURE_2D; 1263 glDisable GL_TEXTURE_2D;
1149 1264
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1265 $child->draw;
1266
1267 if ($self->{title_widget}) {
1268 glTranslate 0, $border - $self->{h};
1269 $self->{title_widget}->_draw;
1270
1271 glTranslate 0, - ($border - $self->{h});
1272 }
1273
1274 $self->{close_button}->draw
1275 if $self->{close_button};
1153} 1276}
1154 1277
1155############################################################################# 1278#############################################################################
1156 1279
1157package CFClient::UI::Table; 1280package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1302 my ($self, $x, $y, $child) = @_;
1180 1303
1181 $child->set_parent ($self); 1304 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1305 $self->{children}[$y][$x] = $child;
1183 1306
1184 $self->check_size (1); 1307 $self->realloc;
1308}
1309
1310sub remove {
1311 my ($self, $child) = @_;
1312
1313 # TODO: not yet implemented
1185} 1314}
1186 1315
1187# TODO: move to container class maybe? send children a signal on removal? 1316# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1317sub clear {
1189 my ($self) = @_; 1318 my ($self) = @_;
… …
1194 for (@children) { 1323 for (@children) {
1195 delete $_->{parent}; 1324 delete $_->{parent};
1196 $_->hide; 1325 $_->hide;
1197 } 1326 }
1198 1327
1199 $self->check_size (1); 1328 $self->realloc;
1200 $self->update;
1201} 1329}
1202 1330
1203sub get_wh { 1331sub get_wh {
1204 my ($self) = @_; 1332 my ($self) = @_;
1205 1333
… …
1231 (sum @$ws), 1359 (sum @$ws),
1232 (sum @$hs), 1360 (sum @$hs),
1233 ) 1361 )
1234} 1362}
1235 1363
1236sub size_allocate { 1364sub invoke_size_allocate {
1237 my ($self, $w, $h) = @_; 1365 my ($self, $w, $h) = @_;
1238 1366
1239 my ($ws, $hs) = $self->get_wh; 1367 my ($ws, $hs) = $self->get_wh;
1240 1368
1241 my $req_w = (sum @$ws) || 1; 1369 my $req_w = (sum @$ws) || 1;
… …
1273 } 1401 }
1274 1402
1275 $y += $row_h; 1403 $y += $row_h;
1276 } 1404 }
1277 1405
1406 1
1278} 1407}
1279 1408
1280sub find_widget { 1409sub find_widget {
1281 my ($self, $x, $y) = @_; 1410 my ($self, $x, $y) = @_;
1282 1411
… …
1301 } 1430 }
1302} 1431}
1303 1432
1304############################################################################# 1433#############################################################################
1305 1434
1435package CFClient::UI::Box;
1436
1437our @ISA = CFClient::UI::Container::;
1438
1439sub size_request {
1440 my ($self) = @_;
1441
1442 $self->{vertical}
1443 ? (
1444 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1445 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1446 )
1447 : (
1448 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1449 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1450 )
1451}
1452
1453sub invoke_size_allocate {
1454 my ($self, $w, $h) = @_;
1455
1456 my $space = $self->{vertical} ? $h : $w;
1457 my @children = $self->visible_children;
1458
1459 my @req;
1460
1461 if ($self->{homogeneous}) {
1462 @req = ($space / (@children || 1)) x @children;
1463 } else {
1464 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1465 my $req = List::Util::sum @req;
1466
1467 if ($req > $space) {
1468 # ah well, not enough space
1469 $_ *= $space / $req for @req;
1470 } else {
1471 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1472
1473 $space = ($space - $req) / $expand; # remaining space to give away
1474
1475 $req[$_] += $space * $children[$_]{expand}
1476 for 0 .. $#children;
1477 }
1478 }
1479
1480 CFClient::UI::harmonize \@req;
1481
1482 my $pos = 0;
1483 for (0 .. $#children) {
1484 my $alloc = $req[$_];
1485 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1486
1487 $pos += $alloc;
1488 }
1489
1490 1
1491}
1492
1493#############################################################################
1494
1306package CFClient::UI::HBox; 1495package CFClient::UI::HBox;
1307 1496
1308# TODO: wrap into common Box base class
1309
1310our @ISA = CFClient::UI::Container::; 1497our @ISA = CFClient::UI::Box::;
1311 1498
1312sub size_request { 1499sub new {
1313 my ($self) = @_; 1500 my $class = shift;
1314 1501
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1502 $class->SUPER::new (
1316 1503 vertical => 0,
1317 ( 1504 @_,
1318 (List::Util::sum map $_->[0], @alloc),
1319 (List::Util::max map $_->[1], @alloc),
1320 ) 1505 )
1321} 1506}
1322 1507
1323sub size_allocate {
1324 my ($self, $w, $h) = @_;
1325
1326 ($h, $w) = ($w, $h);
1327
1328 my $children = $self->{children};
1329
1330 my @h = map $_->{req_w}, @$children;
1331
1332 my $req_h = List::Util::sum @h;
1333
1334 if ($req_h > $h) {
1335 # ah well, not enough space
1336 $_ *= $h / $req_h for @h;
1337 } else {
1338 my $exp = List::Util::sum map $_->{expand}, @$children;
1339 $exp ||= 1;
1340
1341 for (0 .. $#$children) {
1342 my $child = $children->[$_];
1343
1344 my $alloc_h = $h[$_];
1345 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346 $h[$_] = $alloc_h;
1347 }
1348 }
1349
1350 CFClient::UI::harmonize \@h;
1351
1352 my $y = 0;
1353 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_];
1356 $child->configure ($y, 0, $h, $w);
1357
1358 $y += $h;
1359 }
1360
1361 1
1362}
1363
1364############################################################################# 1508#############################################################################
1365 1509
1366package CFClient::UI::VBox; 1510package CFClient::UI::VBox;
1367 1511
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1512our @ISA = CFClient::UI::Box::;
1371 1513
1372sub size_request { 1514sub new {
1373 my ($self) = @_; 1515 my $class = shift;
1374 1516
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1517 $class->SUPER::new (
1376 1518 vertical => 1,
1377 ( 1519 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1520 )
1381}
1382
1383sub size_allocate {
1384 my ($self, $w, $h) = @_;
1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388 my $children = $self->{children};
1389
1390 my @h = map $_->{req_h}, @$children;
1391
1392 my $req_h = List::Util::sum @h;
1393
1394 if ($req_h > $h) {
1395 # ah well, not enough space
1396 $_ *= $h / $req_h for @h;
1397 } else {
1398 my $exp = List::Util::sum map $_->{expand}, @$children;
1399 $exp ||= 1;
1400
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403
1404 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405 }
1406 }
1407
1408 CFClient::UI::harmonize \@h;
1409
1410 my $y = 0;
1411 for (0 .. $#$children) {
1412 my $child = $children->[$_];
1413 my $h = $h[$_];
1414 $child->configure (0, $y, $w, $h);
1415
1416 $y += $h;
1417 }
1418
1419 1
1420} 1521}
1421 1522
1422############################################################################# 1523#############################################################################
1423 1524
1424package CFClient::UI::Label; 1525package CFClient::UI::Label;
… …
1441 ellipsise => 3, # end 1542 ellipsise => 3, # end
1442 layout => (new CFClient::Layout), 1543 layout => (new CFClient::Layout),
1443 fontsize => 1, 1544 fontsize => 1,
1444 align => -1, 1545 align => -1,
1445 valign => -1, 1546 valign => -1,
1446 padding => 2, 1547 padding_x => 2,
1548 padding_y => 2,
1447 can_events => 0, 1549 can_events => 0,
1448 %arg 1550 %arg
1449 ); 1551 );
1450 1552
1451 if (exists $self->{template}) { 1553 if (exists $self->{template}) {
… …
1478 1580
1479 delete $self->{texture}; 1581 delete $self->{texture};
1480 $self->SUPER::update; 1582 $self->SUPER::update;
1481} 1583}
1482 1584
1585sub realloc {
1586 my ($self) = @_;
1587
1588 delete $self->{ox};
1589 $self->SUPER::realloc;
1590}
1591
1483sub set_text { 1592sub set_text {
1484 my ($self, $text) = @_; 1593 my ($self, $text) = @_;
1485 1594
1486 return if $self->{text} eq "T$text"; 1595 return if $self->{text} eq "T$text";
1487 $self->{text} = "T$text"; 1596 $self->{text} = "T$text";
1488 1597
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1598 $self->{layout}->set_text ($text);
1491 1599
1600 delete $self->{size_req};
1601 $self->realloc;
1492 $self->update; 1602 $self->update;
1493 $self->check_size;
1494} 1603}
1495 1604
1496sub set_markup { 1605sub set_markup {
1497 my ($self, $markup) = @_; 1606 my ($self, $markup) = @_;
1498 1607
1499 return if $self->{text} eq "M$markup"; 1608 return if $self->{text} eq "M$markup";
1500 $self->{text} = "M$markup"; 1609 $self->{text} = "M$markup";
1501 1610
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1611 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1612
1504 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1506 1614
1615 delete $self->{size_req};
1616 $self->realloc;
1507 $self->update; 1617 $self->update;
1508 $self->check_size;
1509} 1618}
1510 1619
1511sub size_request { 1620sub size_request {
1512 my ($self) = @_; 1621 my ($self) = @_;
1513 1622
1623 $self->{size_req} ||= do {
1514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1515 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1516 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1517 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1518 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1519 1629
1520 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1521 1631
1522 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1523 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1634 $self->{template}->set_width ($self->{max_w} || -1);
1524 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1525 1636
1526 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1527 1638
1528 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
1529 $h = List::Util::max $h, $h2; 1640 $h = List::Util::max $h, $h2;
1641 }
1642
1643 [$w, $h]
1530 } 1644 };
1531 1645
1532 ( 1646 @{ $self->{size_req} }
1533 $w + $self->{padding} * 2,
1534 $h + $self->{padding} * 2,
1535 )
1536} 1647}
1537 1648
1649sub baseline_shift {
1650 $_[0]{layout}->descent
1651}
1652
1538sub size_allocate { 1653sub invoke_size_allocate {
1539 my ($self, $w, $h) = @_; 1654 my ($self, $w, $h) = @_;
1540 1655
1656 delete $self->{ox};
1657
1541 delete $self->{texture}; 1658 delete $self->{texture}
1659 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1660
1661 1
1542} 1662}
1543 1663
1544sub set_fontsize { 1664sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1665 my ($self, $fontsize) = @_;
1546 1666
1547 $self->{fontsize} = $fontsize; 1667 $self->{fontsize} = $fontsize;
1668 delete $self->{size_req};
1548 delete $self->{texture}; 1669 delete $self->{texture};
1549 1670
1550 $self->update; 1671 $self->realloc;
1551 $self->check_size; 1672}
1673
1674sub reconfigure {
1675 my ($self) = @_;
1676
1677 delete $self->{size_req};
1678 delete $self->{texture};
1679
1680 $self->SUPER::reconfigure;
1552} 1681}
1553 1682
1554sub _draw { 1683sub _draw {
1555 my ($self) = @_; 1684 my ($self) = @_;
1556 1685
1557 $self->SUPER::_draw; # draw background, if applicable 1686 $self->SUPER::_draw; # draw background, if applicable
1558 1687
1559 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1560 $self->{layout}->set_foreground (@{$self->{fg}}); 1689 $self->{layout}->set_foreground (@{$self->{fg}});
1561 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1562 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1695
1567 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1696 [$self->{layout}->size]
1568
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1571 : ($self->{w} - $tex->{w}) * 0.5);
1572
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1575 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1578 }; 1697 };
1579 1698
1580 glEnable GL_TEXTURE_2D; 1699 unless (exists $self->{ox}) {
1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1702 : ($self->{w} - $size->[0]) * 0.5);
1582 1703
1583 if ($tex->{format} == GL_ALPHA) { 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1584 glColor @{$self->{fg}}; 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1585 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 : ($self->{h} - $size->[1]) * 0.5);
1586 } else {
1587 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1588 } 1707 };
1589 1708
1590 glDisable GL_TEXTURE_2D; 1709 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711
1712 $self->{layout}->render ($self->{ox}, $self->{oy});
1591} 1713}
1592 1714
1593############################################################################# 1715#############################################################################
1594 1716
1595package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
1609 can_hover => 1, 1731 can_hover => 1,
1610 can_focus => 1, 1732 can_focus => 1,
1611 valign => 0, 1733 valign => 0,
1612 can_events => 1, 1734 can_events => 1,
1613 #text => ... 1735 #text => ...
1736 #hidden => "*",
1614 @_ 1737 @_
1615 ) 1738 )
1616} 1739}
1617 1740
1618sub _set_text { 1741sub _set_text {
… …
1620 1743
1621 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1622 1745
1623 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1624 1747
1625 delete $self->{texture};
1626
1627 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1628 $self->{text} = $text; 1749 $self->{text} = $text;
1629 1750
1630 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1631 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1632 1754
1633 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1634} 1759}
1635 1760
1636sub set_text { 1761sub set_text {
1637 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1638 1763
1639 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1765 $self->_set_text ($text);
1641 $self->update;
1642 $self->check_size;
1643} 1766}
1644 1767
1645sub get_text { 1768sub get_text {
1646 $_[0]{text} 1769 $_[0]{text}
1647} 1770}
… …
1652 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1653 1776
1654 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1655} 1778}
1656 1779
1657sub key_down { 1780sub invoke_key_down {
1658 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1659 1782
1660 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1661 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1662 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1674 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1675 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1676 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1677 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1678 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1679 $self->_emit ('escape'); 1802 $self->emit ('escape');
1680 } elsif ($uni) { 1803 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1682 } 1807 }
1683 1808
1684 $self->_set_text ($text); 1809 $self->_set_text ($text);
1685 $self->update;
1686 $self->check_size;
1687}
1688 1810
1811 $self->realloc;
1812
1813 1
1814}
1815
1689sub focus_in { 1816sub invoke_focus_in {
1690 my ($self) = @_; 1817 my ($self) = @_;
1691 1818
1692 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1693 1820
1694 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1695} 1822}
1696 1823
1697sub button_down { 1824sub invoke_button_down {
1698 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1699 1826
1700 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1701 1828
1702 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1703 1830
1704 # byte-index to char-index 1831 # byte-index to char-index
1705 my $text = $self->{text}; 1832 my $text = $self->{text};
1706 utf8::encode $text; 1833 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1707 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length $text;
1708 1835
1709 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1710 $self->update; 1837 $self->update;
1838
1839 1
1711} 1840}
1712 1841
1713sub mouse_motion { 1842sub invoke_mouse_motion {
1714 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1715# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1716} 1847}
1717 1848
1718sub _draw { 1849sub _draw {
1719 my ($self) = @_; 1850 my ($self) = @_;
1720 1851
1721 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1722 1853
1723 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1724 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1725 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1726 } else { 1857 } else {
1727 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1728 } 1859 }
1729 1860
1730 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1732 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1733 glVertex 0 , 0; 1864 glVertex 0 , 0;
1734 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1735 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1736 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1761 1892
1762our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1763 1894
1764use CFClient::OpenGL; 1895use CFClient::OpenGL;
1765 1896
1766sub key_down { 1897sub invoke_key_down {
1767 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1768 1899
1769 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1770 1901
1771 if ($sym == 13) { 1902 if ($sym == 13) {
1772 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1773 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1774 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1775 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1776 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1777 $self->update; 1909 $self->update;
1778 1910
1779 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1780 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1781 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1797 } else { 1929 } else {
1798 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1799 } 1931 }
1800 1932
1801 } else { 1933 } else {
1802 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1803 } 1937 1
1804
1805} 1938}
1806 1939
1807############################################################################# 1940#############################################################################
1808 1941
1809package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1818 1951
1819sub new { 1952sub new {
1820 my $class = shift; 1953 my $class = shift;
1821 1954
1822 $class->SUPER::new ( 1955 $class->SUPER::new (
1823 padding => 4, 1956 padding_x => 4,
1957 padding_y => 4,
1824 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1825 active_fg => [0, 0, 1], 1959 active_fg => [0, 0, 1],
1826 can_hover => 1, 1960 can_hover => 1,
1827 align => 0, 1961 align => 0,
1828 valign => 0, 1962 valign => 0,
1829 can_events => 1, 1963 can_events => 1,
1830 @_ 1964 @_
1831 ) 1965 )
1832} 1966}
1833 1967
1834sub activate { }
1835
1836sub button_up { 1968sub invoke_button_up {
1837 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1838 1970
1839 $self->emit ("activate") 1971 $self->emit ("activate")
1840 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1841 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1974
1975 1
1842} 1976}
1843 1977
1844sub _draw { 1978sub _draw {
1845 my ($self) = @_; 1979 my ($self) = @_;
1846 1980
1847 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1848
1849 if ($GRAB == $self) {
1850 $self->{fg} = $self->{active_fg};
1851 }
1852 1982
1853 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1855 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1856 1986
… …
1861 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1862} 1992}
1863 1993
1864############################################################################# 1994#############################################################################
1865 1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
2028}
2029
2030#############################################################################
2031
1866package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1867 2033
1868our @ISA = CFClient::UI::DrawBG::; 2034our @ISA = CFClient::UI::DrawBG::;
1869 2035
1870my @tex = 2036my @tex =
… …
1875 2041
1876sub new { 2042sub new {
1877 my $class = shift; 2043 my $class = shift;
1878 2044
1879 $class->SUPER::new ( 2045 $class->SUPER::new (
1880 padding => 2, 2046 padding_x => 2,
2047 padding_y => 2,
1881 fg => [1, 1, 1], 2048 fg => [1, 1, 1],
1882 active_fg => [1, 1, 0], 2049 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2], 2050 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5], 2051 active_bg => [1, 1, 1, 0.5],
1885 state => 0, 2052 state => 0,
… …
1889} 2056}
1890 2057
1891sub size_request { 2058sub size_request {
1892 my ($self) = @_; 2059 my ($self) = @_;
1893 2060
1894 ($self->{padding} * 2 + 6) x 2 2061 (6) x 2
1895} 2062}
1896 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
1897sub button_down { 2072sub invoke_button_down {
1898 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
1899 2074
1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902 $self->{state} = !$self->{state}; 2077 $self->toggle;
1903 $self->_emit (changed => $self->{state}); 2078 } else {
2079 return 0
2080 }
2081
1904 } 2082 1
1905} 2083}
1906 2084
1907sub _draw { 2085sub _draw {
1908 my ($self) = @_; 2086 my ($self) = @_;
1909 2087
1910 $self->SUPER::_draw; 2088 $self->SUPER::_draw;
1911 2089
1912 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2090 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913 2091
1914 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2092 my ($w, $h) = @$self{qw(w h)};
2093
2094 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1915 2095
1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2096 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917 2097
1918 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2098 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919 2099
… …
1927package CFClient::UI::Image; 2107package CFClient::UI::Image;
1928 2108
1929our @ISA = CFClient::UI::Base::; 2109our @ISA = CFClient::UI::Base::;
1930 2110
1931use CFClient::OpenGL; 2111use CFClient::OpenGL;
1932use Carp qw/confess/;
1933 2112
1934our %loaded_images; 2113our %texture_cache;
1935 2114
1936sub new { 2115sub new {
1937 my $class = shift; 2116 my $class = shift;
1938 2117
1939 my $self = $class->SUPER::new (can_events => 0, @_); 2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
1940 2122
1941 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2123 $self->{path}
2124 or Carp::croak "required attribute 'path' not set";
1942 2125
1943 $loaded_images{$self->{image}} ||= 2126 $self->{tex} = $texture_cache{$self->{path}} ||=
1944 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1945 2128
1946 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
1947 2130
1948 Scalar::Util::weaken $loaded_images{$self->{image}}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1949
1950 $self->{aspect} = $tex->{w} / $tex->{h};
1951 2132
1952 $self 2133 $self
1953} 2134}
1954 2135
1955sub size_request { 2136sub size_request {
1956 my ($self) = @_; 2137 my ($self) = @_;
1957 2138
1958 ($self->{tex}->{w}, $self->{tex}->{h}) 2139 ($self->{tex}{w}, $self->{tex}{h})
1959} 2140}
1960 2141
1961sub _draw { 2142sub _draw {
1962 my ($self) = @_; 2143 my ($self) = @_;
1963 2144
… …
2072 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2073 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2074 2255
2075 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2076 my $h2 = $self->{h} * (1 - $ycut2); 2257 my $h2 = $self->{h} * (1 - $ycut2);
2258 my $h3 = $self->{h};
2259
2260 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2077 2261
2078 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2079 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2080 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
2081 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2266 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2082 2267
2083 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2268 glBindTexture GL_TEXTURE_2D, $t1->{name};
2084 glBegin GL_QUADS; 2269 glBegin GL_QUADS;
… …
2099 2284
2100 if ($t3) { 2285 if ($t3) {
2101 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2102 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2103 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2104 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2105 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2106 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2107 glEnd; 2292 glEnd;
2108 } 2293 }
2109 2294
2110 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
2184 fg => [1, 1, 1], 2369 fg => [1, 1, 1],
2185 active_fg => [0, 0, 0], 2370 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2], 2371 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5], 2372 active_bg => [1, 1, 1, 0.5],
2188 range => [0, 0, 100, 10, 0], 2373 range => [0, 0, 100, 10, 0],
2189 req_w => $::WIDTH / 80, 2374 min_w => $::WIDTH / 80,
2190 req_h => $::WIDTH / 80, 2375 min_h => $::WIDTH / 80,
2191 vertical => 0, 2376 vertical => 0,
2192 can_hover => 1, 2377 can_hover => 1,
2193 inner_pad => 0.02, 2378 inner_pad => 0.02,
2194 @_ 2379 @_
2195 ); 2380 );
… …
2203sub set_range { 2388sub set_range {
2204 my ($self, $range) = @_; 2389 my ($self, $range) = @_;
2205 2390
2206 ($range, $self->{range}) = ($self->{range}, $range); 2391 ($range, $self->{range}) = ($self->{range}, $range);
2207 2392
2208 $self->update
2209 if "@$range" ne "@{$self->{range}}"; 2393 if ("@$range" ne "@{$self->{range}}") {
2394 $self->update;
2395 $self->set_value ($self->{range}[0]);
2396 }
2210} 2397}
2211 2398
2212sub set_value { 2399sub set_value {
2213 my ($self, $value) = @_; 2400 my ($self, $value) = @_;
2214 2401
… …
2225 if $unit; 2412 if $unit;
2226 2413
2227 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2414 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2228 2415
2229 if ($value != $old_value) { 2416 if ($value != $old_value) {
2230 $self->_emit (changed => $value); 2417 $self->emit (changed => $value);
2231 $self->update; 2418 $self->update;
2232 } 2419 }
2233} 2420}
2234 2421
2235sub size_request { 2422sub size_request {
2236 my ($self) = @_; 2423 my ($self) = @_;
2237 2424
2238 my $w = $self->{req_w}; 2425 ($self->{req_w}, $self->{req_h})
2239 my $h = $self->{req_h};
2240
2241 $self->{vertical} ? ($h, $w) : ($w, $h)
2242} 2426}
2243 2427
2244sub button_down { 2428sub invoke_button_down {
2245 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2246 2430
2247 $self->SUPER::button_down ($ev, $x, $y); 2431 $self->SUPER::invoke_button_down ($ev, $x, $y);
2248 2432
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2433 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250 2434
2251 $self->mouse_motion ($ev, $x, $y); 2435 $self->invoke_mouse_motion ($ev, $x, $y)
2252} 2436}
2253 2437
2254sub mouse_motion { 2438sub invoke_mouse_motion {
2255 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2256 2440
2257 if ($GRAB == $self) { 2441 if ($GRAB == $self) {
2258 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2442 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2259 2443
2260 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2444 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261 2445
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2446 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263 2447
2264 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2448 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2449 } else {
2450 return 0;
2451 }
2452
2265 } 2453 1
2266} 2454}
2267 2455
2268sub update { 2456sub update {
2269 my ($self) = @_; 2457 my ($self) = @_;
2270 2458
2271 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2459 delete $self->{knob_w};
2460 $self->SUPER::update;
2461}
2462
2463sub _draw {
2464 my ($self) = @_;
2465
2466 unless ($self->{knob_w}) {
2272 $self->set_value ($self->{range}[0]); 2467 $self->set_value ($self->{range}[0]);
2273 2468
2274 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2469 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100; 2470 my $range = ($hi - $page - $lo) || 1e-100;
2276 2471
… …
2282 $value = ($value - $lo) / $range; 2477 $value = ($value - $lo) / $range;
2283 $value = $value * $self->{scale} + $self->{offset}; 2478 $value = $value * $self->{scale} + $self->{offset};
2284 2479
2285 $self->{knob_x} = $value - $knob_w * 0.5; 2480 $self->{knob_x} = $value - $knob_w * 0.5;
2286 $self->{knob_w} = $knob_w; 2481 $self->{knob_w} = $knob_w;
2287 }); 2482 }
2288
2289 $self->SUPER::update;
2290}
2291
2292sub _draw {
2293 my ($self) = @_;
2294 2483
2295 $self->SUPER::_draw (); 2484 $self->SUPER::_draw ();
2296 2485
2297 glScale $self->{w}, $self->{h}; 2486 glScale $self->{w}, $self->{h};
2298 2487
… …
2359sub set_range { shift->{slider}->set_range (@_) } 2548sub set_range { shift->{slider}->set_range (@_) }
2360sub set_value { shift->{slider}->set_value (@_) } 2549sub set_value { shift->{slider}->set_value (@_) }
2361 2550
2362############################################################################# 2551#############################################################################
2363 2552
2364package CFClient::UI::TextView; 2553package CFClient::UI::TextScroller;
2365 2554
2366our @ISA = CFClient::UI::HBox::; 2555our @ISA = CFClient::UI::HBox::;
2367 2556
2368use CFClient::OpenGL; 2557use CFClient::OpenGL;
2369 2558
… …
2371 my $class = shift; 2560 my $class = shift;
2372 2561
2373 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2374 fontsize => 1, 2563 fontsize => 1,
2375 can_events => 0, 2564 can_events => 0,
2565 indent => 0,
2376 #font => default_font 2566 #font => default_font
2377 @_, 2567 @_,
2378 2568
2379 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2380 par => [], 2570 par => [],
2381 height => 0, 2571 height => 0,
2382 children => [ 2572 children => [
2383 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2384 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
… …
2395 2585
2396 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2397 $self->reflow; 2587 $self->reflow;
2398} 2588}
2399 2589
2590sub size_request {
2591 my ($self) = @_;
2592
2593 my ($empty, $slider) = @{ $self->{children} };
2594
2595 local $self->{children} = [$empty, $slider];
2596 $self->SUPER::size_request
2597}
2598
2400sub size_allocate { 2599sub invoke_size_allocate {
2401 my ($self, $w, $h) = @_; 2600 my ($self, $w, $h) = @_;
2402 2601
2403 $self->SUPER::size_allocate ($w, $h); 2602 my ($empty, $slider, @other) = @{ $self->{children} };
2603 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2404 2604
2405 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2605 $self->{layout}->set_font ($self->{font}) if $self->{font};
2406 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2606 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $self->{layout}->set_width ($self->{children}[0]{w}); 2607 $self->{layout}->set_width ($empty->{w});
2608 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2408 2609
2409 $self->reflow; 2610 $self->reflow;
2410}
2411 2611
2412sub text_size { 2612 local $self->{children} = [$empty, $slider];
2413 my ($self, $text, $indent) = @_; 2613 $self->SUPER::invoke_size_allocate ($w, $h)
2614}
2615
2616sub get_layout {
2617 my ($self, $para) = @_;
2414 2618
2415 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2416 2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622 $layout->set_foreground (@{$para->{fg}});
2417 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2623 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2418 $layout->set_width ($self->{children}[0]{w} - $indent); 2624 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2625 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2419 $layout->set_markup ($text); 2626 $layout->set_markup ($para->{markup});
2627
2628 $layout->set_shapes (
2629 map
2630 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2631 @{$para->{widget}}
2420 2632 );
2633
2421 $layout->size 2634 $layout
2422} 2635}
2423 2636
2424sub reflow { 2637sub reflow {
2425 my ($self) = @_; 2638 my ($self) = @_;
2426 2639
… …
2435 $self->{children}[1]->set_value ($offset); 2648 $self->{children}[1]->set_value ($offset);
2436} 2649}
2437 2650
2438sub clear { 2651sub clear {
2439 my ($self) = @_; 2652 my ($self) = @_;
2653
2654 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other;
2440 2656
2441 $self->{par} = []; 2657 $self->{par} = [];
2442 $self->{height} = 0; 2658 $self->{height} = 0;
2443 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2444} 2660}
2445 2661
2446sub add_paragraph { 2662sub add_paragraph {
2447 my ($self, $color, $text, $indent) = @_; 2663 my ($self, $color, $para, $indent) = @_;
2448 2664
2449 for my $line (split /\n/, $text) { 2665 my ($text, @w) = ref $para ? @$para : $para;
2450 my ($w, $h) = $self->text_size ($line); 2666
2451 $self->{height} += $h; 2667 $para = {
2452 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2668 w => 1e10,
2669 wrapped => 1,
2670 fg => $color,
2671 indent => $indent,
2672 markup => $text,
2673 widget => \@w,
2453 } 2674 };
2454 2675
2455 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2676 $self->add (@w) if @w;
2677 push @{$self->{par}}, $para;
2678
2679 $self->{need_reflow}++;
2680 $self->update;
2681}
2682
2683sub scroll_to_bottom {
2684 my ($self) = @_;
2685
2686 $self->{scroll_to_bottom} = 1;
2687 $self->update;
2456} 2688}
2457 2689
2458sub update { 2690sub update {
2459 my ($self) = @_; 2691 my ($self) = @_;
2460 2692
… …
2462 2694
2463 return unless $self->{h} > 0; 2695 return unless $self->{h} > 0;
2464 2696
2465 delete $self->{texture}; 2697 delete $self->{texture};
2466 2698
2467 $ROOT->on_post_alloc ($self, sub { 2699 $ROOT->on_post_alloc ($self => sub {
2468 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2469 2701
2470 if (delete $self->{need_reflow}) { 2702 if (delete $self->{need_reflow}) {
2471 my $height = 0; 2703 my $height = 0;
2472 2704
2473 my $layout = $self->{layout};
2474
2475 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2476
2477 for (@{$self->{par}}) { 2705 for my $para (@{$self->{par}}) {
2478 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2479 $layout->set_width ($W - $_->[3]); 2707 my $layout = $self->get_layout ($para);
2480 $layout->set_markup ($_->[4]);
2481 my ($w, $h) = $layout->size; 2708 my ($w, $h) = $layout->size;
2482 $_->[0] = $w + $_->[3]; 2709
2483 $_->[1] = $h; 2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2484 } 2713 }
2485 2714
2486 $height += $_->[1]; 2715 $height += $para->{h};
2487 } 2716 }
2488 2717
2489 $self->{height} = $height; 2718 $self->{height} = $height;
2490 2719
2491 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2720 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2492 2721
2493 delete $self->{texture}; 2722 delete $self->{texture};
2494 } 2723 }
2495 2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2727 }
2728
2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2497 glClearColor 0.5, 0.5, 0.5, 0; 2730 glClearColor 0, 0, 0, 0;
2498 glClear GL_COLOR_BUFFER_BIT; 2731 glClear GL_COLOR_BUFFER_BIT;
2499 2732
2500 my $top = int $self->{children}[1]{range}[0]; 2733 my $top = int $self->{children}[1]{range}[0];
2501 2734
2502 my $y0 = $top; 2735 my $y0 = $top;
2503 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2504 2737
2505 my $y = 0; 2738 my $y = 0;
2506 2739
2507 my $layout = $self->{layout};
2508
2509 $layout->set_font ($self->{font}) if $self->{font};
2510
2511 glEnable GL_BLEND;
2512 #TODO# not correct in windows where rgba is forced off
2513 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2514
2515 for my $par (@{$self->{par}}) { 2740 for my $para (@{$self->{par}}) {
2516 my $h = $par->[1]; 2741 my $h = $para->{h};
2517 2742
2518 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2519 $layout->set_foreground (@{ $par->[2] });
2520 $layout->set_width ($W - $par->[3]);
2521 $layout->set_markup ($par->[4]);
2522 2744
2523 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2745 my $layout = $self->get_layout ($para);
2524 2746
2525 glRasterPos $par->[3], $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2526 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2748
2749 if (my @w = @{ $para->{widget} }) {
2750 my @s = $layout->get_shapes;
2751
2752 for (@w) {
2753 my ($dx, $dy) = splice @s, 0, 2, ();
2754
2755 $_->{x} = $dx + $para->{indent};
2756 $_->{y} = $dy + $y - $y0;
2757
2758 $_->draw;
2759 }
2760 }
2527 } 2761 }
2528 2762
2529 $y += $h; 2763 $y += $h;
2530 } 2764 }
2531
2532 glDisable GL_BLEND;
2533 }; 2765 };
2534 }); 2766 });
2535} 2767}
2536 2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2776}
2777
2537sub _draw { 2778sub _draw {
2538 my ($self) = @_; 2779 my ($self) = @_;
2539 2780
2540 glEnable GL_TEXTURE_2D; 2781 glEnable GL_TEXTURE_2D;
2541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2542 glColor 1, 1, 1, 1; 2783 glColor 0, 0, 0, 1;
2543 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2784 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2544 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2545 2786
2546 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2547
2548} 2788}
2549 2789
2550############################################################################# 2790#############################################################################
2551 2791
2552package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2631} 2871}
2632 2872
2633sub set_tooltip_from { 2873sub set_tooltip_from {
2634 my ($self, $widget) = @_; 2874 my ($self, $widget) = @_;
2635 2875
2876 my $tooltip = $widget->{tooltip};
2877
2878 if ($ENV{CFPLUS_DEBUG} & 2) {
2879 $tooltip .= "\n\n" . (ref $widget) . "\n"
2880 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2881 . "req $widget->{req_w} $widget->{req_h}\n"
2882 . "visible $widget->{visible}";
2883 }
2884
2885 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//;
2887
2636 $self->add (new CFClient::UI::Label 2888 $self->add (new CFClient::UI::Label
2637 markup => $widget->{tooltip}, 2889 markup => $tooltip,
2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8, 2891 fontsize => 0.8,
2640 fg => [0, 0, 0, 1], 2892 fg => [0, 0, 0, 1],
2641 ellipsise => 0, 2893 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP), 2894 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2649 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2650 2902
2651 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2652} 2904}
2653 2905
2654sub size_allocate { 2906sub invoke_size_allocate {
2655 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2656 2908
2657 $self->SUPER::size_allocate ($w - 4, $h - 4); 2909 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2910}
2911
2912sub invoke_visibility_change {
2913 my ($self, $visible) = @_;
2914
2915 return unless $visible;
2916
2917 $self->{root}->on_post_alloc ("move_$self" => sub {
2918 my $widget = $self->{owner}
2919 or return;
2920
2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922
2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924 if $x + $self->{w} > $self->{root}{w};
2925
2926 $self->move_abs ($x, $y);
2927 });
2658} 2928}
2659 2929
2660sub _draw { 2930sub _draw {
2661 my ($self) = @_; 2931 my ($self) = @_;
2662 2932
… …
2679 glVertex $w, $h; 2949 glVertex $w, $h;
2680 glVertex $w, 0; 2950 glVertex $w, 0;
2681 glEnd; 2951 glEnd;
2682 2952
2683 glTranslate 2 - 0.375, 2 - 0.375; 2953 glTranslate 2 - 0.375, 2 - 0.375;
2954
2684 $self->SUPER::_draw; 2955 $self->SUPER::_draw;
2685} 2956}
2686 2957
2687############################################################################# 2958#############################################################################
2688 2959
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 3019
2749 if ($tex) { 3020 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 3021 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 3023 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3024 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2755 } 3026 }
2756} 3027}
2757 3028
2758sub DESTROY { 3029sub destroy {
2759 my ($self) = @_; 3030 my ($self) = @_;
2760 3031
2761 $self->{timer}->cancel 3032 $self->{timer}->cancel
2762 if $self->{timer}; 3033 if $self->{timer};
2763 3034
2764 $self->SUPER::DESTROY; 3035 $self->SUPER::destroy;
2765} 3036}
2766 3037
2767############################################################################# 3038#############################################################################
2768 3039
2769package CFClient::UI::Inventory; 3040package CFClient::UI::Buttonbar;
2770 3041
2771our @ISA = CFClient::UI::ScrolledWindow::; 3042our @ISA = CFClient::UI::HBox::;
2772 3043
2773sub new { 3044# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812}
2813 3045
2814############################################################################# 3046#############################################################################
2815 3047
2816package CFClient::UI::Menu; 3048package CFClient::UI::Menu;
2817 3049
… …
2829 ); 3061 );
2830 3062
2831 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3063 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2832 3064
2833 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
2834 my ($widget, $cb) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
2835 3067
2836 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
2837 if (!ref $widget) { 3069 if (!ref $widget) {
3070 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2;
3072
3073 $widget = new CFClient::UI::HBox
3074 can_hover => 1,
3075 can_events => 1,
3076 tooltip => $tooltip,
3077 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1),
3080 ],
3081 ;
3082
3083 } else {
2838 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2839 can_hover => 1, 3085 can_hover => 1,
2840 can_events => 1, 3086 can_events => 1,
2841 text => $widget; 3087 markup => $widget,
3088 tooltip => $tooltip;
3089 }
2842 } 3090 }
2843 3091
2844 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
2845 3093
2846 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
2851 3099
2852# popup given the event (must be a mouse button down event currently) 3100# popup given the event (must be a mouse button down event currently)
2853sub popup { 3101sub popup {
2854 my ($self, $ev) = @_; 3102 my ($self, $ev) = @_;
2855 3103
2856 $self->_emit ("popdown"); 3104 $self->emit ("popdown");
2857 3105
2858 # maybe save $GRAB? must be careful about events... 3106 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 3107 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 3108 $self->{button} = $ev->{button};
2861 3109
2862 $self->show; 3110 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3111 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 3112}
2865 3113
2866sub mouse_motion { 3114sub invoke_mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 3115 my ($self, $ev, $x, $y) = @_;
2868 3116
2869 # TODO: should use vbox->find_widget or so 3117 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3118 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 3119 $self->{hover} = $self->{item}{$HOVER};
2872}
2873 3120
3121 0
3122}
3123
2874sub button_up { 3124sub invoke_button_up {
2875 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2876 3126
2877 if ($ev->{button} == $self->{button}) { 3127 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB; 3128 undef $GRAB;
2879 $self->hide; 3129 $self->hide;
2880 3130
2881 $self->_emit ("popdown"); 3131 $self->emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 3132 $self->{hover}[1]->() if $self->{hover};
3133 } else {
3134 return 0
3135 }
3136
2883 } 3137 1
2884} 3138}
2885 3139
2886############################################################################# 3140#############################################################################
2887 3141
2888package CFClient::UI::Statusbox; 3142package CFClient::UI::Multiplexer;
2889 3143
2890our @ISA = CFClient::UI::VBox::; 3144our @ISA = CFClient::UI::Container::;
2891 3145
2892sub new { 3146sub new {
2893 my $class = shift; 3147 my $class = shift;
2894 3148
2895 $class->SUPER::new ( 3149 my $self = $class->SUPER::new (
3150 @_,
3151 );
3152
3153 $self->{current} = $self->{children}[0]
3154 if @{ $self->{children} };
3155
3156 $self
3157}
3158
3159sub add {
3160 my ($self, @widgets) = @_;
3161
3162 $self->SUPER::add (@widgets);
3163
3164 $self->{current} = $self->{children}[0]
3165 if @{ $self->{children} };
3166}
3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3172}
3173
3174sub set_current_page {
3175 my ($self, $page_or_widget) = @_;
3176
3177 my $widget = ref $page_or_widget
3178 ? $page_or_widget
3179 : $self->{children}[$page_or_widget];
3180
3181 $self->{current} = $widget;
3182 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3183
3184 $self->emit (page_changed => $self->{current});
3185
3186 $self->realloc;
3187}
3188
3189sub visible_children {
3190 $_[0]{current}
3191}
3192
3193sub size_request {
3194 my ($self) = @_;
3195
3196 $self->{current}->size_request
3197}
3198
3199sub invoke_size_allocate {
3200 my ($self, $w, $h) = @_;
3201
3202 $self->{current}->configure (0, 0, $w, $h);
3203
3204 1
3205}
3206
3207sub _draw {
3208 my ($self) = @_;
3209
3210 $self->{current}->draw;
3211}
3212
3213#############################################################################
3214
3215package CFClient::UI::Notebook;
3216
3217our @ISA = CFClient::UI::VBox::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (
3223 buttonbar => (new CFClient::UI::Buttonbar),
3224 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3225 # filter => # will be put between multiplexer and $self
3226 @_,
3227 );
3228
3229 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3230 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3231
3232 $self
3233}
3234
3235sub add {
3236 my ($self, $title, $widget, $tooltip) = @_;
3237
3238 Scalar::Util::weaken $self;
3239
3240 $self->{buttonbar}->add (new CFClient::UI::Button
3241 markup => $title,
3242 tooltip => $tooltip,
3243 on_activate => sub { $self->set_current_page ($widget) },
3244 );
3245
3246 $self->{multiplexer}->add ($widget);
3247}
3248
3249sub get_current_page {
3250 my ($self) = @_;
3251
3252 $self->{multiplexer}->get_current_page
3253}
3254
3255sub set_current_page {
3256 my ($self, $page) = @_;
3257
3258 $self->{multiplexer}->set_current_page ($page);
3259 $self->emit (page_changed => $self->{multiplexer}{current});
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::Combobox;
3265
3266use utf8;
3267
3268our @ISA = CFClient::UI::Button::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (
3274 options => [], # [value, title, longdesc], ...
3275 value => undef,
3276 @_,
3277 );
3278
3279 $self->_set_value ($self->{value});
3280
3281 $self
3282}
3283
3284sub invoke_button_down {
3285 my ($self, $ev) = @_;
3286
3287 my @menu_items;
3288
3289 for (@{ $self->{options} }) {
3290 my ($value, $title, $tooltip) = @$_;
3291
3292 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293 }
3294
3295 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296}
3297
3298sub _set_value {
3299 my ($self, $value) = @_;
3300
3301 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3302 or return;
3303
3304 $self->{value} = $item->[0];
3305 $self->set_markup ("$item->[1] ⇓");
3306 $self->set_tooltip ($item->[2]);
3307}
3308
3309sub set_value {
3310 my ($self, $value) = @_;
3311
3312 return unless $self->{value} ne $value;
3313
3314 $self->_set_value ($value);
3315 $self->emit (changed => $value);
3316}
3317
3318#############################################################################
3319
3320package CFClient::UI::Statusbox;
3321
3322our @ISA = CFClient::UI::VBox::;
3323
3324sub new {
3325 my $class = shift;
3326
3327 my $self = $class->SUPER::new (
2896 fontsize => 0.8, 3328 fontsize => 0.8,
2897 @_, 3329 @_,
2898 ) 3330 );
3331
3332 Scalar::Util::weaken (my $this = $self);
3333
3334 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3335
3336 $self
2899} 3337}
2900 3338
2901sub reorder { 3339sub reorder {
2902 my ($self) = @_; 3340 my ($self) = @_;
2903 my $NOW = time; 3341 my $NOW = Time::HiRes::time;
3342
3343 # freeze display when hovering over any label
3344 return if $CFClient::UI::TOOLTIP->{owner}
3345 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3346 values %{ $self->{item} };
2904 3347
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3348 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3349 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3350 }
2908 3351
… …
2911 my @items = sort { 3354 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3355 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3356 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3357 } values %{ $self->{item} };
2915 3358
3359 $self->{timer}->interval (1);
3360
2916 my $count = 10 + 1; 3361 my $count = 10 + 1;
2917 for my $item (@items) { 3362 for my $item (@items) {
2918 last unless --$count; 3363 last unless --$count;
2919 3364
2920 push @widgets, $item->{label} ||= do { 3365 my $label = $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all) 3366 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1 3367 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}" 3368 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text}; 3369 : $item->{text};
2925 3370
… …
2933 tooltip => $item->{tooltip}, 3378 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP, 3379 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3380 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3381 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3382 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3383 fg => [@{ $item->{fg} }],
2939 can_events => 1, 3384 can_events => 1,
2940 can_hover => 1 3385 can_hover => 1
2941 }; 3386 };
3387
3388 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3389 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3390 $label->update;
3391 $label->set_max_size (undef, $label->{req_h} * $diff)
3392 if $diff < 1;
3393 $self->{timer}->interval (1/30);
3394 } else {
3395 $label->{fg}[3] = $item->{fg}[3] || 1;
3396 }
3397
3398 push @widgets, $label;
2942 } 3399 }
2943 3400
2944 $self->clear; 3401 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3402 $self->SUPER::add (reverse @widgets);
2946} 3403}
… …
2951 $text =~ s/^\s+//; 3408 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3409 $text =~ s/\s+$//;
2953 3410
2954 return unless $text; 3411 return unless $text;
2955 3412
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3413 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3414
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3415 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3416
2960 if (my $item = $self->{item}{$group}) { 3417 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3418 if ($item->{text} eq $text) {
2962 $item->{count}++; 3419 $item->{count}++;
2963 } else { 3420 } else {
2964 $item->{count} = 1; 3421 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text; 3422 $item->{text} = $item->{tooltip} = $text;
2966 } 3423 }
2967 $item->{id} = ++$self->{id}; 3424 $item->{id} += 0.2;#d#
2968 $item->{timeout} = $timeout; 3425 $item->{timeout} = $timeout;
2969 delete $item->{label}; 3426 delete $item->{label};
2970 } else { 3427 } else {
2971 $self->{item}{$group} = { 3428 $self->{item}{$group} = {
2972 id => ++$self->{id}, 3429 id => ++$self->{id},
… …
2978 count => 1, 3435 count => 1,
2979 %arg, 3436 %arg,
2980 }; 3437 };
2981 } 3438 }
2982 3439
3440 $ROOT->on_refresh (reorder => sub {
2983 $self->reorder; 3441 $self->reorder;
3442 });
2984} 3443}
2985 3444
2986sub reconfigure { 3445sub reconfigure {
2987 my ($self) = @_; 3446 my ($self) = @_;
2988 3447
… …
2991 3450
2992 $self->reorder; 3451 $self->reorder;
2993 $self->SUPER::reconfigure; 3452 $self->SUPER::reconfigure;
2994} 3453}
2995 3454
3455sub destroy {
3456 my ($self) = @_;
3457
3458 $self->{timer}->cancel;
3459
3460 $self->SUPER::destroy;
3461}
3462
2996############################################################################# 3463#############################################################################
2997 3464
2998package CFClient::UI::Root; 3465package CFClient::UI::Inventory;
2999 3466
3000our @ISA = CFClient::UI::Container::; 3467our @ISA = CFClient::UI::Table::;
3001
3002use CFClient::OpenGL;
3003 3468
3004sub new { 3469sub new {
3005 my $class = shift; 3470 my $class = shift;
3006 3471
3007 $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3473 col_expand => [0, 1, 0],
3474 @_,
3475 );
3476
3477 $self
3478}
3479
3480sub set_items {
3481 my ($self, $items) = @_;
3482
3483 $self->clear;
3484 return unless $items;
3485
3486 my @items = sort {
3487 ($a->{type} <=> $b->{type})
3488 or ($a->{name} cmp $b->{name})
3489 } values %$items;
3490
3491 $self->{real_items} = \@items;
3492
3493 my $row = 0;
3494 for my $item (@items) {
3495 CFClient::Item::update_widgets $item;
3496
3497 $self->add (0, $row, $item->{face_widget});
3498 $self->add (1, $row, $item->{desc_widget});
3499 $self->add (2, $row, $item->{weight_widget});
3500
3501 $row++;
3502 }
3503}
3504
3505#############################################################################
3506
3507package CFClient::UI::SpellList;
3508
3509our @ISA = CFClient::UI::Table::;
3510
3511sub new {
3512 my $class = shift;
3513
3514 my $self = $class->SUPER::new (
3515 binding => [],
3516 commands => [],
3517 @_,
3518 )
3519}
3520
3521my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3522
3523my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3525my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3529my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3531my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533
3534sub rebuild_spell_list {
3535 my ($self) = @_;
3536
3537 $CFClient::UI::ROOT->on_refresh ($self => sub {
3538 $self->clear;
3539
3540 return unless $::CONN;
3541
3542 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547
3548 my $row = 0;
3549
3550 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551 my $spell = $self->{spell}{$_};
3552
3553 $row++;
3554
3555 my $spell_cb = sub {
3556 my ($widget, $ev) = @_;
3557
3558 if ($ev->{button} == 1) {
3559 $::CONN->user_send ("cast $spell->{name}");
3560 } elsif ($ev->{button} == 2) {
3561 $::CONN->user_send ("invoke $spell->{name}");
3562 } elsif ($ev->{button} == 3) {
3563 (new CFClient::UI::Menu
3564 items => [
3565 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567 ],
3568 )->popup ($ev);
3569 } else {
3570 return 0;
3571 }
3572
3573 1
3574 };
3575
3576 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577
3578 #TODO: add path info to tooltip
3579 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3580
3581 $self->add (0, $row, new CFClient::UI::Face
3582 face => $spell->{face},
3583 can_hover => 1,
3584 can_events => 1,
3585 tooltip => $tooltip,
3586 on_button_down => $spell_cb,
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $tooltip,
3595 on_button_down => $spell_cb,
3596 );
3597
3598 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602 }
3603 });
3604}
3605
3606sub add_spell {
3607 my ($self, $spell) = @_;
3608
3609 $self->{spell}->{$spell->{name}} = $spell;
3610 $self->rebuild_spell_list;
3611}
3612
3613sub remove_spell {
3614 my ($self, $spell) = @_;
3615
3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620sub clear_spells {
3621 my ($self) = @_;
3622
3623 $self->{spell} = {};
3624 $self->rebuild_spell_list;
3625}
3626
3627#############################################################################
3628
3629package CFClient::UI::Root;
3630
3631our @ISA = CFClient::UI::Container::;
3632
3633use List::Util qw(min max);
3634
3635use CFClient::OpenGL;
3636
3637sub new {
3638 my $class = shift;
3639
3640 my $self = $class->SUPER::new (
3008 visible => 1, 3641 visible => 1,
3009 @_, 3642 @_,
3010 ) 3643 );
3011}
3012 3644
3013sub configure { 3645 Scalar::Util::weaken ($self->{root} = $self);
3014 my ($self, $x, $y, $w, $h) = @_;
3015 3646
3016 $self->{w} = $w; 3647 $self
3017 $self->{h} = $h;
3018}
3019
3020sub check_size {
3021 my ($self) = @_;
3022
3023 $self->size_allocate ($self->{w}, $self->{h})
3024 if $self->{w};
3025} 3648}
3026 3649
3027sub size_request { 3650sub size_request {
3028 my ($self) = @_; 3651 my ($self) = @_;
3029 3652
3030 ($self->{w}, $self->{h}) 3653 ($self->{w}, $self->{h})
3031} 3654}
3032 3655
3656sub _to_pixel {
3657 my ($coord, $size, $max) = @_;
3658
3659 $coord =
3660 $coord eq "center" ? ($max - $size) * 0.5
3661 : $coord eq "max" ? $max
3662 : $coord;
3663
3664 $coord = 0 if $coord < 0;
3665 $coord = $max - $size if $coord > $max - $size;
3666
3667 int $coord + 0.5
3668}
3669
3033sub size_allocate { 3670sub invoke_size_allocate {
3034 my ($self, $w, $h) = @_; 3671 my ($self, $w, $h) = @_;
3035 3672
3036 for my $child ($self->children) { 3673 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3674 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3675
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3676 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3677 $Y = $child->{force_y} if exists $child->{force_y};
3041 3678
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3679 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3680 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3681
3051 $child->configure ($X, $Y, $W, $H); 3682 $child->configure ($X, $Y, $W, $H);
3052 } 3683 }
3684
3685 1
3053} 3686}
3054 3687
3055sub coord2local { 3688sub coord2local {
3056 my ($self, $x, $y) = @_; 3689 my ($self, $x, $y) = @_;
3057 3690
… …
3065} 3698}
3066 3699
3067sub update { 3700sub update {
3068 my ($self) = @_; 3701 my ($self) = @_;
3069 3702
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3703 $::WANT_REFRESH++;
3072} 3704}
3073 3705
3074sub add { 3706sub add {
3075 my ($self, @children) = @_; 3707 my ($self, @children) = @_;
3076 3708
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
3083 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3709 $_->{is_toplevel} = 1
3085 3710 for @children;
3086 # integerise window positions
3087 $child->{x} = int $child->{x};
3088 $child->{y} = int $child->{y};
3089 }
3090 3711
3091 $self->SUPER::add (@children); 3712 $self->SUPER::add (@children);
3092} 3713}
3093 3714
3094sub remove { 3715sub remove {
3095 my ($self, @children) = @_; 3716 my ($self, @children) = @_;
3096 3717
3097 $self->SUPER::remove (@children); 3718 $self->SUPER::remove (@children);
3719
3720 delete $self->{is_toplevel}
3721 for @children;
3098 3722
3099 while (@children) { 3723 while (@children) {
3100 my $w = pop @children; 3724 my $w = pop @children;
3101 push @children, $w->children; 3725 push @children, $w->children;
3102 $w->set_invisible; 3726 $w->set_invisible;
… …
3121 while ($self->{refresh_hook}) { 3745 while ($self->{refresh_hook}) {
3122 $_->() 3746 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3747 for values %{delete $self->{refresh_hook}};
3124 } 3748 }
3125 3749
3126 if ($self->{check_size}) { 3750 if ($self->{realloc}) {
3751 my %queue;
3127 my @queue; 3752 my @queue;
3753 my $widget;
3128 3754
3129 for (;;) { 3755 outer:
3130 if ($self->{check_size}) { 3756 while () {
3131 #TODO use array-of-depth approach 3757 if (my $realloc = delete $self->{realloc}) {
3758 for $widget (values %$realloc) {
3759 $widget->{visible} or next; # do not resize invisible widgets
3132 3760
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3761 $queue{$widget+0}++ and next; # duplicates are common
3134 @queue, values %{delete $self->{check_size}}; 3762
3763 push @{ $queue[$widget->{visible}] }, $widget;
3764 }
3135 } 3765 }
3136 3766
3767 while () {
3768 @queue or last outer;
3769
3137 my $widget = pop @queue || last; 3770 $widget = pop @{ $queue[-1] || [] }
3138 3771 and last;
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142 ? @$widget{qw(user_w user_h)}
3143 : $widget->size_request;
3144
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148 3772
3773 pop @queue;
3774 }
3775
3776 delete $queue{$widget+0};
3777
3778 my ($w, $h) = $widget->size_request;
3779
3780 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3781 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3782
3783 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3784 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3785
3786 $w = $widget->{force_w} if exists $widget->{force_w};
3787 $h = $widget->{force_h} if exists $widget->{force_h};
3788
3789 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3790 || delete $widget->{force_realloc}) {
3149 $widget->{req_w} = $w; 3791 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3792 $widget->{req_h} = $h;
3151 3793
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3794 $self->{size_alloc}{$widget+0} = $widget;
3153 3795
3154 $widget->{parent}->check_size
3155 if $widget->{parent}; 3796 if (my $parent = $widget->{parent}) {
3797 $self->{realloc}{$parent+0} = $parent
3798 unless $queue{$parent+0};
3799
3800 $parent->{force_size_alloc} = 1;
3801 $self->{size_alloc}{$parent+0} = $parent;
3802 }
3156 } 3803 }
3804
3805 delete $self->{realloc}{$widget+0};
3157 } 3806 }
3158 } 3807 }
3159 3808
3160 while ($self->{size_alloc}) { 3809 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3810 my @queue = sort { $b->{visible} <=> $a->{visible} }
3162 my ($widget, $w, $h) = @$_; 3811 values %$size_alloc;
3812
3813 while () {
3814 my $widget = pop @queue || last;
3815
3816 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3163 3817
3164 $w = 0 if $w < 0; 3818 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3819 $h = 0 if $h < 0;
3166 3820
3821 $w = max $widget->{min_w}, $w;
3822 $h = max $widget->{min_h}, $h;
3823
3824 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3825 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3826
3827 $w = int $w + 0.5;
3828 $h = int $h + 0.5;
3829
3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w};
3832 $widget->{old_h} = $widget->{h};
3833
3167 $widget->{w} = $w; 3834 $widget->{w} = $w;
3168 $widget->{h} = $h; 3835 $widget->{h} = $h;
3836
3169 $widget->emit (size_allocate => $w, $h); 3837 $widget->emit (size_allocate => $w, $h);
3838 }
3170 } 3839 }
3171 } 3840 }
3172 3841
3173 while ($self->{post_alloc_hook}) { 3842 while ($self->{post_alloc_hook}) {
3174 $_->() 3843 $_->()
3175 for values %{delete $self->{post_alloc_hook}}; 3844 for values %{delete $self->{post_alloc_hook}};
3176 } 3845 }
3846
3177 3847
3178 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3848 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3849 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180 glClear GL_COLOR_BUFFER_BIT; 3850 glClear GL_COLOR_BUFFER_BIT;
3181 3851
… …
3183 glLoadIdentity; 3853 glLoadIdentity;
3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185 glMatrixMode GL_MODELVIEW; 3855 glMatrixMode GL_MODELVIEW;
3186 glLoadIdentity; 3856 glLoadIdentity;
3187 3857
3858 {
3859 package CFClient::UI::Base;
3860
3861 ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h});
3863 }
3864
3188 $self->_draw; 3865 $self->_draw;
3189} 3866}
3190 3867
3191############################################################################# 3868#############################################################################
3192 3869

Diff Legend

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