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

Diff Legend

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