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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.313 by root, Sat Jun 24 00:24:09 2006 UTC

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

Diff Legend

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