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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.306 by root, Sun Jun 18 17:39:36 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;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 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;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
94 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
95 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
96 $grab->update if $grab; 116 $grab->update if $grab;
97 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
98 118
99 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
100 } 120 }
101} 121}
102 122
103sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
104 my ($ev) = @_; 124 my ($ev) = @_;
… …
110 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
111 131
112 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
113 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
114 134
115 check_tooltip; 135 $TOOLTIP_WATCHER->start;
116 } 136 }
117 137
118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER; 139 if $HOVER;
120} 140}
… …
152sub rescale_widgets { 172sub rescale_widgets {
153 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
154 174
155 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
156 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
157 $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.]+$/;
158 $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};
159 $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};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $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.]+$/;
162 $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};
163 $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};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
165 } 190 }
166 } 191 }
167 192
168 reconfigure_widgets; 193 reconfigure_widgets;
169} 194}
… …
178 203
179sub new { 204sub new {
180 my $class = shift; 205 my $class = shift;
181 206
182 my $self = bless { 207 my $self = bless {
183 x => 0, 208 x => "center",
184 y => 0, 209 y => "center",
185 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
186 can_events => 1, 213 can_events => 1,
187 @_ 214 @_
188 }, $class; 215 }, $class;
189 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
190 for (keys %$self) { 219 for (keys %$self) {
191 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
193 } 222 }
194 } 223 }
195 224
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
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};
235 }
197 236
198 $self 237 $self
199} 238}
200 239
201sub destroy { 240sub destroy {
… …
205 %$self = (); 244 %$self = ();
206} 245}
207 246
208sub show { 247sub show {
209 my ($self) = @_; 248 my ($self) = @_;
249
210 return if $self->{parent}; 250 return if $self->{parent};
211 251
212 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
213} 253}
214 254
215sub show_centered { 255sub set_visible {
216 my ($self) = @_; 256 my ($self) = @_;
257
217 return if $self->{parent}; 258 return if $self->{visible};
218 259
219 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
220 262
221 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 264
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
224 }, 266
225 ); 267 $_->set_visible for $self->children;
226} 268}
227 269
228sub set_invisible { 270sub set_invisible {
229 my ($self) = @_; 271 my ($self) = @_;
230 272
231 # broken show/hide model 273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
232 276
233 delete $self->{visible}; 277 delete $self->{visible};
278 delete $self->{root};
234 279
235 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
237 282
238 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
240 285
241 $self->focus_out; 286 $self->emit ("focus_out");
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;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
300 }
301}
302 363
303sub size_allocate { 364 $self->{alloc_w} = $w;
304 # nothing to be done 365 $self->{alloc_h} = $h;
305}
306 366
307sub reconfigure { 367 $self->{root}{size_alloc}{$self+0} = $self;
308 my ($self) = @_; 368 }
309
310 $self->check_size (1);
311 $self->update;
312} 369}
313 370
314sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
315} 377}
316 378
317sub set_max_size { 379sub set_max_size {
318 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
319 381
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
322} 386}
323 387
324sub set_tooltip { 388sub set_tooltip {
325 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
326 390
… …
331 395
332 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
333 397
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
337 } 401 }
338} 402}
339 403
340# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
341sub coord2local { 405sub coord2local {
… …
349 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
350 414
351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
352} 416}
353 417
354sub focus_in { 418sub invoke_focus_in {
355 my ($self) = @_; 419 my ($self) = @_;
356 420
357 return if $FOCUS == $self; 421 return if $FOCUS == $self;
358 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
359 423
360 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
361 425
362 $self->_emit (focus_in => $focus);
363
364 $focus->update if $focus; 426 $focus->update if $focus;
365 $FOCUS->update; 427 $FOCUS->update;
366}
367 428
429 0
430}
431
368sub focus_out { 432sub invoke_focus_out {
369 my ($self) = @_; 433 my ($self) = @_;
370 434
371 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
372 436
373 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
374 438
375 $self->_emit (focus_out => $focus);
376
377 $focus->update if $focus; #? 439 $focus->update if $focus; #?
378 440
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 442 unless $FOCUS;
381}
382 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
383sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
384sub button_up { } 454sub invoke_button_up { 1 }
385sub key_down { } 455sub invoke_key_down { 1 }
386sub key_up { } 456sub invoke_key_up { 1 }
387 457
388sub button_down { 458sub invoke_button_down {
389 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
390 460
391 $self->focus_in; 461 $self->grab_focus;
392}
393 462
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478}
479
480sub find_widget {
481 my ($self, $x, $y) = @_;
482
483 return () unless $self->{can_events};
484
485 return $self
486 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
487 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
488
489 ()
490}
491
492sub set_parent {
493 my ($self, $parent) = @_;
494
495 Scalar::Util::weaken ($self->{parent} = $parent);
496 $self->set_visible if $parent->{visible};
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 530
400sub draw { 531sub draw {
401 my ($self) = @_; 532 my ($self) = @_;
402 533
403 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 545
405 glPushMatrix; 546 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 548
410 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 551 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 553 glBegin GL_QUADS;
417 glVertex $x , $y; 554 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
421 glEnd; 558 glEnd;
422 glDisable GL_BLEND; 559 glDisable GL_BLEND;
423 } 560 }
424 561
425 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 563 glPushMatrix;
427 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 567 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
434 glEnd; 571 glEnd;
435 glPopMatrix; 572 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
438} 578}
439 579
440sub _draw { 580sub _draw {
441 my ($self) = @_; 581 my ($self) = @_;
442 582
443 warn "no draw defined for $self\n"; 583 warn "no draw defined for $self\n";
444} 584}
445 585
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub DESTROY { 586sub DESTROY {
504 my ($self) = @_; 587 my ($self) = @_;
505 588
506 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
507 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
508} 593}
509 594
510############################################################################# 595#############################################################################
511 596
512package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
537 622
538 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
539 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
540 625
541 glEnable GL_BLEND; 626 glEnable GL_BLEND;
542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
543 glColor @$color; 628 glColor_premultiply @$color;
544 629
545 glBegin GL_QUADS; 630 glBegin GL_QUADS;
546 glVertex 0 , 0; 631 glVertex 0 , 0;
547 glVertex 0 , $h; 632 glVertex 0 , $h;
548 glVertex $w, $h; 633 glVertex $w, $h;
… …
563 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
565} 650}
566 651
567sub size_request { 652sub size_request {
568 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
569} 656}
570 657
571sub draw { } 658sub draw { }
572 659
573############################################################################# 660#############################################################################
… …
577our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
578 665
579sub new { 666sub new {
580 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
581 668
582 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
583 670
584 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
585 children => [], 672 children => [],
586 can_events => 0, 673 can_events => 0,
587 %arg, 674 %arg,
588 ); 675 );
676
589 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
590 679
591 $self 680 $self
592} 681}
593 682
594sub add { 683sub add {
… …
602 $self->{children} = [ 691 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 692 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 693 @{$self->{children}}, @widgets
605 ]; 694 ];
606 695
607 $self->check_size (1); 696 $self->realloc;
608 $self->update;
609} 697}
610 698
611sub children { 699sub children {
612 @{ $_[0]{children} } 700 @{ $_[0]{children} }
613} 701}
… …
618 delete $child->{parent}; 706 delete $child->{parent};
619 $child->hide; 707 $child->hide;
620 708
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 709 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 710
623 $self->check_size; 711 $self->realloc;
624 $self->update;
625} 712}
626 713
627sub clear { 714sub clear {
628 my ($self) = @_; 715 my ($self) = @_;
629 716
… …
633 for (@$children) { 720 for (@$children) {
634 delete $_->{parent}; 721 delete $_->{parent};
635 $_->hide; 722 $_->hide;
636 } 723 }
637 724
638 $self->check_size; 725 $self->realloc;
639 $self->update;
640} 726}
641 727
642sub find_widget { 728sub find_widget {
643 my ($self, $x, $y) = @_; 729 my ($self, $x, $y) = @_;
644 730
645 $x -= $self->{x}; 731 $x -= $self->{x};
646 $y -= $self->{y}; 732 $y -= $self->{y};
647 733
648 my $res; 734 my $res;
649 735
650 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
651 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
652 and return $res; 738 and return $res;
653 } 739 }
654 740
655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
676} 762}
677 763
678sub add { 764sub add {
679 my ($self, $child) = @_; 765 my ($self, $child) = @_;
680 766
681 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
682
683 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
684} 769}
685 770
686sub remove { 771sub remove {
687 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
696 781
697sub size_request { 782sub size_request {
698 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
699} 784}
700 785
701sub size_allocate { 786sub invoke_size_allocate {
702 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
703 788
704 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
705} 792}
706 793
707############################################################################# 794#############################################################################
795
796# back-buffered drawing area
708 797
709package CFClient::UI::Window; 798package CFClient::UI::Window;
710 799
711our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
712 801
… …
723 812
724 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
725 $self->SUPER::update; 814 $self->SUPER::update;
726} 815}
727 816
728sub size_allocate { 817sub invoke_size_allocate {
729 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
730 819
731 $self->SUPER::size_allocate ($w, $h);
732 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
733} 823}
734 824
735sub _render { 825sub _render {
826 my ($self) = @_;
827
736 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
737} 829}
738 830
739sub render_child { 831sub render_child {
740 my ($self) = @_; 832 my ($self) = @_;
741 833
742 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
743 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
745 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
746 $self->_render; 845 $self->_render;
747 }; 846 };
748} 847}
749 848
750sub _draw { 849sub _draw {
751 my ($self) = @_; 850 my ($self) = @_;
752 851
753 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
754 853
755 my $tex = $self->{texture} 854 my $tex = $self->{texture}
756 or return; 855 or return;
757 856
758 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
761 860
762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
763 862
764 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
765} 864}
… …
781} 880}
782 881
783sub size_request { 882sub size_request {
784 my ($self) = @_; 883 my ($self) = @_;
785 884
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 886
788 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
789} 888 $h = 10 if $self->{scroll_y};
790 889
890 ($w, $h)
891}
892
791sub size_allocate { 893sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
793 895
896 my $child = $self->child;
897
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 900
797 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
798 $self->update; 902 $self->update;
903
904 1
799} 905}
800 906
801sub set_offset { 907sub set_offset {
802 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
803 909
… …
836} 942}
837 943
838sub _render { 944sub _render {
839 my ($self) = @_; 945 my ($self) = @_;
840 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842 951
843 $self->SUPER::_render; 952 $self->SUPER::_render;
844} 953}
845 954
… …
848package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
849 958
850our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
851 960
852sub new { 961sub new {
853 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
854 965
855 my $self; 966 my $self;
856 967
857 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
858 vertical => 1, 969 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 971 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 972 $self->{vp}->set_offset (0, $_[1]);
862 }, 973 },
863 ; 974 ;
864 975
865 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
866 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
867 slider => $slider, 978 slider => $slider,
868 @_, 979 %arg,
869 ); 980 );
870 981
871 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
874 984
875 $self 985 $self
876} 986}
877 987
878sub size_allocate { 988sub add {
879 my ($self, $w, $h) = @_; 989 my ($self, $widget) = @_;
880 990
881 $self->SUPER::size_allocate ($w, $h); 991 $self->{vp}->add ($self->{child} = $widget);
992}
882 993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
883 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002}
1003
1004sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_;
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
885} 1011}
886 1012
887#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
888# update viewport offset on scroll 1014# update viewport offset on scroll
889 1015
… …
909 1035
910 if ($self->{bg}) { 1036 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
912 1038
913 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
915 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
916 1042
917 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
918 glVertex 0 , 0; 1044 glVertex 0 , 0;
919 glVertex 0 , $h; 1045 glVertex 0 , $h;
920 glVertex $w, $h; 1046 glVertex $w, $h;
… …
933 1059
934our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
935 1061
936use CFClient::OpenGL; 1062use CFClient::OpenGL;
937 1063
938my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1071
942sub new { 1072sub new {
943 my $class = shift; 1073 my ($class, %arg) = @_;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1074
947 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1078 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1079 can_events => 1,
953 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
954 ); 1083 );
955 1084
956 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
957 align => 0, 1086 align => 0,
958 valign => 1, 1087 valign => 1,
959 text => $self->{title}, 1088 text => $self->{title},
960 fontsize => $self->{border}; 1089 fontsize => $self->{border},
1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
961 1100
962 $self 1101 $self
1102}
1103
1104sub add {
1105 my ($self, @widgets) = @_;
1106
1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
963} 1110}
964 1111
965sub border { 1112sub border {
966 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
967} 1114}
968 1115
969sub size_request { 1116sub size_request {
970 my ($self) = @_; 1117 my ($self) = @_;
1118
1119 $self->{title_widget}->size_request
1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
971 1124
972 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
973 1126
974 ( 1127 (
975 $w + $self->border * 2, 1128 $w + $self->border * 2,
976 $h + $self->border * 2, 1129 $h + $self->border * 2,
977 ) 1130 )
978} 1131}
979 1132
980sub size_allocate { 1133sub invoke_size_allocate {
981 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
982 1135
1136 if ($self->{title_widget}) {
1137 $self->{title_widget}{w} = $w;
1138 $self->{title_widget}{h} = $h;
1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1140 }
1141
1142 my $border = $self->border;
1143
983 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
985 1146
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987 if $self->{title};
988
989 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
990}
991 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
992sub button_down { 1155sub invoke_button_down {
993 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
994 1157
995 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
996 my $border = $self->border; 1159 my $border = $self->border;
997 1160
… …
1010 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1011 1174
1012 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1014 1177
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1180
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size; 1182 $self->realloc;
1019 }; 1183 };
1020 1184
1021 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1189 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1027 1191
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1193
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update; 1195 # HACK: the next line is required to enforce placement
1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1032 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
1033 } 1202 1
1034} 1203}
1035 1204
1036sub button_up { 1205sub invoke_button_up {
1037 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1038 1207
1039 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1040} 1209}
1041 1210
1042sub mouse_motion { 1211sub invoke_mouse_motion {
1043 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1044 1213
1045 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1046} 1217}
1047 1218
1048sub _draw { 1219sub _draw {
1049 my ($self) = @_; 1220 my ($self) = @_;
1050 1221
1222 my $child = $self->{children}[0];
1223
1051 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1053 1226
1054 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1229
1057 my $border = $self->border; 1230 my $border = $self->border;
1058 1231
1059 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1237
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
1067 1240
1068 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1244 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1246 }
1079 1247
1080 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1081 1249
1082 $self->{title}->draw if $self->{title};
1083
1084 $self->child->draw; 1250 $child->draw;
1251
1252 if ($self->{title_widget}) {
1253 glTranslate 0, $border - $self->{h};
1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1085} 1261}
1086 1262
1087############################################################################# 1263#############################################################################
1088 1264
1089package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1101 col_expand => [], 1277 col_expand => [],
1102 @_, 1278 @_,
1103 ) 1279 )
1104} 1280}
1105 1281
1282sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284}
1285
1106sub add { 1286sub add {
1107 my ($self, $x, $y, $child) = @_; 1287 my ($self, $x, $y, $child) = @_;
1108 1288
1109 $child->set_parent ($self); 1289 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1111 1291
1112 $child->check_size; 1292 $self->realloc;
1113} 1293}
1114 1294
1115sub children { 1295sub remove {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1296 my ($self, $child) = @_;
1117}
1118 1297
1298 # TODO: not yet implemented
1299}
1300
1119# TODO: move to container class maybe? send childs a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1302sub clear {
1121 my ($self) = @_; 1303 my ($self) = @_;
1122 1304
1123 my @children = $self->children; 1305 my @children = $self->children;
1124 delete $self->{children}; 1306 delete $self->{children};
… …
1126 for (@children) { 1308 for (@children) {
1127 delete $_->{parent}; 1309 delete $_->{parent};
1128 $_->hide; 1310 $_->hide;
1129 } 1311 }
1130 1312
1131 $self->update; 1313 $self->realloc;
1132} 1314}
1133 1315
1134sub get_wh { 1316sub get_wh {
1135 my ($self) = @_; 1317 my ($self) = @_;
1136 1318
… …
1162 (sum @$ws), 1344 (sum @$ws),
1163 (sum @$hs), 1345 (sum @$hs),
1164 ) 1346 )
1165} 1347}
1166 1348
1167sub size_allocate { 1349sub invoke_size_allocate {
1168 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1169 1351
1170 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1171 1353
1172 my $req_w = sum @$ws; 1354 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1355 my $req_h = (sum @$hs) || 1;
1174 1356
1175 # TODO: nicer code && do row_expand 1357 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1358 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1359 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1360 my $col_expand = (sum @col_expand) || 1;
… …
1204 } 1386 }
1205 1387
1206 $y += $row_h; 1388 $y += $row_h;
1207 } 1389 }
1208 1390
1391 1
1209} 1392}
1210 1393
1211sub find_widget { 1394sub find_widget {
1212 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1213 1396
… …
1232 } 1415 }
1233} 1416}
1234 1417
1235############################################################################# 1418#############################################################################
1236 1419
1420package CFClient::UI::Box;
1421
1422our @ISA = CFClient::UI::Container::;
1423
1424sub size_request {
1425 my ($self) = @_;
1426
1427 $self->{vertical}
1428 ? (
1429 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1430 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1431 )
1432 : (
1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1435 )
1436}
1437
1438sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_;
1440
1441 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children};
1443
1444 my @req;
1445
1446 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children;
1448 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1450 my $req = List::Util::sum @req;
1451
1452 if ($req > $space) {
1453 # ah well, not enough space
1454 $_ *= $space / $req for @req;
1455 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1457
1458 $space = ($space - $req) / $expand; # remaining space to give away
1459
1460 $req[$_] += $space * $children->[$_]{expand}
1461 for 0 .. $#$children;
1462 }
1463 }
1464
1465 CFClient::UI::harmonize \@req;
1466
1467 my $pos = 0;
1468 for (0 .. $#$children) {
1469 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471
1472 $pos += $alloc;
1473 }
1474
1475 1
1476}
1477
1478#############################################################################
1479
1237package CFClient::UI::HBox; 1480package CFClient::UI::HBox;
1238 1481
1239# TODO: wrap into common Box base class
1240
1241our @ISA = CFClient::UI::Container::; 1482our @ISA = CFClient::UI::Box::;
1242 1483
1243sub size_request { 1484sub new {
1244 my ($self) = @_; 1485 my $class = shift;
1245 1486
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1487 $class->SUPER::new (
1247 1488 vertical => 0,
1248 ( 1489 @_,
1249 (List::Util::sum map $_->[0], @alloc),
1250 (List::Util::max map $_->[1], @alloc),
1251 ) 1490 )
1252} 1491}
1253 1492
1254sub size_allocate {
1255 my ($self, $w, $h) = @_;
1256
1257 ($h, $w) = ($w, $h);
1258
1259 my $children = $self->{children};
1260
1261 my @h = map $_->{req_w}, @$children;
1262
1263 my $req_h = List::Util::sum @h;
1264
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children;
1270 $exp ||= 1;
1271
1272 for (0 .. $#$children) {
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 }
1279 }
1280
1281 CFClient::UI::harmonize \@h;
1282
1283 my $y = 0;
1284 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_];
1287 $child->configure ($y, 0, $h, $w);
1288
1289 $y += $h;
1290 }
1291
1292 1
1293}
1294
1295############################################################################# 1493#############################################################################
1296 1494
1297package CFClient::UI::VBox; 1495package CFClient::UI::VBox;
1298 1496
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1497our @ISA = CFClient::UI::Box::;
1302 1498
1303sub size_request { 1499sub new {
1304 my ($self) = @_; 1500 my $class = shift;
1305 1501
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1502 $class->SUPER::new (
1307 1503 vertical => 1,
1308 ( 1504 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1505 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1506}
1352 1507
1353############################################################################# 1508#############################################################################
1354 1509
1355package CFClient::UI::Label; 1510package CFClient::UI::Label;
… …
1372 ellipsise => 3, # end 1527 ellipsise => 3, # end
1373 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1374 fontsize => 1, 1529 fontsize => 1,
1375 align => -1, 1530 align => -1,
1376 valign => -1, 1531 valign => -1,
1377 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1378 can_events => 0, 1534 can_events => 0,
1379 %arg 1535 %arg
1380 ); 1536 );
1381 1537
1382 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1409 1565
1410 delete $self->{texture}; 1566 delete $self->{texture};
1411 $self->SUPER::update; 1567 $self->SUPER::update;
1412} 1568}
1413 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1414sub set_text { 1577sub set_text {
1415 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1416 1579
1417 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1418 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1419 1582
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1422 1585
1586 delete $self->{size_req};
1587 $self->realloc;
1423 $self->update; 1588 $self->update;
1424 $self->check_size;
1425} 1589}
1426 1590
1427sub set_markup { 1591sub set_markup {
1428 my ($self, $markup) = @_; 1592 my ($self, $markup) = @_;
1429 1593
… …
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1598
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1437 1601
1602 delete $self->{size_req};
1603 $self->realloc;
1438 $self->update; 1604 $self->update;
1439 $self->check_size;
1440} 1605}
1441 1606
1442sub size_request { 1607sub size_request {
1443 my ($self) = @_; 1608 my ($self) = @_;
1444 1609
1610 $self->{size_req} ||= do {
1445 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1446 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1447 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1448 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1450 1616
1451 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1452 1618
1453 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1454 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1455 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1456 1622
1457 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1458 1624
1459 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1460 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1461 } 1630 };
1462 1631
1463 ( 1632 @{ $self->{size_req} }
1464 $w + $self->{padding} * 2,
1465 $h + $self->{padding} * 2,
1466 )
1467} 1633}
1468 1634
1469sub size_allocate { 1635sub invoke_size_allocate {
1470 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1471 1637
1638 delete $self->{ox};
1639
1472 delete $self->{texture}; 1640 delete $self->{texture}
1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1473} 1644}
1474 1645
1475sub set_fontsize { 1646sub set_fontsize {
1476 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1477 1648
1478 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1479 delete $self->{texture}; 1650 delete $self->{texture};
1480 1651
1481 $self->update; 1652 $self->realloc;
1482 $self->check_size; 1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1483} 1661}
1484 1662
1485sub _draw { 1663sub _draw {
1486 my ($self) = @_; 1664 my ($self) = @_;
1487 1665
… …
1493 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1675
1498 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1499 1678
1679 unless (exists $self->{ox}) {
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1503 1683
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1509 }; 1687 };
1510 1688
1511 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1513 1693
1514 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1515 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1517 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1519 } 1701 }
1520 1702
1521 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1522} 1704}
1523 1705
… …
1540 can_hover => 1, 1722 can_hover => 1,
1541 can_focus => 1, 1723 can_focus => 1,
1542 valign => 0, 1724 valign => 0,
1543 can_events => 1, 1725 can_events => 1,
1544 #text => ... 1726 #text => ...
1727 #hidden => "*",
1545 @_ 1728 @_
1546 ) 1729 )
1547} 1730}
1548 1731
1549sub _set_text { 1732sub _set_text {
… …
1551 1734
1552 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1553 1736
1554 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1555 1738
1556 delete $self->{texture};
1557
1558 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1559 $self->{text} = $text; 1740 $self->{text} = $text;
1560 1741
1561 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1562 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1563 1745
1564 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1565} 1750}
1566 1751
1567sub set_text { 1752sub set_text {
1568 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1569 1754
1570 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 1756 $self->_set_text ($text);
1572 $self->update;
1573 $self->check_size;
1574} 1757}
1575 1758
1576sub get_text { 1759sub get_text {
1577 $_[0]{text} 1760 $_[0]{text}
1578} 1761}
… …
1583 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1584 1767
1585 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1586} 1769}
1587 1770
1588sub key_down { 1771sub invoke_key_down {
1589 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1590 1773
1591 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1592 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1593 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1605 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1606 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1607 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1608 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1609 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1610 $self->_emit ('escape'); 1793 $self->emit ('escape');
1611 } elsif ($uni) { 1794 } elsif ($uni) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1613 } 1798 }
1614 1799
1615 $self->_set_text ($text); 1800 $self->_set_text ($text);
1616 $self->update;
1617 $self->check_size;
1618}
1619 1801
1802 $self->realloc;
1803
1804 1
1805}
1806
1620sub focus_in { 1807sub invoke_focus_in {
1621 my ($self) = @_; 1808 my ($self) = @_;
1622 1809
1623 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1624 1811
1625 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1626} 1813}
1627 1814
1628sub button_down { 1815sub invoke_button_down {
1629 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1630 1817
1631 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1632 1819
1633 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1634 1821
1635 # byte-index to char-index 1822 # byte-index to char-index
1636 my $text = $self->{text}; 1823 my $text = $self->{text};
1637 utf8::encode $text; 1824 utf8::encode $text;
1638 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1639 1826
1640 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1641 $self->update; 1828 $self->update;
1829
1830 1
1642} 1831}
1643 1832
1644sub mouse_motion { 1833sub invoke_mouse_motion {
1645 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1646# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1836
1837 1
1647} 1838}
1648 1839
1649sub _draw { 1840sub _draw {
1650 my ($self) = @_; 1841 my ($self) = @_;
1651 1842
1652 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1653 1844
1654 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1655 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1656 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1657 } else { 1848 } else {
1658 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1659 } 1850 }
1660 1851
1661 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1662 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1663 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1664 glVertex 0 , 0; 1855 glVertex 0 , 0;
1665 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1666 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1667 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1692 1883
1693our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1694 1885
1695use CFClient::OpenGL; 1886use CFClient::OpenGL;
1696 1887
1697sub key_down { 1888sub invoke_key_down {
1698 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1699 1890
1700 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1701 1892
1702 if ($sym == 13) { 1893 if ($sym == 13) {
1703 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1704 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1705 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1706 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1707 $self->_emit (activate => $txt); 1899 $self->emit (activate => $txt);
1708 $self->update; 1900 $self->update;
1709 1901
1710 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1711 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1712 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1728 } else { 1920 } else {
1729 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1730 } 1922 }
1731 1923
1732 } else { 1924 } else {
1733 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::invoke_key_down ($ev)
1926 }
1927
1734 } 1928 1
1735
1736} 1929}
1737 1930
1738############################################################################# 1931#############################################################################
1739 1932
1740package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1749 1942
1750sub new { 1943sub new {
1751 my $class = shift; 1944 my $class = shift;
1752 1945
1753 $class->SUPER::new ( 1946 $class->SUPER::new (
1754 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1755 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1756 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1757 can_hover => 1, 1951 can_hover => 1,
1758 align => 0, 1952 align => 0,
1759 valign => 0, 1953 valign => 0,
1760 can_events => 1, 1954 can_events => 1,
1761 @_ 1955 @_
1762 ) 1956 )
1763} 1957}
1764 1958
1765sub activate { }
1766
1767sub button_up { 1959sub invoke_button_up {
1768 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1769 1961
1770 $self->emit ("activate") 1962 $self->emit ("activate")
1771 if $x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1772 && $y >= 0 && $y < $self->{h}; 1964 && $y >= 0 && $y < $self->{h};
1965
1966 1
1773} 1967}
1774 1968
1775sub _draw { 1969sub _draw {
1776 my ($self) = @_; 1970 my ($self) = @_;
1777 1971
1778 local $self->{fg} = $self->{fg}; 1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1779
1780 if ($GRAB == $self) {
1781 $self->{fg} = $self->{active_fg};
1782 }
1783 1973
1784 glEnable GL_TEXTURE_2D; 1974 glEnable GL_TEXTURE_2D;
1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1786 glColor 0, 0, 0, 1; 1976 glColor 0, 0, 0, 1;
1787 1977
… …
1792 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1793} 1983}
1794 1984
1795############################################################################# 1985#############################################################################
1796 1986
1987package CFClient::UI::ImageButton;
1988
1989our @ISA = CFClient::UI::Image::;
1990
1991use CFClient::OpenGL;
1992
1993my %textures;
1994
1995sub new {
1996 my $class = shift;
1997
1998 my $self = $class->SUPER::new (
1999 padding_x => 4,
2000 padding_y => 4,
2001 fg => [1, 1, 1],
2002 active_fg => [0, 0, 1],
2003 can_hover => 1,
2004 align => 0,
2005 valign => 0,
2006 can_events => 1,
2007 @_
2008 );
2009}
2010
2011sub invoke_button_up {
2012 my ($self, $ev, $x, $y) = @_;
2013
2014 $self->emit ("activate")
2015 if $x >= 0 && $x < $self->{w}
2016 && $y >= 0 && $y < $self->{h};
2017
2018 1
2019}
2020
2021#############################################################################
2022
1797package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
1798 2024
1799our @ISA = CFClient::UI::DrawBG::; 2025our @ISA = CFClient::UI::DrawBG::;
1800 2026
1801my @tex = 2027my @tex =
… …
1806 2032
1807sub new { 2033sub new {
1808 my $class = shift; 2034 my $class = shift;
1809 2035
1810 $class->SUPER::new ( 2036 $class->SUPER::new (
1811 padding => 2, 2037 padding_x => 2,
2038 padding_y => 2,
1812 fg => [1, 1, 1], 2039 fg => [1, 1, 1],
1813 active_fg => [1, 1, 0], 2040 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2], 2041 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5], 2042 active_bg => [1, 1, 1, 0.5],
1816 state => 0, 2043 state => 0,
… …
1820} 2047}
1821 2048
1822sub size_request { 2049sub size_request {
1823 my ($self) = @_; 2050 my ($self) = @_;
1824 2051
1825 ($self->{padding} * 2 + 6) x 2 2052 (6) x 2
1826} 2053}
1827 2054
1828sub button_down { 2055sub invoke_button_down {
1829 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1830 2057
1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1834 $self->_emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
1835 } 2066 1
1836} 2067}
1837 2068
1838sub _draw { 2069sub _draw {
1839 my ($self) = @_; 2070 my ($self) = @_;
1840 2071
1841 $self->SUPER::_draw; 2072 $self->SUPER::_draw;
1842 2073
1843 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2074 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844 2075
1845 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2076 my ($w, $h) = @$self{qw(w h)};
2077
2078 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1846 2079
1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2080 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848 2081
1849 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2082 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850 2083
… …
2005 2238
2006 my $h1 = $self->{h} * (1 - $ycut1); 2239 my $h1 = $self->{h} * (1 - $ycut1);
2007 my $h2 = $self->{h} * (1 - $ycut2); 2240 my $h2 = $self->{h} * (1 - $ycut2);
2008 2241
2009 glEnable GL_BLEND; 2242 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2245 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2247
2014 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2248 glBindTexture GL_TEXTURE_2D, $t1->{name};
2015 glBegin GL_QUADS; 2249 glBegin GL_QUADS;
… …
2115 fg => [1, 1, 1], 2349 fg => [1, 1, 1],
2116 active_fg => [0, 0, 0], 2350 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2], 2351 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5], 2352 active_bg => [1, 1, 1, 0.5],
2119 range => [0, 0, 100, 10, 0], 2353 range => [0, 0, 100, 10, 0],
2120 req_w => $::WIDTH / 80, 2354 min_w => $::WIDTH / 80,
2121 req_h => $::WIDTH / 80, 2355 min_h => $::WIDTH / 80,
2122 vertical => 0, 2356 vertical => 0,
2123 can_hover => 1, 2357 can_hover => 1,
2124 inner_pad => 0.02, 2358 inner_pad => 0.02,
2125 @_ 2359 @_
2126 ); 2360 );
… …
2132} 2366}
2133 2367
2134sub set_range { 2368sub set_range {
2135 my ($self, $range) = @_; 2369 my ($self, $range) = @_;
2136 2370
2137 $self->{range} = $range; 2371 ($range, $self->{range}) = ($self->{range}, $range);
2138 2372
2373 if ("@$range" ne "@{$self->{range}}") {
2139 $self->update; 2374 $self->update;
2375 $self->set_value ($self->{range}[0]);
2376 }
2140} 2377}
2141 2378
2142sub set_value { 2379sub set_value {
2143 my ($self, $value) = @_; 2380 my ($self, $value) = @_;
2144 2381
… …
2155 if $unit; 2392 if $unit;
2156 2393
2157 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2394 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2158 2395
2159 if ($value != $old_value) { 2396 if ($value != $old_value) {
2160 $self->_emit (changed => $value); 2397 $self->emit (changed => $value);
2161 $self->update; 2398 $self->update;
2162 } 2399 }
2163} 2400}
2164 2401
2165sub size_request { 2402sub size_request {
2166 my ($self) = @_; 2403 my ($self) = @_;
2167 2404
2168 my $w = $self->{req_w}; 2405 ($self->{req_w}, $self->{req_h})
2169 my $h = $self->{req_h};
2170
2171 $self->{vertical} ? ($h, $w) : ($w, $h)
2172} 2406}
2173 2407
2174sub button_down { 2408sub invoke_button_down {
2175 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2176 2410
2177 $self->SUPER::button_down ($ev, $x, $y); 2411 $self->SUPER::invoke_button_down ($ev, $x, $y);
2178 2412
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180 2414
2181 $self->mouse_motion ($ev, $x, $y); 2415 $self->mouse_motion ($ev, $x, $y)
2182} 2416}
2183 2417
2184sub mouse_motion { 2418sub invoke_mouse_motion {
2185 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2186 2420
2187 if ($GRAB == $self) { 2421 if ($GRAB == $self) {
2188 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2422 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2189 2423
2190 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2424 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191 2425
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2426 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193 2427
2194 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2428 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2429 } else {
2430 return 0;
2431 }
2432
2195 } 2433 1
2196} 2434}
2197 2435
2198sub update { 2436sub update {
2199 my ($self) = @_; 2437 my ($self) = @_;
2200 2438
2201 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2439 delete $self->{knob_w};
2440 $self->SUPER::update;
2441}
2442
2443sub _draw {
2444 my ($self) = @_;
2445
2446 unless ($self->{knob_w}) {
2202 $self->set_value ($self->{range}[0]); 2447 $self->set_value ($self->{range}[0]);
2203 2448
2204 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2449 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100; 2450 my $range = ($hi - $page - $lo) || 1e-100;
2206 2451
… …
2212 $value = ($value - $lo) / $range; 2457 $value = ($value - $lo) / $range;
2213 $value = $value * $self->{scale} + $self->{offset}; 2458 $value = $value * $self->{scale} + $self->{offset};
2214 2459
2215 $self->{knob_x} = $value - $knob_w * 0.5; 2460 $self->{knob_x} = $value - $knob_w * 0.5;
2216 $self->{knob_w} = $knob_w; 2461 $self->{knob_w} = $knob_w;
2217 }); 2462 }
2218
2219 $self->SUPER::update;
2220}
2221
2222sub _draw {
2223 my ($self) = @_;
2224 2463
2225 $self->SUPER::_draw (); 2464 $self->SUPER::_draw ();
2226 2465
2227 glScale $self->{w}, $self->{h}; 2466 glScale $self->{w}, $self->{h};
2228 2467
… …
2289sub set_range { shift->{slider}->set_range (@_) } 2528sub set_range { shift->{slider}->set_range (@_) }
2290sub set_value { shift->{slider}->set_value (@_) } 2529sub set_value { shift->{slider}->set_value (@_) }
2291 2530
2292############################################################################# 2531#############################################################################
2293 2532
2294package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2295 2534
2296our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2297 2536
2298use CFClient::OpenGL; 2537use CFClient::OpenGL;
2299 2538
… …
2301 my $class = shift; 2540 my $class = shift;
2302 2541
2303 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2304 fontsize => 1, 2543 fontsize => 1,
2305 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2306 #font => default_font 2546 #font => default_font
2307 @_, 2547 @_,
2308 2548
2309 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2310 par => [], 2550 par => [],
… …
2325 2565
2326 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2327 $self->reflow; 2567 $self->reflow;
2328} 2568}
2329 2569
2330sub size_allocate { 2570sub invoke_size_allocate {
2331 my ($self, $w, $h) = @_; 2571 my ($self, $w, $h) = @_;
2332
2333 $self->SUPER::size_allocate ($w, $h);
2334 2572
2335 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337 $self->{layout}->set_width ($self->{children}[0]{w}); 2575 $self->{layout}->set_width ($self->{children}[0]{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2338 2577
2339 $self->reflow; 2578 $self->reflow;
2579
2580 $self->SUPER::invoke_size_allocate ($w, $h)
2340} 2581}
2341 2582
2342sub text_size { 2583sub text_size {
2343 my ($self, $text, $indent) = @_; 2584 my ($self, $text, $indent) = @_;
2344 2585
2345 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2346 2587
2347 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2348 $layout->set_width ($self->{children}[0]{w} - $indent); 2589 $layout->set_width ($self->{children}[0]{w} - $indent);
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2349 $layout->set_markup ($text); 2591 $layout->set_markup ($text);
2350 2592
2351 $layout->size 2593 $layout->size
2352} 2594}
2353 2595
… …
2392 2634
2393 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2394 2636
2395 delete $self->{texture}; 2637 delete $self->{texture};
2396 2638
2397 $ROOT->on_post_alloc ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399 2641
2400 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2401 my $height = 0; 2643 my $height = 0;
2402 2644
… …
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 2648
2407 for (@{$self->{par}}) { 2649 for (@{$self->{par}}) {
2408 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2409 $layout->set_width ($W - $_->[3]); 2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2410 $layout->set_markup ($_->[4]); 2653 $layout->set_markup ($_->[4]);
2411 my ($w, $h) = $layout->size; 2654 my ($w, $h) = $layout->size;
2412 $_->[0] = $w + $_->[3]; 2655 $_->[0] = $w + $_->[3];
2413 $_->[1] = $h; 2656 $_->[1] = $h;
2414 } 2657 }
… …
2417 } 2660 }
2418 2661
2419 $self->{height} = $height; 2662 $self->{height} = $height;
2420 2663
2421 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2422 2665
2423 delete $self->{texture}; 2666 delete $self->{texture};
2424 } 2667 }
2425 2668
2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2427 glClearColor 0.5, 0.5, 0.5, 0; 2670 glClearColor 0, 0, 0, 0;
2428 glClear GL_COLOR_BUFFER_BIT; 2671 glClear GL_COLOR_BUFFER_BIT;
2429 2672
2430 my $top = int $self->{children}[1]{range}[0]; 2673 my $top = int $self->{children}[1]{range}[0];
2431 2674
2432 my $y0 = $top; 2675 my $y0 = $top;
… …
2446 my $h = $par->[1]; 2689 my $h = $par->[1];
2447 2690
2448 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2449 $layout->set_foreground (@{ $par->[2] }); 2692 $layout->set_foreground (@{ $par->[2] });
2450 $layout->set_width ($W - $par->[3]); 2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2451 $layout->set_markup ($par->[4]); 2695 $layout->set_markup ($par->[4]);
2452 2696
2453 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2454 2698
2455 glRasterPos $par->[3], $y - $y0; 2699 glRasterPos $par->[3], $y - $y0;
… …
2467sub _draw { 2711sub _draw {
2468 my ($self) = @_; 2712 my ($self) = @_;
2469 2713
2470 glEnable GL_TEXTURE_2D; 2714 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 1, 1, 1, 1; 2716 glColor 0, 0, 0, 1;
2473 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2474 glDisable GL_TEXTURE_2D; 2718 glDisable GL_TEXTURE_2D;
2475 2719
2476 $self->{children}[1]->draw; 2720 $self->{children}[1]->draw;
2477 2721
2478} 2722}
… …
2527 2771
2528sub new { 2772sub new {
2529 my $class = shift; 2773 my $class = shift;
2530 2774
2531 my $self = $class->SUPER::new ( 2775 my $self = $class->SUPER::new (
2532 state => 0, 2776 state => 0,
2533 connect_activate => \&toggle_flopper, 2777 on_activate => \&toggle_flopper,
2534 @_ 2778 @_
2535 ); 2779 );
2536 2780
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2781 $self
2543} 2782}
2544 2783
2545sub toggle_flopper { 2784sub toggle_flopper {
2546 my ($self) = @_; 2785 my ($self) = @_;
2547 2786
2548 # TODO: use animation 2787 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2788}
2560 2789
2561############################################################################# 2790#############################################################################
2562 2791
2563package CFClient::UI::Tooltip; 2792package CFClient::UI::Tooltip;
… …
2576} 2805}
2577 2806
2578sub set_tooltip_from { 2807sub set_tooltip_from {
2579 my ($self, $widget) = @_; 2808 my ($self, $widget) = @_;
2580 2809
2810 my $tooltip = $widget->{tooltip};
2811
2812 if ($ENV{CFPLUS_DEBUG} & 2) {
2813 $tooltip .= "\n\n" . (ref $widget) . "\n"
2814 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2815 . "req $widget->{req_w} $widget->{req_h}\n"
2816 . "visible $widget->{visible}";
2817 }
2818
2819 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//;
2821
2581 $self->add (new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2582 markup => $widget->{tooltip}, 2823 markup => $tooltip,
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8, 2825 fontsize => 0.8,
2585 fg => [0, 0, 0, 1], 2826 fg => [0, 0, 0, 1],
2586 ellipsise => 0, 2827 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP), 2828 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2594 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2595 2836
2596 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2597} 2838}
2598 2839
2599sub size_allocate { 2840sub invoke_size_allocate {
2600 my ($self, $w, $h) = @_; 2841 my ($self, $w, $h) = @_;
2601 2842
2602 $self->SUPER::size_allocate ($w - 4, $h - 4); 2843 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2844}
2845
2846sub invoke_visibility_change {
2847 my ($self, $visible) = @_;
2848
2849 return unless $visible;
2850
2851 $self->{root}->on_post_alloc ("move_$self" => sub {
2852 my $widget = $self->{owner}
2853 or return;
2854
2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856
2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858 if $x + $self->{w} > $self->{root}{w};
2859
2860 $self->move_abs ($x, $y);
2861 });
2603} 2862}
2604 2863
2605sub _draw { 2864sub _draw {
2606 my ($self) = @_; 2865 my ($self) = @_;
2607 2866
… …
2624 glVertex $w, $h; 2883 glVertex $w, $h;
2625 glVertex $w, 0; 2884 glVertex $w, 0;
2626 glEnd; 2885 glEnd;
2627 2886
2628 glTranslate 2 - 0.375, 2 - 0.375; 2887 glTranslate 2 - 0.375, 2 - 0.375;
2888
2629 $self->SUPER::_draw; 2889 $self->SUPER::_draw;
2630} 2890}
2631 2891
2632############################################################################# 2892#############################################################################
2633 2893
… …
2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2693 2953
2694 if ($tex) { 2954 if ($tex) {
2695 glEnable GL_TEXTURE_2D; 2955 glEnable GL_TEXTURE_2D;
2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2697 glColor 1, 1, 1, 1; 2957 glColor 0, 0, 0, 1;
2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2699 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2700 } 2960 }
2701} 2961}
2702 2962
2703sub DESTROY { 2963sub destroy {
2704 my ($self) = @_; 2964 my ($self) = @_;
2705 2965
2706 $self->{timer}->cancel 2966 $self->{timer}->cancel
2707 if $self->{timer}; 2967 if $self->{timer};
2708 2968
2709 $self->SUPER::DESTROY; 2969 $self->SUPER::destroy;
2710} 2970}
2711 2971
2712############################################################################# 2972#############################################################################
2713 2973
2714package CFClient::UI::InventoryItem; 2974package CFClient::UI::Buttonbar;
2715 2975
2716our @ISA = CFClient::UI::HBox::; 2976our @ISA = CFClient::UI::HBox::;
2717 2977
2718sub new { 2978# TODO: should actualyl wrap buttons and other goodies.
2719 my $class = shift;
2720
2721 my %args = @_;
2722
2723 my $item = delete $args{item};
2724
2725 my $desc = CFClient::Item::desc_string $item;
2726
2727 my $self = $class->SUPER::new (
2728 can_hover => 1,
2729 can_events => 1,
2730 tooltip => ((CFClient::UI::Label::escape $desc)
2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732 connect_button_down => sub {
2733 my ($self, $ev, $x, $y) = @_;
2734
2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2744 } elsif ($ev->{button} == 1) {
2745 $::CONN->send ("examine $item->{tag}");
2746 } elsif ($ev->{button} == 2) {
2747 $::CONN->send ("apply $item->{tag}");
2748 } elsif ($ev->{button} == 3) {
2749 my @menu_items = (
2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2762 ),
2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766 }
2767
2768 1
2769 },
2770 %args
2771 );
2772
2773
2774 $self->add (new CFClient::UI::Face
2775 can_events => 0,
2776 face => $item->{face},
2777 anim => $item->{anim},
2778 animspeed => $item->{animspeed},
2779 );
2780
2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2786
2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2796}
2797
2798#############################################################################
2799
2800package CFClient::UI::Inventory;
2801
2802our @ISA = CFClient::UI::ScrolledWindow::;
2803
2804sub new {
2805 my $class = shift;
2806
2807 my $self = $class->SUPER::new (
2808 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2809 @_,
2810 );
2811
2812 $self
2813}
2814
2815sub set_items {
2816 my ($self, $items) = @_;
2817
2818 $self->{scrolled}->clear;
2819 return unless $items;
2820
2821 my @items = sort {
2822 ($a->{type} <=> $b->{type})
2823 or ($a->{name} cmp $b->{name})
2824 } @$items;
2825
2826 $self->{real_items} = \@items;
2827
2828 my $row = 0;
2829 for my $item (@items) {
2830 CFClient::Item::update_widgets $item;
2831
2832 $self->{scrolled}->add (0, $row, $item->{face_widget});
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835
2836 $row++;
2837 }
2838
2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840}
2841
2842sub size_request {
2843 my ($self) = @_;
2844 ($self->{req_w}, $self->{req_h});
2845}
2846 2979
2847############################################################################# 2980#############################################################################
2848 2981
2849package CFClient::UI::Menu; 2982package CFClient::UI::Menu;
2850 2983
… …
2862 ); 2995 );
2863 2996
2864 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2865 2998
2866 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2867 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2868 3001
2869 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2870 if (!ref $widget) { 3003 if (!ref $widget) {
2871 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2872 can_hover => 1, 3005 can_hover => 1,
2873 can_events => 1, 3006 can_events => 1,
2874 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2875 } 3009 }
2876 3010
2877 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2878 3012
2879 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2884 3018
2885# popup given the event (must be a mouse button down event currently) 3019# popup given the event (must be a mouse button down event currently)
2886sub popup { 3020sub popup {
2887 my ($self, $ev) = @_; 3021 my ($self, $ev) = @_;
2888 3022
2889 $self->_emit ("popdown"); 3023 $self->emit ("popdown");
2890 3024
2891 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2892 $GRAB = $self; 3026 $GRAB = $self;
2893 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2894 3028
2895 $self->show; 3029 $self->show;
2896 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3030 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2897} 3031}
2898 3032
2899sub mouse_motion { 3033sub invoke_mouse_motion {
2900 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2901 3035
2902 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2903 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2904 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2905}
2906 3039
3040 0
3041}
3042
2907sub button_up { 3043sub invoke_button_up {
2908 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2909 3045
2910 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2911 undef $GRAB; 3047 undef $GRAB;
2912 $self->hide; 3048 $self->hide;
2913 3049
2914 $self->_emit ("popdown"); 3050 $self->emit ("popdown");
2915 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
3052 } else {
3053 return 0
3054 }
3055
2916 } 3056 1
2917} 3057}
2918 3058
2919############################################################################# 3059#############################################################################
2920 3060
2921package CFClient::UI::Statusbox; 3061package CFClient::UI::Multiplexer;
2922 3062
2923our @ISA = CFClient::UI::VBox::; 3063our @ISA = CFClient::UI::Container::;
2924 3064
2925sub new { 3065sub new {
2926 my $class = shift; 3066 my $class = shift;
2927 3067
2928 $class->SUPER::new ( 3068 my $self = $class->SUPER::new (
3069 @_,
3070 );
3071
3072 $self->{current} = $self->{children}[0]
3073 if @{ $self->{children} };
3074
3075 $self
3076}
3077
3078sub add {
3079 my ($self, @widgets) = @_;
3080
3081 $self->SUPER::add (@widgets);
3082
3083 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} };
3085}
3086
3087sub set_current_page {
3088 my ($self, $page_or_widget) = @_;
3089
3090 my $widget = ref $page_or_widget
3091 ? $page_or_widget
3092 : $self->{children}[$page_or_widget];
3093
3094 $self->{current} = $widget;
3095 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3096
3097 $self->emit (page_changed => $self->{current});
3098
3099 $self->realloc;
3100}
3101
3102sub visible_children {
3103 $_[0]{current}
3104}
3105
3106sub size_request {
3107 my ($self) = @_;
3108
3109 $self->{current}->size_request
3110}
3111
3112sub invoke_size_allocate {
3113 my ($self, $w, $h) = @_;
3114
3115 $self->{current}->configure (0, 0, $w, $h);
3116
3117 1
3118}
3119
3120sub _draw {
3121 my ($self) = @_;
3122
3123 $self->{current}->draw;
3124}
3125
3126#############################################################################
3127
3128package CFClient::UI::Notebook;
3129
3130our @ISA = CFClient::UI::VBox::;
3131
3132sub new {
3133 my $class = shift;
3134
3135 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3138 # filter => # will be put between multiplexer and $self
3139 @_,
3140 );
3141
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3143 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3144
3145 $self
3146}
3147
3148sub add {
3149 my ($self, $title, $widget, $tooltip) = @_;
3150
3151 Scalar::Util::weaken $self;
3152
3153 $self->{buttonbar}->add (new CFClient::UI::Button
3154 markup => $title,
3155 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) },
3157 );
3158
3159 $self->{multiplexer}->add ($widget);
3160}
3161
3162sub set_current_page {
3163 my ($self, $page) = @_;
3164
3165 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current});
3167}
3168
3169#############################################################################
3170
3171package CFClient::UI::Combobox;
3172
3173use utf8;
3174
3175our @ISA = CFClient::UI::Button::;
3176
3177sub new {
3178 my $class = shift;
3179
3180 my $self = $class->SUPER::new (
3181 options => [], # [value, title, longdesc], ...
3182 value => undef,
3183 @_,
3184 );
3185
3186 $self->_set_value ($self->{value});
3187
3188 $self
3189}
3190
3191sub invoke_button_down {
3192 my ($self, $ev) = @_;
3193
3194 my @menu_items;
3195
3196 for (@{ $self->{options} }) {
3197 my ($value, $title, $tooltip) = @$_;
3198
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 }
3201
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203}
3204
3205sub _set_value {
3206 my ($self, $value) = @_;
3207
3208 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3209 or return;
3210
3211 $self->{value} = $item->[0];
3212 $self->set_markup ("$item->[1] ⇓");
3213 $self->set_tooltip ($item->[2]);
3214}
3215
3216sub set_value {
3217 my ($self, $value) = @_;
3218
3219 return unless $self->{value} ne $value;
3220
3221 $self->_set_value ($value);
3222 $self->emit (changed => $value);
3223}
3224
3225#############################################################################
3226
3227package CFClient::UI::Statusbox;
3228
3229our @ISA = CFClient::UI::VBox::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
2929 fontsize => 0.8, 3235 fontsize => 0.8,
2930 @_, 3236 @_,
2931 ) 3237 );
3238
3239 Scalar::Util::weaken (my $this = $self);
3240
3241 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3242
3243 $self
2932} 3244}
2933 3245
2934sub reorder { 3246sub reorder {
2935 my ($self) = @_; 3247 my ($self) = @_;
2936 my $NOW = time; 3248 my $NOW = Time::HiRes::time;
3249
3250 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} };
2937 3254
2938 while (my ($k, $v) = each %{ $self->{item} }) { 3255 while (my ($k, $v) = each %{ $self->{item} }) {
2939 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3256 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2940 } 3257 }
2941 3258
… …
2944 my @items = sort { 3261 my @items = sort {
2945 $a->{pri} <=> $b->{pri} 3262 $a->{pri} <=> $b->{pri}
2946 or $b->{id} <=> $a->{id} 3263 or $b->{id} <=> $a->{id}
2947 } values %{ $self->{item} }; 3264 } values %{ $self->{item} };
2948 3265
3266 $self->{timer}->interval (1);
3267
2949 my $count = 10 + 1; 3268 my $count = 10 + 1;
2950 for my $item (@items) { 3269 for my $item (@items) {
2951 last unless --$count; 3270 last unless --$count;
2952 3271
2953 push @widgets, $item->{label} ||= do { 3272 my $label = $item->{label} ||= do {
2954 # TODO: doesn't handle markup well (read as: at all) 3273 # TODO: doesn't handle markup well (read as: at all)
2955 my $short = $item->{count} > 1 3274 my $short = $item->{count} > 1
2956 ? "<b>$item->{count} ×</b> $item->{text}" 3275 ? "<b>$item->{count} ×</b> $item->{text}"
2957 : $item->{text}; 3276 : $item->{text};
2958 3277
… …
2966 tooltip => $item->{tooltip}, 3285 tooltip => $item->{tooltip},
2967 tooltip_font => $::FONT_PROP, 3286 tooltip_font => $::FONT_PROP,
2968 tooltip_width => 0.67, 3287 tooltip_width => 0.67,
2969 fontsize => $item->{fontsize} || $self->{fontsize}, 3288 fontsize => $item->{fontsize} || $self->{fontsize},
2970 max_w => $::WIDTH * 0.44, 3289 max_w => $::WIDTH * 0.44,
2971 fg => $item->{fg}, 3290 fg => [@{ $item->{fg} }],
2972 can_events => 1, 3291 can_events => 1,
2973 can_hover => 1 3292 can_hover => 1
2974 }; 3293 };
3294
3295 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3296 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3297 $label->update;
3298 $label->set_max_size (undef, $label->{req_h} * $diff)
3299 if $diff < 1;
3300 $self->{timer}->interval (1/30);
3301 } else {
3302 $label->{fg}[3] = $item->{fg}[3] || 1;
3303 }
3304
3305 push @widgets, $label;
2975 } 3306 }
2976 3307
2977 $self->clear; 3308 $self->clear;
2978 $self->SUPER::add (reverse @widgets); 3309 $self->SUPER::add (reverse @widgets);
2979} 3310}
… …
2984 $text =~ s/^\s+//; 3315 $text =~ s/^\s+//;
2985 $text =~ s/\s+$//; 3316 $text =~ s/\s+$//;
2986 3317
2987 return unless $text; 3318 return unless $text;
2988 3319
2989 my $timeout = time + ((delete $arg{timeout}) || 60); 3320 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2990 3321
2991 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3322 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2992 3323
2993 if (my $item = $self->{item}{$group}) { 3324 if (my $item = $self->{item}{$group}) {
2994 if ($item->{text} eq $text) { 3325 if ($item->{text} eq $text) {
2995 $item->{count}++; 3326 $item->{count}++;
2996 } else { 3327 } else {
2997 $item->{count} = 1; 3328 $item->{count} = 1;
2998 $item->{text} = $item->{tooltip} = $text; 3329 $item->{text} = $item->{tooltip} = $text;
2999 } 3330 }
3000 $item->{id} = ++$self->{id}; 3331 $item->{id} += 0.2;#d#
3001 $item->{timeout} = $timeout; 3332 $item->{timeout} = $timeout;
3002 delete $item->{label}; 3333 delete $item->{label};
3003 } else { 3334 } else {
3004 $self->{item}{$group} = { 3335 $self->{item}{$group} = {
3005 id => ++$self->{id}, 3336 id => ++$self->{id},
… …
3024 3355
3025 $self->reorder; 3356 $self->reorder;
3026 $self->SUPER::reconfigure; 3357 $self->SUPER::reconfigure;
3027} 3358}
3028 3359
3360sub destroy {
3361 my ($self) = @_;
3362
3363 $self->{timer}->cancel;
3364
3365 $self->SUPER::destroy;
3366}
3367
3029############################################################################# 3368#############################################################################
3030 3369
3031package CFClient::UI::Root; 3370package CFClient::UI::Inventory;
3032 3371
3033our @ISA = CFClient::UI::Container::; 3372our @ISA = CFClient::UI::ScrolledWindow::;
3034
3035use CFClient::OpenGL;
3036 3373
3037sub new { 3374sub new {
3038 my $class = shift; 3375 my $class = shift;
3039 3376
3040 $class->SUPER::new ( 3377 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3379 @_,
3380 );
3381
3382 $self
3383}
3384
3385sub set_items {
3386 my ($self, $items) = @_;
3387
3388 $self->{child}->clear;
3389 return unless $items;
3390
3391 my @items = sort {
3392 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name})
3394 } @$items;
3395
3396 $self->{real_items} = \@items;
3397
3398 my $row = 0;
3399 for my $item (@items) {
3400 CFClient::Item::update_widgets $item;
3401
3402 $self->{child}->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget});
3405
3406 $row++;
3407 }
3408}
3409
3410#############################################################################
3411
3412package CFClient::UI::BindEditor;
3413
3414our @ISA = CFClient::UI::FancyFrame::;
3415
3416sub new {
3417 my $class = shift;
3418
3419 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421 $self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425 text => "start recording",
3426 tooltip => "Start/Stops recording of actions."
3427 ."All subsequent actions after the recording started will be captured."
3428 ."The actions are displayed after the record was stopped."
3429 ."To bind the action you have to click on the 'Bind' button",
3430 on_activate => sub {
3431 unless ($self->{recording}) {
3432 $self->start;
3433 } else {
3434 $self->stop;
3435 }
3436 });
3437
3438 $vb->add (new CFClient::UI::Label text => "Actions:");
3439 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3442 $vb->add (my $hb = new CFClient::UI::HBox);
3443 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444 $hb->add (new CFClient::UI::Button
3445 text => "bind",
3446 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447 on_activate => sub {
3448 $self->ask_for_bind;
3449 });
3450
3451 $vb->add (my $hb = new CFClient::UI::HBox);
3452 $hb->add (new CFClient::UI::Button
3453 text => "ok",
3454 expand => 1,
3455 tooltip => "This closes the binding editor and saves the binding",
3456 on_activate => sub {
3457 $self->hide;
3458 $self->commit;
3459 });
3460
3461 $hb->add (new CFClient::UI::Button
3462 text => "cancel",
3463 expand => 1,
3464 tooltip => "This closes the binding editor without saving",
3465 on_activate => sub {
3466 $self->hide;
3467 $self->{binding_cancel}->()
3468 if $self->{binding_cancel};
3469 });
3470
3471 $self->update_binding_widgets;
3472
3473 $self
3474}
3475
3476sub commit {
3477 my ($self) = @_;
3478 my ($mod, $sym, $cmds) = $self->get_binding;
3479 if ($sym != 0 && @$cmds > 0) {
3480 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481 ."'. Don't forget 'Save Config'!");
3482 $self->{binding_change}->($mod, $sym, $cmds)
3483 if $self->{binding_change};
3484 } else {
3485 $::STATUSBOX->add ("No action bound, no key or action specified!");
3486 $self->{binding_cancel}->()
3487 if $self->{binding_cancel};
3488 }
3489}
3490
3491sub start {
3492 my ($self) = @_;
3493
3494 $self->{rec_btn}->set_text ("stop recording");
3495 $self->{recording} = 1;
3496 $self->clear_command_list;
3497 $::CONN->start_record if $::CONN;
3498}
3499
3500sub stop {
3501 my ($self) = @_;
3502
3503 $self->{rec_btn}->set_text ("start recording");
3504 $self->{recording} = 0;
3505
3506 my $rec;
3507 $rec = $::CONN->stop_record if $::CONN;
3508 return unless ref $rec eq 'ARRAY';
3509 $self->set_command_list ($rec);
3510}
3511
3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3518sub ask_for_bind {
3519 my ($self, $commit, $end_cb) = @_;
3520
3521 CFClient::Binder::open_binding_dialog (sub {
3522 my ($mod, $sym) = @_;
3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524 $self->update_binding_widgets;
3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3527 });
3528}
3529
3530# $mod and $sym are the modifiers and key symbol
3531# $cmds is a array ref of strings (the commands)
3532# $cb is the callback that is executed on OK
3533# $ccb is the callback that is executed on CANCEL and
3534# when the binding was unsuccessful on OK
3535sub set_binding {
3536 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538 $self->clear_command_list;
3539 $self->{recording} = 0;
3540 $self->{rec_btn}->set_text ("start recording");
3541
3542 $self->{binding} = [$mod, $sym];
3543 $self->{commands} = $cmds;
3544
3545 $self->{binding_change} = $cb;
3546 $self->{binding_cancel} = $ccb;
3547
3548 $self->update_binding_widgets;
3549}
3550
3551# this is a shortcut method that asks for a binding
3552# and then just binds it.
3553sub do_quick_binding {
3554 my ($self, $cmds, $end_cb) = @_;
3555 $self->set_binding (undef, undef, $cmds, sub {
3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557 });
3558 $self->ask_for_bind (1, $end_cb);
3559}
3560
3561sub update_binding_widgets {
3562 my ($self) = @_;
3563 my ($mod, $sym, $cmds) = $self->get_binding;
3564 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565 $self->set_command_list ($cmds);
3566}
3567
3568sub get_binding {
3569 my ($self) = @_;
3570 return (
3571 $self->{binding}->[0],
3572 $self->{binding}->[1],
3573 [ grep { defined $_ } @{$self->{commands}} ]
3574 );
3575}
3576
3577sub clear_command_list {
3578 my ($self) = @_;
3579 $self->{cmdbox}->clear ();
3580}
3581
3582sub set_command_list {
3583 my ($self, $cmds) = @_;
3584
3585 $self->{cmdbox}->clear ();
3586 $self->{commands} = $cmds;
3587
3588 my $idx = 0;
3589
3590 for (@$cmds) {
3591 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593 my $i = $idx;
3594 $hb->add (new CFClient::UI::Label text => $_);
3595 $hb->add (new CFClient::UI::Button
3596 text => "delete",
3597 tooltip => "Deletes the action from the record",
3598 on_activate => sub {
3599 $self->{cmdbox}->remove ($hb);
3600 $cmds->[$i] = undef;
3601 });
3602
3603
3604 $idx++
3605 }
3606}
3607
3608#############################################################################
3609
3610package CFClient::UI::SpellList;
3611
3612our @ISA = CFClient::UI::Table::;
3613
3614sub new {
3615 my $class = shift;
3616
3617 my $self = $class->SUPER::new (
3618 binding => [],
3619 commands => [],
3041 @_, 3620 @_,
3042 ) 3621 )
3043} 3622}
3044 3623
3045sub configure { 3624my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3046 my ($self, $x, $y, $w, $h) = @_;
3047 3625
3048 $self->{w} = $w; 3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3049 $self->{h} = $h; 3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3050} 3628my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3630my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3634my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3051 3636
3052sub check_size { 3637sub rebuild_spell_list {
3638 my ($self) = @_;
3639
3640 $CFClient::UI::ROOT->on_refresh ($self => sub {
3641 $self->clear;
3642
3643 return unless $::CONN;
3644
3645 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650
3651 my $row = 0;
3652
3653 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654 my $spell = $self->{spell}{$_};
3655
3656 $row++;
3657
3658 my $spell_cb = sub {
3659 my ($widget, $ev) = @_;
3660
3661 if ($ev->{button} == 1) {
3662 $::CONN->user_send ("cast $spell->{name}");
3663 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu
3667 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ],
3671 )->popup ($ev);
3672 } else {
3673 return 0;
3674 }
3675
3676 1
3677 };
3678
3679 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681 #TODO: add path info to tooltip
3682 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3683
3684 $self->add (0, $row, new CFClient::UI::Face
3685 face => $spell->{face},
3686 can_hover => 1,
3687 can_events => 1,
3688 tooltip => $tooltip,
3689 on_button_down => $spell_cb,
3690 );
3691
3692 $self->add (1, $row, new CFClient::UI::Label
3693 expand => 1,
3694 text => $spell->{name},
3695 can_hover => 1,
3696 can_events => 1,
3697 tooltip => $tooltip,
3698 on_button_down => $spell_cb,
3699 );
3700
3701 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705 }
3706 });
3707}
3708
3709sub add_spell {
3053 my ($self) = @_; 3710 my ($self, $spell) = @_;
3054 3711
3055 $self->size_allocate ($self->{w}, $self->{h}) 3712 $self->{spell}->{$spell->{name}} = $spell;
3056 if $self->{w}; 3713 $self->rebuild_spell_list;
3714}
3715
3716sub remove_spell {
3717 my ($self, $spell) = @_;
3718
3719 delete $self->{spell}->{$spell->{name}};
3720 $self->rebuild_spell_list;
3721}
3722
3723sub clear_spells {
3724 my ($self) = @_;
3725
3726 $self->{spell} = {};
3727 $self->rebuild_spell_list;
3728}
3729
3730#############################################################################
3731
3732package CFClient::UI::Root;
3733
3734our @ISA = CFClient::UI::Container::;
3735
3736use List::Util qw(min max);
3737
3738use CFClient::OpenGL;
3739
3740sub new {
3741 my $class = shift;
3742
3743 my $self = $class->SUPER::new (
3744 visible => 1,
3745 @_,
3746 );
3747
3748 Scalar::Util::weaken ($self->{root} = $self);
3749
3750 $self
3057} 3751}
3058 3752
3059sub size_request { 3753sub size_request {
3060 my ($self) = @_; 3754 my ($self) = @_;
3061 3755
3062 ($self->{w}, $self->{h}) 3756 ($self->{w}, $self->{h})
3063} 3757}
3064 3758
3759sub _to_pixel {
3760 my ($coord, $size, $max) = @_;
3761
3762 $coord =
3763 $coord eq "center" ? ($max - $size) * 0.5
3764 : $coord eq "max" ? $max
3765 : $coord;
3766
3767 $coord = 0 if $coord < 0;
3768 $coord = $max - $size if $coord > $max - $size;
3769
3770 int $coord + 0.5
3771}
3772
3065sub size_allocate { 3773sub invoke_size_allocate {
3066 my ($self, $w, $h) = @_; 3774 my ($self, $w, $h) = @_;
3067 3775
3068 for my $child ($self->children) { 3776 for my $child ($self->children) {
3069 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3777 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3070 3778
3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3779 $X = $child->{force_x} if exists $child->{force_x};
3072 if exists $child->{req_x}; 3780 $Y = $child->{force_y} if exists $child->{force_y};
3073 3781
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3782 $X = _to_pixel $X, $W, $self->{w};
3075 if exists $child->{req_y}; 3783 $Y = _to_pixel $Y, $H, $self->{h};
3076
3077 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079 3784
3080 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
3081 } 3786 }
3787
3788 1
3082} 3789}
3083 3790
3084sub coord2local { 3791sub coord2local {
3085 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
3086 3793
… …
3094} 3801}
3095 3802
3096sub update { 3803sub update {
3097 my ($self) = @_; 3804 my ($self) = @_;
3098 3805
3099 $self->check_size;
3100 $::WANT_REFRESH++; 3806 $::WANT_REFRESH++;
3101} 3807}
3102 3808
3103sub add { 3809sub add {
3104 my ($self, @children) = @_; 3810 my ($self, @children) = @_;
3105 3811
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111
3112 for my $child (@children) {
3113 $child->{is_toplevel} = 1; 3812 $_->{is_toplevel} = 1
3114 3813 for @children;
3115 # integerise window positions
3116 $child->{x} = int $child->{x};
3117 $child->{y} = int $child->{y};
3118 }
3119 3814
3120 $self->SUPER::add (@children); 3815 $self->SUPER::add (@children);
3121} 3816}
3122 3817
3123sub remove { 3818sub remove {
3124 my ($self, @children) = @_; 3819 my ($self, @children) = @_;
3125 3820
3126 $self->SUPER::remove (@children); 3821 $self->SUPER::remove (@children);
3822
3823 delete $self->{is_toplevel}
3824 for @children;
3127 3825
3128 while (@children) { 3826 while (@children) {
3129 my $w = pop @children; 3827 my $w = pop @children;
3130 push @children, $w->children; 3828 push @children, $w->children;
3131 $w->set_invisible; 3829 $w->set_invisible;
… …
3150 while ($self->{refresh_hook}) { 3848 while ($self->{refresh_hook}) {
3151 $_->() 3849 $_->()
3152 for values %{delete $self->{refresh_hook}}; 3850 for values %{delete $self->{refresh_hook}};
3153 } 3851 }
3154 3852
3155 if ($self->{check_size}) { 3853 if ($self->{realloc}) {
3156 my @queue = ([], []); 3854 my %queue;
3855 my @queue;
3856 my $widget;
3157 3857
3158 for (;;) { 3858 outer:
3159 if ($self->{check_size}) { 3859 while () {
3160 # heuristic: check containers last 3860 if (my $realloc = delete $self->{realloc}) {
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3861 for $widget (values %$realloc) {
3162 for values %{delete $self->{check_size}} 3862 $widget->{visible} or next; # do not resize invisible widgets
3863
3864 $queue{$widget+0}++ and next; # duplicates are common
3865
3866 push @{ $queue[$widget->{visible}] }, $widget;
3867 }
3163 } 3868 }
3164 3869
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3870 while () {
3871 @queue or last outer;
3166 3872
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3873 $widget = pop @{ $queue[-1] || [] }
3168 ? @$widget{qw(user_w user_h)} 3874 and last;
3169 : $widget->size_request;
3170
3171 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174 3875
3876 pop @queue;
3877 }
3878
3879 delete $queue{$widget+0};
3880
3881 my ($w, $h) = $widget->size_request;
3882
3883 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3884 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3885
3886 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3887 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3888
3889 $w = $widget->{force_w} if exists $widget->{force_w};
3890 $h = $widget->{force_h} if exists $widget->{force_h};
3891
3892 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3893 || delete $widget->{force_realloc}) {
3175 $widget->{req_w} = $w; 3894 $widget->{req_w} = $w;
3176 $widget->{req_h} = $h; 3895 $widget->{req_h} = $h;
3177 3896
3178 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3897 $self->{size_alloc}{$widget+0} = $widget;
3179 3898
3180 $widget->{parent}->check_size
3181 if $widget->{parent}; 3899 if (my $parent = $widget->{parent}) {
3900 $self->{realloc}{$parent+0} = $parent
3901 unless $queue{$parent+0};
3902
3903 $parent->{force_size_alloc} = 1;
3904 $self->{size_alloc}{$parent+0} = $parent;
3905 }
3182 } 3906 }
3907
3908 delete $self->{realloc}{$widget+0};
3183 } 3909 }
3184 } 3910 }
3185 3911
3186 while ($self->{size_alloc}) { 3912 while (my $size_alloc = delete $self->{size_alloc}) {
3187 for (values %{delete $self->{size_alloc}}) { 3913 my @queue = sort { $b->{visible} <=> $a->{visible} }
3188 my ($widget, $w, $h) = @$_; 3914 values %$size_alloc;
3915
3916 while () {
3917 my $widget = pop @queue || last;
3918
3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3189 3920
3190 $w = 0 if $w < 0; 3921 $w = 0 if $w < 0;
3191 $h = 0 if $h < 0; 3922 $h = 0 if $h < 0;
3192 3923
3924 $w = int $w + 0.5;
3925 $h = int $h + 0.5;
3926
3927 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928 $widget->{old_w} = $widget->{w};
3929 $widget->{old_h} = $widget->{h};
3930
3193 $widget->{w} = $w; 3931 $widget->{w} = $w;
3194 $widget->{h} = $h; 3932 $widget->{h} = $h;
3933
3195 $widget->emit (size_allocate => $w, $h); 3934 $widget->emit (size_allocate => $w, $h);
3935 }
3196 } 3936 }
3197 } 3937 }
3198 3938
3199 while ($self->{post_alloc_hook}) { 3939 while ($self->{post_alloc_hook}) {
3200 $_->() 3940 $_->()
3201 for values %{delete $self->{post_alloc_hook}}; 3941 for values %{delete $self->{post_alloc_hook}};
3202 } 3942 }
3943
3203 3944
3204 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3945 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3205 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3946 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3206 glClear GL_COLOR_BUFFER_BIT; 3947 glClear GL_COLOR_BUFFER_BIT;
3207 3948
… …
3209 glLoadIdentity; 3950 glLoadIdentity;
3210 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3211 glMatrixMode GL_MODELVIEW; 3952 glMatrixMode GL_MODELVIEW;
3212 glLoadIdentity; 3953 glLoadIdentity;
3213 3954
3955 {
3956 package CFClient::UI::Base;
3957
3958 ($draw_x, $draw_y, $draw_w, $draw_h) =
3959 (0, 0, $self->{w}, $self->{h});
3960 }
3961
3214 $self->_draw; 3962 $self->_draw;
3215} 3963}
3216 3964
3217############################################################################# 3965#############################################################################
3218 3966

Diff Legend

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