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

Diff Legend

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