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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $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 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
158 } 189 }
159
160 $widget->reconfigure;
161 } 190 }
191
192 reconfigure_widgets;
162} 193}
163 194
164############################################################################# 195#############################################################################
165 196
166package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
171 202
172sub new { 203sub new {
173 my $class = shift; 204 my $class = shift;
174 205
175 my $self = bless { 206 my $self = bless {
176 x => 0, 207 x => "center",
177 y => 0, 208 y => "center",
178 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
179 can_events => 1, 212 can_events => 1,
180 @_ 213 @_
181 }, $class; 214 }, $class;
182 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
183 for (keys %$self) { 218 for (keys %$self) {
184 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
186 } 221 }
187 } 222 }
188 223
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
190 235
191 $self 236 $self
192} 237}
193 238
194sub destroy { 239sub destroy {
… …
204 return if $self->{parent}; 249 return if $self->{parent};
205 250
206 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
207} 252}
208 253
209sub hide { 254sub set_visible {
210 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
211 278
212 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
214 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
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;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
215 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
216 if $self->{parent}; 313 if $self->{parent};
217} 314}
218 315
219sub move { 316sub move_abs {
220 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
221 318
222 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
223 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
224 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
225 322
226 $self->update; 323 $self->update;
227} 324}
228 325
229sub set_size { 326sub set_size {
230 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
231 328
232 $self->{user_w} = $w; 329 $self->{force_w} = $w;
233 $self->{user_h} = $h; 330 $self->{force_h} = $h;
234 331
235 $self->check_size; 332 $self->realloc;
236} 333}
237 334
238sub size_request { 335sub size_request {
239 require Carp; 336 require Carp;
240 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
242 339
243sub configure { 340sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
245 342
246 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
249 348
250 # use alignment to adjust x, y 349 # use alignment to adjust x, y
251 350
252 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 353 }
257 354
258 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 356 $self->{x} = $x;
260 $self->{y} = $y; 357 $self->{y} = $y;
261 $self->update; 358 $self->update;
262 } 359 }
263 360
264 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
266 } 368 }
267} 369}
268 370
269sub size_allocate { 371sub size_allocate {
270 # nothing to be done 372 # nothing to be done
271} 373}
272 374
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
281} 381}
282 382
283sub set_max_size { 383sub set_max_size {
284 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
285 385
… …
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
288} 388}
289 389
290sub set_tooltip { 390sub set_tooltip {
291 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
292 397
293 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
294 399
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 423 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
320 425
321 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
322 427
323 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
324 429
325 $focus->update if $focus; 430 $focus->update if $focus;
326 $FOCUS->update; 431 $FOCUS->update;
327} 432}
328 433
… …
331 436
332 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
333 438
334 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
335 440
336 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
337 442
338 $focus->update if $focus; #? 443 $focus->update if $focus; #?
339}
340 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
341sub mouse_motion { } 449sub mouse_motion { 0 }
342sub button_up { } 450sub button_up { 0 }
343sub key_down { } 451sub key_down { 0 }
344sub key_up { } 452sub key_up { 0 }
345 453
346sub button_down { 454sub button_down {
347 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
348 456
349 $self->focus_in; 457 $self->focus_in;
350}
351 458
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
356sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
357 535
358sub draw { 536sub draw {
359 my ($self) = @_; 537 my ($self) = @_;
360 538
361 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
362 550
363 glPushMatrix; 551 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw; 553 $self->_draw;
366 glPopMatrix; 554 glPopMatrix;
… …
378 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
379 glEnd; 567 glEnd;
380 glDisable GL_BLEND; 568 glDisable GL_BLEND;
381 } 569 }
382 570
383 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
384 glPushMatrix; 572 glPushMatrix;
385 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 576 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
392 glEnd; 580 glEnd;
393 glPopMatrix; 581 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 } 583 }
396} 584}
397 585
398sub _draw { 586sub _draw {
399 my ($self) = @_; 587 my ($self) = @_;
400 588
401 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
402}
403
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450} 590}
451 591
452sub DESTROY { 592sub DESTROY {
453 my ($self) = @_; 593 my ($self) = @_;
454 594
… …
512 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
514} 654}
515 655
516sub size_request { 656sub size_request {
517 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
518} 660}
519 661
520sub draw { } 662sub draw { }
521 663
522############################################################################# 664#############################################################################
… …
526our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
527 669
528sub new { 670sub new {
529 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
530 672
531 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
532 674
533 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
534 children => [], 676 children => [],
535 can_events => 0, 677 can_events => 0,
536 %arg, 678 %arg,
537 ); 679 );
680
538 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
539 683
540 $self 684 $self
541} 685}
542 686
543sub add { 687sub add {
… …
551 $self->{children} = [ 695 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
554 ]; 698 ];
555 699
556 $self->check_size (1); 700 $self->realloc;
557 $self->update;
558} 701}
559 702
560sub children { 703sub children {
561 @{ $_[0]{children} } 704 @{ $_[0]{children} }
562} 705}
… …
567 delete $child->{parent}; 710 delete $child->{parent};
568 $child->hide; 711 $child->hide;
569 712
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 714
572 $self->check_size; 715 $self->realloc;
573 $self->update;
574} 716}
575 717
576sub clear { 718sub clear {
577 my ($self) = @_; 719 my ($self) = @_;
578 720
… …
582 for (@$children) { 724 for (@$children) {
583 delete $_->{parent}; 725 delete $_->{parent};
584 $_->hide; 726 $_->hide;
585 } 727 }
586 728
587 $self->check_size; 729 $self->realloc;
588 $self->update;
589} 730}
590 731
591sub find_widget { 732sub find_widget {
592 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
593 734
594 $x -= $self->{x}; 735 $x -= $self->{x};
595 $y -= $self->{y}; 736 $y -= $self->{y};
596 737
597 my $res; 738 my $res;
598 739
599 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
600 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
601 and return $res; 742 and return $res;
602 } 743 }
603 744
604 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
680 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 822 $self->update;
682} 823}
683 824
684sub _render { 825sub _render {
826 my ($self) = @_;
827
685 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
686} 829}
687 830
688sub render_child { 831sub render_child {
689 my ($self) = @_; 832 my ($self) = @_;
690 833
691 $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 {
692 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
694 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
695 $self->_render; 845 $self->_render;
696 }; 846 };
697} 847}
698 848
699sub _draw { 849sub _draw {
700 my ($self) = @_; 850 my ($self) = @_;
701 851
702 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
703 853
704 my $tex = $self->{texture} 854 my $tex = $self->{texture}
705 or return; 855 or return;
706 856
707 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
… …
717 867
718package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
719 869
720our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
721 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
722sub size_request { 882sub size_request {
723 my ($self) = @_; 883 my ($self) = @_;
724 884
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 886
728 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
729} 891}
730 892
731sub size_allocate { 893sub size_allocate {
732 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
733 895
896 my $child = $self->child;
897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
901 $self->child->configure (0, 0, $w, $h);
734 $self->update; 902 $self->update;
735} 903}
736 904
737sub set_offset { 905sub set_offset {
738 my ($self, $x, $y) = @_; 906 my ($self, $x, $y) = @_;
… …
772} 940}
773 941
774sub _render { 942sub _render {
775 my ($self) = @_; 943 my ($self) = @_;
776 944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 949
779 $self->SUPER::_render; 950 $self->SUPER::_render;
780} 951}
781 952
… …
789 my $class = shift; 960 my $class = shift;
790 961
791 my $self; 962 my $self;
792 963
793 my $slider = new CFClient::UI::Slider 964 my $slider = new CFClient::UI::Slider
794 vertical => 1, 965 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 966 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 967 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 968 $self->{vp}->set_offset (0, $_[1]);
798 }, 969 },
799 ; 970 ;
800 971
801 $self = $class->SUPER::new ( 972 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 973 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 974 slider => $slider,
804 @_, 975 @_,
805 ); 976 );
806 977
807 $self->{vp}->add ($self->{scrolled}); 978 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp}); 979 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 980 $self->add ($self->{slider});
810 981
811 $self 982 $self
983}
984
985sub update {
986 my ($self) = @_;
987
988 $self->SUPER::update;
989
990 # todo: overwrite size_allocate of child
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993}
994
995sub size_allocate {
996 my ($self, $w, $h) = @_;
997
998 $self->SUPER::size_allocate ($w, $h);
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
812} 1002}
813 1003
814#TODO# update range on size_allocate depending on child 1004#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 1005# update viewport offset on scroll
816 1006
… …
860 1050
861our @ISA = CFClient::UI::Bin::; 1051our @ISA = CFClient::UI::Bin::;
862 1052
863use CFClient::OpenGL; 1053use CFClient::OpenGL;
864 1054
865my @tex = 1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868 1062
869sub new { 1063sub new {
870 my $class = shift; 1064 my ($class, %arg) = @_;
871 1065
872 # TODO: user_x, user_y, overwrite moveto? 1066 my $title = delete $arg{title};
873 1067
874 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1069 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1070 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1071 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1072 can_events => 1,
880 @_ 1073 min_w => 16,
1074 min_h => 16,
1075 %arg,
881 ); 1076 );
882 1077
883 $self->{title} &&= new CFClient::UI::Label 1078 $self->{title} = new CFClient::UI::Label
884 align => 0, 1079 align => 0,
885 valign => 1, 1080 valign => 1,
886 text => $self->{title}, 1081 text => $title,
887 fontsize => $self->{border}; 1082 fontsize => $self->{border}
1083 if defined $title;
888 1084
889 $self 1085 $self
1086}
1087
1088sub add {
1089 my ($self, @widgets) = @_;
1090
1091 $self->SUPER::add (@widgets);
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
890} 1093}
891 1094
892sub border { 1095sub border {
893 int $_[0]{border} * $::FONTSIZE 1096 int $_[0]{border} * $::FONTSIZE
894} 1097}
895 1098
896sub size_request { 1099sub size_request {
897 my ($self) = @_; 1100 my ($self) = @_;
1101
1102 $self->{title}->size_request
1103 if $self->{title};
898 1104
899 my ($w, $h) = $self->SUPER::size_request; 1105 my ($w, $h) = $self->SUPER::size_request;
900 1106
901 ( 1107 (
902 $w + $self->border * 2, 1108 $w + $self->border * 2,
… …
905} 1111}
906 1112
907sub size_allocate { 1113sub size_allocate {
908 my ($self, $w, $h) = @_; 1114 my ($self, $w, $h) = @_;
909 1115
1116 if ($self->{title}) {
1117 $self->{title}{w} = $w;
1118 $self->{title}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h);
1120 }
1121
1122 my $border = $self->border;
1123
910 $h -= List::Util::max 0, $self->border * 2; 1124 $h -= List::Util::max 0, $border * 2;
911 $w -= List::Util::max 0, $self->border * 2; 1125 $w -= List::Util::max 0, $border * 2;
912 1126
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
914 if $self->{title};
915
916 $self->child->configure ($self->border, $self->border, $w, $h); 1127 $self->child->configure ($border, $border, $w, $h);
917} 1128}
918 1129
919sub button_down { 1130sub button_down {
920 my ($self, $ev, $x, $y) = @_; 1131 my ($self, $ev, $x, $y) = @_;
921 1132
… …
937 my ($ev, $x, $y) = @_; 1148 my ($ev, $x, $y) = @_;
938 1149
939 my $dx = $ev->{x} - $ox; 1150 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1151 my $dy = $ev->{y} - $oy;
941 1152
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155
1156 $self->realloc;
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size;
946 }; 1158 };
947 1159
948 } elsif ($lr ^ $td) { 1160 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1161 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1162 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1164 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1165 my ($ev, $x, $y) = @_;
954 1166
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1167 ($x, $y) = ($ev->{x}, $ev->{y});
956 1168
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update;
959 }; 1170 };
1171 } else {
1172 return 0;
1173 }
1174
960 } 1175 1
961} 1176}
962 1177
963sub button_up { 1178sub button_up {
964 my ($self, $ev, $x, $y) = @_; 1179 my ($self, $ev, $x, $y) = @_;
965 1180
966 delete $self->{motion}; 1181 !!delete $self->{motion}
967} 1182}
968 1183
969sub mouse_motion { 1184sub mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1185 my ($self, $ev, $x, $y) = @_;
971 1186
972 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1187 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188
1189 !!$self->{motion}
973} 1190}
974 1191
975sub _draw { 1192sub _draw {
976 my ($self) = @_; 1193 my ($self) = @_;
977 1194
1195 my $child = $self->{children}[0];
1196
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1197 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1198 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1199
981 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1202
984 my $border = $self->border; 1203 my $border = $self->border;
985 1204
986 glColor @{ $self->{border_bg} }; 1205 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1206 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1207 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1208 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1209 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1210
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1211 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1212 glColor @{ $self->{bg} };
994 1213
995 # TODO: repeat texture not scale 1214 # TODO: repeat texture not scale
1215 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1216 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1217 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1218 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1219 }
1006 1220
1007 glDisable GL_TEXTURE_2D; 1221 glDisable GL_TEXTURE_2D;
1008 1222
1009 $self->{title}->draw if $self->{title};
1010
1011 $self->child->draw; 1223 $child->draw;
1224
1225 if ($self->{title}) {
1226 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw;
1228 }
1012} 1229}
1013 1230
1014############################################################################# 1231#############################################################################
1015 1232
1016package CFClient::UI::Table; 1233package CFClient::UI::Table;
… …
1024sub new { 1241sub new {
1025 my $class = shift; 1242 my $class = shift;
1026 1243
1027 $class->SUPER::new ( 1244 $class->SUPER::new (
1028 col_expand => [], 1245 col_expand => [],
1029 @_ 1246 @_,
1030 ) 1247 )
1248}
1249
1250sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1252}
1032 1253
1033sub add { 1254sub add {
1034 my ($self, $x, $y, $child) = @_; 1255 my ($self, $x, $y, $child) = @_;
1035 1256
1036 $child->set_parent ($self); 1257 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1258 $self->{children}[$y][$x] = $child;
1038 1259
1039 $child->check_size; 1260 $self->realloc;
1040} 1261}
1041 1262
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# TODO: move to container class maybe? send childs a signal on removal? 1263# TODO: move to container class maybe? send children a signal on removal?
1047sub clear { 1264sub clear {
1048 my ($self) = @_; 1265 my ($self) = @_;
1049 1266
1050 my @children = $self->children; 1267 my @children = $self->children;
1051 delete $self->{children}; 1268 delete $self->{children};
… …
1053 for (@children) { 1270 for (@children) {
1054 delete $_->{parent}; 1271 delete $_->{parent};
1055 $_->hide; 1272 $_->hide;
1056 } 1273 }
1057 1274
1058 $self->update; 1275 $self->realloc;
1059} 1276}
1060 1277
1061sub get_wh { 1278sub get_wh {
1062 my ($self) = @_; 1279 my ($self) = @_;
1063 1280
… …
1094sub size_allocate { 1311sub size_allocate {
1095 my ($self, $w, $h) = @_; 1312 my ($self, $w, $h) = @_;
1096 1313
1097 my ($ws, $hs) = $self->get_wh; 1314 my ($ws, $hs) = $self->get_wh;
1098 1315
1099 my $req_w = sum @$ws; 1316 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1317 my $req_h = (sum @$hs) || 1;
1101 1318
1102 # TODO: nicer code && do row_expand 1319 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1320 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1321 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1322 my $col_expand = (sum @col_expand) || 1;
… …
1159 } 1376 }
1160} 1377}
1161 1378
1162############################################################################# 1379#############################################################################
1163 1380
1164package CFClient::UI::HBox; 1381package CFClient::UI::Box;
1165
1166# TODO: wrap into common Box base class
1167 1382
1168our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Container::;
1169 1384
1170sub size_request { 1385sub size_request {
1171 my ($self) = @_; 1386 my ($self) = @_;
1172 1387
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $self->{vertical}
1174 1389 ? (
1175 ( 1390 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1176 (List::Util::sum map $_->[0], @alloc), 1391 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1177 (List::Util::max map $_->[1], @alloc), 1392 )
1178 ) 1393 : (
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 )
1179} 1397}
1180 1398
1181sub size_allocate { 1399sub size_allocate {
1182 my ($self, $w, $h) = @_; 1400 my ($self, $w, $h) = @_;
1183 1401
1184 ($h, $w) = ($w, $h); 1402 my $space = $self->{vertical} ? $h : $w;
1185
1186 my $children = $self->{children}; 1403 my $children = $self->{children};
1187 1404
1188 my @h = map $_->{req_w}, @$children; 1405 my @req;
1189 1406
1190 my $req_h = List::Util::sum @h; 1407 if ($self->{homogeneous}) {
1191 1408 @req = ($space / (@$children || 1)) x @$children;
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } else { 1409 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1411 my $req = List::Util::sum @req;
1412
1413 if ($req > $space) {
1414 # ah well, not enough space
1415 $_ *= $space / $req for @req;
1416 } else {
1196 my $exp = List::Util::sum map $_->{expand}, @$children; 1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1197 $exp ||= 1;
1198 1418
1419 $space = ($space - $req) / $expand; # remaining space to give away
1420
1421 $req[$_] += $space * $children->[$_]{expand}
1199 for (0 .. $#$children) { 1422 for 0 .. $#$children;
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 } 1423 }
1206 } 1424 }
1207 1425
1208 CFClient::UI::harmonize \@h; 1426 CFClient::UI::harmonize \@req;
1209 1427
1210 my $y = 0; 1428 my $pos = 0;
1211 for (0 .. $#$children) { 1429 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_]; 1430 my $alloc = $req[$_];
1214 $child->configure ($y, 0, $h, $w); 1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1215 1432
1216 $y += $h; 1433 $pos += $alloc;
1217 } 1434 }
1218 1435
1219 1 1436 1
1220} 1437}
1221 1438
1222############################################################################# 1439#############################################################################
1223 1440
1441package CFClient::UI::HBox;
1442
1443our @ISA = CFClient::UI::Box::;
1444
1445sub new {
1446 my $class = shift;
1447
1448 $class->SUPER::new (
1449 vertical => 0,
1450 @_,
1451 )
1452}
1453
1454#############################################################################
1455
1224package CFClient::UI::VBox; 1456package CFClient::UI::VBox;
1225 1457
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1458our @ISA = CFClient::UI::Box::;
1229 1459
1230sub size_request { 1460sub new {
1231 my ($self) = @_; 1461 my $class = shift;
1232 1462
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1463 $class->SUPER::new (
1234 1464 vertical => 1,
1235 ( 1465 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1466 )
1239}
1240
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278} 1467}
1279 1468
1280############################################################################# 1469#############################################################################
1281 1470
1282package CFClient::UI::Label; 1471package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1488 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1489 layout => (new CFClient::Layout),
1301 fontsize => 1, 1490 fontsize => 1,
1302 align => -1, 1491 align => -1,
1303 valign => -1, 1492 valign => -1,
1304 padding => 2, 1493 padding_x => 2,
1494 padding_y => 2,
1305 can_events => 0, 1495 can_events => 0,
1306 %arg 1496 %arg
1307 ); 1497 );
1308 1498
1309 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
… …
1345 $self->{text} = "T$text"; 1535 $self->{text} = "T$text";
1346 1536
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1538 $self->{layout}->set_text ($text);
1349 1539
1540 $self->realloc;
1350 $self->update; 1541 $self->update;
1351 $self->check_size;
1352} 1542}
1353 1543
1354sub set_markup { 1544sub set_markup {
1355 my ($self, $markup) = @_; 1545 my ($self, $markup) = @_;
1356 1546
… …
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1550 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1551
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363 $self->{layout}->set_markup ($markup); 1553 $self->{layout}->set_markup ($markup);
1364 1554
1555 $self->realloc;
1365 $self->update; 1556 $self->update;
1366 $self->check_size;
1367} 1557}
1368 1558
1369sub size_request { 1559sub size_request {
1370 my ($self) = @_; 1560 my ($self) = @_;
1371 1561
… …
1385 1575
1386 $w = List::Util::max $w, $w2; 1576 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1577 $h = List::Util::max $h, $h2;
1388 } 1578 }
1389 1579
1390 ( 1580 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1581}
1395 1582
1396sub size_allocate { 1583sub size_allocate {
1397 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1398 1585
1586 delete $self->{ox};
1587
1399 delete $self->{texture}; 1588 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1590}
1401 1591
1402sub set_fontsize { 1592sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1593 my ($self, $fontsize) = @_;
1404 1594
1405 $self->{fontsize} = $fontsize; 1595 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1596 delete $self->{texture};
1407 1597
1408 $self->update; 1598 $self->realloc;
1409 $self->check_size;
1410} 1599}
1411 1600
1412sub _draw { 1601sub _draw {
1413 my ($self) = @_; 1602 my ($self) = @_;
1414 1603
… …
1420 $self->{layout}->set_width ($self->{w}); 1609 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1610 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1613
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1614 new_from_layout CFClient::Texture $self->{layout}
1615 };
1426 1616
1617 unless (exists $self->{ox}) {
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1429 : ($self->{w} - $tex->{w}) * 0.5); 1620 : ($self->{w} - $tex->{w}) * 0.5);
1430 1621
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1433 : ($self->{h} - $tex->{h}) * 0.5); 1624 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 1625 };
1437 1626
1438 glEnable GL_TEXTURE_2D; 1627 glEnable GL_TEXTURE_2D;
1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1440 1629
… …
1466 active_fg => [0, 0, 0], 1655 active_fg => [0, 0, 0],
1467 can_hover => 1, 1656 can_hover => 1,
1468 can_focus => 1, 1657 can_focus => 1,
1469 valign => 0, 1658 valign => 0,
1470 can_events => 1, 1659 can_events => 1,
1660 #text => ...
1471 @_ 1661 @_
1472 ) 1662 )
1473} 1663}
1474 1664
1475sub _set_text { 1665sub _set_text {
… …
1485 $self->{text} = $text; 1675 $self->{text} = $text;
1486 1676
1487 $text =~ s/./*/g if $self->{hidden}; 1677 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1678 $self->{layout}->set_text ("$text ");
1489 1679
1490 $self->emit (changed => $self->{text}); 1680 $self->_emit (changed => $self->{text});
1491} 1681}
1492 1682
1493sub set_text { 1683sub set_text {
1494 my ($self, $text) = @_; 1684 my ($self, $text) = @_;
1495 1685
1496 $self->{cursor} = length $text; 1686 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1687 $self->_set_text ($text);
1498 $self->update; 1688
1499 $self->check_size; 1689 $self->realloc;
1500} 1690}
1501 1691
1502sub get_text { 1692sub get_text {
1503 $_[0]{text} 1693 $_[0]{text}
1504} 1694}
… …
1507 my ($self) = @_; 1697 my ($self) = @_;
1508 1698
1509 my ($w, $h) = $self->SUPER::size_request; 1699 my ($w, $h) = $self->SUPER::size_request;
1510 1700
1511 ($w + 1, $h) # add 1 for cursor 1701 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1702}
1519 1703
1520sub key_down { 1704sub key_down {
1521 my ($self, $ev) = @_; 1705 my ($self, $ev) = @_;
1522 1706
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1721 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1722 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1723 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1725 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1726 $self->_emit ('escape');
1543 } elsif ($uni) { 1727 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1728 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else {
1730 return 0;
1545 } 1731 }
1546 1732
1547 $self->_set_text ($text); 1733 $self->_set_text ($text);
1548 $self->update; 1734
1549 $self->check_size; 1735 $self->realloc;
1736
1737 1
1550} 1738}
1551 1739
1552sub focus_in { 1740sub focus_in {
1553 my ($self) = @_; 1741 my ($self) = @_;
1554 1742
… …
1569 utf8::encode $text; 1757 utf8::encode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 1758 $self->{cursor} = length substr $text, 0, $idx;
1571 1759
1572 $self->_set_text ($self->{text}); 1760 $self->_set_text ($self->{text});
1573 $self->update; 1761 $self->update;
1762
1763 1
1574} 1764}
1575 1765
1576sub mouse_motion { 1766sub mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 1767 my ($self, $ev, $x, $y) = @_;
1578# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769
1770 0
1579} 1771}
1580 1772
1581sub _draw { 1773sub _draw {
1582 my ($self) = @_; 1774 my ($self) = @_;
1583 1775
… …
1634 if ($sym == 13) { 1826 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1827 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1828 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1829 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1830 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1831 $self->_emit (activate => $txt);
1640 $self->update; 1832 $self->update;
1641 1833
1642 } elsif ($sym == CFClient::SDLK_UP) { 1834 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1835 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1836 $self->{history_saveback} = $self->get_text;
… …
1660 } else { 1852 } else {
1661 $self->set_text ($self->{history_saveback}); 1853 $self->set_text ($self->{history_saveback});
1662 } 1854 }
1663 1855
1664 } else { 1856 } else {
1665 $self->SUPER::key_down ($ev); 1857 return $self->SUPER::key_down ($ev)
1858 }
1859
1666 } 1860 1
1667
1668} 1861}
1669 1862
1670############################################################################# 1863#############################################################################
1671 1864
1672package CFClient::UI::Button; 1865package CFClient::UI::Button;
… …
1681 1874
1682sub new { 1875sub new {
1683 my $class = shift; 1876 my $class = shift;
1684 1877
1685 $class->SUPER::new ( 1878 $class->SUPER::new (
1686 padding => 4, 1879 padding_x => 4,
1880 padding_y => 4,
1687 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 1882 active_fg => [0, 0, 1],
1689 can_hover => 1, 1883 can_hover => 1,
1690 align => 0, 1884 align => 0,
1691 valign => 0, 1885 valign => 0,
1692 can_events => 1, 1886 can_events => 1,
1693 @_ 1887 @_
1694 ) 1888 )
1695} 1889}
1696 1890
1891sub activate { }
1892
1697sub button_up { 1893sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1894 my ($self, $ev, $x, $y) = @_;
1699 1895
1896 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1897 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1898 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 1899
1703 } 1900 1
1704} 1901}
1705 1902
1706sub _draw { 1903sub _draw {
1707 my ($self) = @_; 1904 my ($self) = @_;
1708 1905
… …
1737 1934
1738sub new { 1935sub new {
1739 my $class = shift; 1936 my $class = shift;
1740 1937
1741 $class->SUPER::new ( 1938 $class->SUPER::new (
1742 padding => 2, 1939 padding_x => 2,
1940 padding_y => 2,
1743 fg => [1, 1, 1], 1941 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 1942 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 1943 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 1944 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 1945 state => 0,
… …
1751} 1949}
1752 1950
1753sub size_request { 1951sub size_request {
1754 my ($self) = @_; 1952 my ($self) = @_;
1755 1953
1756 ($self->{padding} * 2 + 6) x 2 1954 (6) x 2
1757} 1955}
1758 1956
1759sub button_down { 1957sub button_down {
1760 my ($self, $ev, $x, $y) = @_; 1958 my ($self, $ev, $x, $y) = @_;
1761 1959
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 1962 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1963 $self->_emit (changed => $self->{state});
1964 } else {
1965 return 0
1966 }
1967
1766 } 1968 1
1767} 1969}
1768 1970
1769sub _draw { 1971sub _draw {
1770 my ($self) = @_; 1972 my ($self) = @_;
1771 1973
1772 $self->SUPER::_draw; 1974 $self->SUPER::_draw;
1773 1975
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1976 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 1977
1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1978 my ($w, $h) = @$self{qw(w h)};
1979
1980 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1777 1981
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1982 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 1983
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1984 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 1985
… …
2045 my $self = $class->SUPER::new ( 2249 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2250 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2251 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2252 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2253 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2254 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2255 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2256 min_h => $::WIDTH / 80,
2053 vertical => 0, 2257 vertical => 0,
2054 can_hover => 1, 2258 can_hover => 1,
2055 inner_pad => .05, 2259 inner_pad => 0.02,
2056 @_ 2260 @_
2057 ); 2261 );
2058 2262
2059 $self->set_value ($self->{range}[0]); 2263 $self->set_value ($self->{range}[0]);
2060 $self->update; 2264 $self->update;
2061 2265
2062 $self 2266 $self
2063} 2267}
2064 2268
2269sub changed { }
2270
2271sub set_range {
2272 my ($self, $range) = @_;
2273
2274 ($range, $self->{range}) = ($self->{range}, $range);
2275
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}";
2278}
2279
2065sub set_value { 2280sub set_value {
2066 my ($self, $value) = @_; 2281 my ($self, $value) = @_;
2067 2282
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2283 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2284
2070 $hi = $lo + 1 if $hi <= $lo; 2285 $hi = $lo + 1 if $hi <= $lo;
2071 2286
2287 $page = $hi - $lo if $page > $hi - $lo;
2288
2072 $value = $lo if $value < $lo; 2289 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2290 $value = $hi - $page if $value > $hi - $page;
2074 2291
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2292 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2293 if $unit;
2077 2294
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2296
2082 if ($value != $old_value) { 2297 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2298 $self->_emit (changed => $value);
2084 $self->update; 2299 $self->update;
2085 } 2300 }
2086} 2301}
2087 2302
2088sub size_request { 2303sub size_request {
2089 my ($self) = @_; 2304 my ($self) = @_;
2090 2305
2091 my $w = $self->{req_w}; 2306 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2307}
2096 2308
2097sub button_down { 2309sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2310 my ($self, $ev, $x, $y) = @_;
2099 2311
2100 $self->SUPER::button_down ($ev, $x, $y); 2312 $self->SUPER::button_down ($ev, $x, $y);
2313
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315
2101 $self->mouse_motion ($ev, $x, $y); 2316 $self->mouse_motion ($ev, $x, $y)
2102} 2317}
2103 2318
2104sub mouse_motion { 2319sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2106 2321
2107 if ($GRAB == $self) { 2322 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2324
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2325 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2326
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2327 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2328
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2329 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2330 } else {
2331 return 0;
2332 }
2333
2115 } 2334 1
2116} 2335}
2117 2336
2118sub update { 2337sub update {
2119 my ($self) = @_; 2338 my ($self) = @_;
2120 2339
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2341 $self->set_value ($self->{range}[0]);
2123 2342
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2343 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100;
2125 2345
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2346 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2347
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2348 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2349 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2350
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2351 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2352 $value = $value * $self->{scale} + $self->{offset};
2132 2353
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2354 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2355 $self->{knob_w} = $knob_w;
2140 }); 2356 });
2141 2357
2142 $self->SUPER::update; 2358 $self->SUPER::update;
2143} 2359}
2144 2360
… …
2168 # draw handle 2384 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2385 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2386
2171 glDisable GL_TEXTURE_2D; 2387 glDisable GL_TEXTURE_2D;
2172} 2388}
2389
2390#############################################################################
2391
2392package CFClient::UI::ValSlider;
2393
2394our @ISA = CFClient::UI::HBox::;
2395
2396sub new {
2397 my ($class, %arg) = @_;
2398
2399 my $range = delete $arg{range};
2400
2401 my $self = $class->SUPER::new (
2402 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2403 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2404 to_value => sub { shift },
2405 from_value => sub { shift },
2406 %arg,
2407 );
2408
2409 $self->{slider}->connect (changed => sub {
2410 my ($self, $value) = @_;
2411 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2412 $self->{parent}->emit (changed => $value);
2413 });
2414
2415# $self->{entry}->connect (changed => sub {
2416# my ($self, $value) = @_;
2417# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2418# $self->{parent}->emit (changed => $value);
2419# });
2420
2421 $self->add ($self->{slider}, $self->{entry});
2422
2423 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2424
2425 $self
2426}
2427
2428sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) }
2173 2430
2174############################################################################# 2431#############################################################################
2175 2432
2176package CFClient::UI::TextView; 2433package CFClient::UI::TextView;
2177 2434
… …
2207 2464
2208 $self->{fontsize} = $fontsize; 2465 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2466 $self->reflow;
2210} 2467}
2211 2468
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2469sub size_allocate {
2232 my ($self, $w, $h) = @_; 2470 my ($self, $w, $h) = @_;
2233 2471
2234 $self->SUPER::size_allocate ($w, $h); 2472 $self->SUPER::size_allocate ($w, $h);
2235 2473
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2476 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2477
2240 $self->reflow; 2478 $self->reflow;
2241} 2479}
2242 2480
2481sub text_size {
2482 my ($self, $text, $indent) = @_;
2483
2484 my $layout = $self->{layout};
2485
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent);
2488 $layout->set_markup ($text);
2489
2490 $layout->size
2491}
2492
2493sub reflow {
2494 my ($self) = @_;
2495
2496 $self->{need_reflow}++;
2497 $self->update;
2498}
2499
2500sub set_offset {
2501 my ($self, $offset) = @_;
2502
2503 # todo: base offset on lines or so, not on pixels
2504 $self->{children}[1]->set_value ($offset);
2505}
2506
2507sub clear {
2508 my ($self) = @_;
2509
2510 $self->{par} = [];
2511 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513}
2514
2243sub add_paragraph { 2515sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2516 my ($self, $color, $text, $indent) = @_;
2245 2517
2246 #TODO: intelligently "reformat" paragraph 2518 for my $line (split /\n/, $text) {
2247 2519 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2520 $self->{height} += $h;
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2522 }
2251 2523
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255 $self->{children}[1]->update;
2256} 2525}
2257 2526
2258sub update { 2527sub update {
2259 my ($self) = @_; 2528 my ($self) = @_;
2260 2529
… …
2263 return unless $self->{h} > 0; 2532 return unless $self->{h} > 0;
2264 2533
2265 delete $self->{texture}; 2534 delete $self->{texture};
2266 2535
2267 $ROOT->on_post_alloc ($self, sub { 2536 $ROOT->on_post_alloc ($self, sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538
2268 if (delete $self->{need_reflow}) { 2539 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2540 my $height = 0;
2270 2541
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2272 for @{$self->{par}}; 2546 for (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548 $layout->set_width ($W - $_->[3]);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3];
2552 $_->[1] = $h;
2553 }
2554
2555 $height += $_->[1];
2556 }
2273 2557
2274 $self->{height} = $height; 2558 $self->{height} = $height;
2275 2559
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2561
2278 delete $self->{texture}; 2562 delete $self->{texture};
2279 } 2563 }
2280 2564
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2566 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2567 glClear GL_COLOR_BUFFER_BIT;
2284 2568
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2569 my $top = int $self->{children}[1]{range}[0];
2289 2570
2290 my $y0 = $top; 2571 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2572 my $y1 = $top + $H;
2292 2573
2293 my $y = 0; 2574 my $y = 0;
2294 2575
2295 my $layout = $self->{layout}; 2576 my $layout = $self->{layout};
2296 2577
2297 $layout->set_font ($self->{font}) if $self->{font}; 2578 $layout->set_font ($self->{font}) if $self->{font};
2298 2579
2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583
2299 for my $par (@{$self->{par}}) { 2584 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2585 my $h = $par->[1];
2301 2586
2302 if ($y0 < $y + $h && $y < $y1) { 2587 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2588 $layout->set_foreground (@{ $par->[2] });
2589 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2590 $layout->set_markup ($par->[4]);
2305 2591
2306 my ($W, $H) = $layout->size; 2592 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2593
2594 glRasterPos $par->[3], $y - $y0;
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2596 }
2309 2597
2310 $y += $h; 2598 $y += $h;
2311 } 2599 }
2312 2600
2313 glDisable GL_TEXTURE_2D; 2601 glDisable GL_BLEND;
2314 }; 2602 };
2315 }); 2603 });
2316} 2604}
2317 2605
2318sub _draw { 2606sub _draw {
… …
2378 2666
2379sub new { 2667sub new {
2380 my $class = shift; 2668 my $class = shift;
2381 2669
2382 my $self = $class->SUPER::new ( 2670 my $self = $class->SUPER::new (
2383 state => 0, 2671 state => 0,
2384 connect_activate => \&toggle_flopper, 2672 on_activate => \&toggle_flopper,
2385 @_ 2673 @_
2386 ); 2674 );
2387 2675
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2676 $self
2394} 2677}
2395 2678
2396sub toggle_flopper { 2679sub toggle_flopper {
2397 my ($self) = @_; 2680 my ($self) = @_;
2398 2681
2399 # TODO: use animation 2682 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 2683}
2411 2684
2412############################################################################# 2685#############################################################################
2413 2686
2414package CFClient::UI::Tooltip; 2687package CFClient::UI::Tooltip;
… …
2427} 2700}
2428 2701
2429sub set_tooltip_from { 2702sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2703 my ($self, $widget) = @_;
2431 2704
2705 my $tooltip = $widget->{tooltip};
2706
2707 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}";
2712 }
2713
2432 $self->add (new CFClient::UI::Label 2714 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2715 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2717 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2718 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2719 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2720 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2449 2731
2450sub size_allocate { 2732sub size_allocate {
2451 my ($self, $w, $h) = @_; 2733 my ($self, $w, $h) = @_;
2452 2734
2453 $self->SUPER::size_allocate ($w - 4, $h - 4); 2735 $self->SUPER::size_allocate ($w - 4, $h - 4);
2736}
2737
2738sub visibility_change {
2739 my ($self, $visible) = @_;
2740
2741 return unless $visible;
2742
2743 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner}
2745 or return;
2746
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH;
2751
2752 $self->move_abs ($x, $y);
2753 });
2454} 2754}
2455 2755
2456sub _draw { 2756sub _draw {
2457 my ($self) = @_; 2757 my ($self) = @_;
2458 2758
… …
2475 glVertex $w, $h; 2775 glVertex $w, $h;
2476 glVertex $w, 0; 2776 glVertex $w, 0;
2477 glEnd; 2777 glEnd;
2478 2778
2479 glTranslate 2 - 0.375, 2 - 0.375; 2779 glTranslate 2 - 0.375, 2 - 0.375;
2780
2480 $self->SUPER::_draw; 2781 $self->SUPER::_draw;
2481} 2782}
2482 2783
2483############################################################################# 2784#############################################################################
2484 2785
… …
2489use CFClient::OpenGL; 2790use CFClient::OpenGL;
2490 2791
2491sub new { 2792sub new {
2492 my $class = shift; 2793 my $class = shift;
2493 2794
2494 $class->SUPER::new ( 2795 my $self = $class->SUPER::new (
2495 aspect => 1, 2796 aspect => 1,
2797 can_events => 0,
2496 @_, 2798 @_,
2497 ) 2799 );
2800
2801 if ($self->{anim} && $self->{animspeed}) {
2802 Scalar::Util::weaken (my $widget = $self);
2803
2804 $self->{timer} = Event->timer (
2805 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2806 hard => 1,
2807 interval => $self->{animspeed},
2808 cb => sub {
2809 ++$widget->{frame};
2810 $widget->update;
2811 },
2812 );
2813 }
2814
2815 $self
2498} 2816}
2499 2817
2500sub size_request { 2818sub size_request {
2501 (32, 8) 2819 (32, 8)
2502} 2820}
2503 2821
2822sub update {
2823 my ($self) = @_;
2824
2825 return unless $self->{visible};
2826
2827 $self->SUPER::update;
2828}
2829
2504sub _draw { 2830sub _draw {
2505 my ($self) = @_; 2831 my ($self) = @_;
2506 2832
2507 return unless $::CONN;#d# manage and cache textures differently 2833 return unless $::CONN;
2834
2835 my $face;
2836
2837 if ($self->{frame}) {
2838 my $anim = $::CONN->{anim}[$self->{anim}];
2839
2840 $face = $anim->[ $self->{frame} % @$anim ]
2841 if $anim && @$anim;
2842 }
2843
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2845
2510 # TODO animation
2511 if ($tex) { 2846 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2847 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2849 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2517 } 2852 }
2518} 2853}
2519 2854
2520############################################################################# 2855sub DESTROY {
2856 my ($self) = @_;
2521 2857
2858 $self->{timer}->cancel
2859 if $self->{timer};
2860
2861 $self->SUPER::DESTROY;
2862}
2863
2864#############################################################################
2865
2522package CFClient::UI::InventoryItem; 2866package CFClient::UI::Buttonbar;
2523 2867
2524our @ISA = CFClient::UI::HBox::; 2868our @ISA = CFClient::UI::HBox::;
2525 2869
2526sub _item_to_desc { 2870# TODO: should actualyl wrap buttons and other goodies.
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668}
2669 2871
2670############################################################################# 2872#############################################################################
2671 2873
2672package CFClient::UI::Menu; 2874package CFClient::UI::Menu;
2673 2875
… …
2707 2909
2708# popup given the event (must be a mouse button down event currently) 2910# popup given the event (must be a mouse button down event currently)
2709sub popup { 2911sub popup {
2710 my ($self, $ev) = @_; 2912 my ($self, $ev) = @_;
2711 2913
2712 $self->emit ("popdown"); 2914 $self->_emit ("popdown");
2713 2915
2714 # maybe save $GRAB? must be careful about events... 2916 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 2917 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 2918 $self->{button} = $ev->{button};
2717 2919
2718 $self->show; 2920 $self->show;
2719 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2720} 2922}
2721 2923
2722sub mouse_motion { 2924sub mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 2925 my ($self, $ev, $x, $y) = @_;
2724 2926
2725 # TODO: should use vbox->find_widget or so 2927 # TODO: should use vbox->find_widget or so
2726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727 $self->{hover} = $self->{item}{$HOVER}; 2929 $self->{hover} = $self->{item}{$HOVER};
2930
2931 0
2728} 2932}
2729 2933
2730sub button_up { 2934sub button_up {
2731 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2732 2936
2733 if ($ev->{button} == $self->{button}) { 2937 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 2938 undef $GRAB;
2735 $self->hide; 2939 $self->hide;
2736 2940
2737 $self->emit ("popdown"); 2941 $self->_emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 2942 $self->{hover}[1]->() if $self->{hover};
2943 } else {
2944 return 0
2945 }
2946
2739 } 2947 1
2948}
2949
2950#############################################################################
2951
2952package CFClient::UI::Multiplexer;
2953
2954our @ISA = CFClient::UI::Container::;
2955
2956sub new {
2957 my $class = shift;
2958
2959 my $self = $class->SUPER::new (
2960 @_,
2961 );
2962
2963 $self->{current} = $self->{children}[0]
2964 if @{ $self->{children} };
2965
2966 $self
2967}
2968
2969sub add {
2970 my ($self, @widgets) = @_;
2971
2972 $self->SUPER::add (@widgets);
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976}
2977
2978sub set_current_page {
2979 my ($self, $page_or_widget) = @_;
2980
2981 my $widget = ref $page_or_widget
2982 ? $page_or_widget
2983 : $self->{children}[$page_or_widget];
2984
2985 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987
2988 $self->_emit (page_changed => $self->{current});
2989
2990 $self->realloc;
2991}
2992
2993sub visible_children {
2994 $_[0]{current}
2995}
2996
2997sub size_request {
2998 my ($self) = @_;
2999
3000 $self->{current}->size_request
3001}
3002
3003sub size_allocate {
3004 my ($self, $w, $h) = @_;
3005
3006 $self->{current}->configure (0, 0, $w, $h);
3007}
3008
3009sub _draw {
3010 my ($self) = @_;
3011
3012 $self->{current}->draw;
3013}
3014
3015#############################################################################
3016
3017package CFClient::UI::Notebook;
3018
3019our @ISA = CFClient::UI::VBox::;
3020
3021sub new {
3022 my $class = shift;
3023
3024 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3027 @_,
3028 );
3029
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
3031
3032 $self
3033}
3034
3035sub add {
3036 my ($self, $title, $widget, $tooltip) = @_;
3037
3038 Scalar::Util::weaken $self;
3039
3040 $self->{buttonbar}->add (new CFClient::UI::Button
3041 markup => $title,
3042 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) },
3044 );
3045
3046 $self->{multiplexer}->add ($widget);
3047}
3048
3049sub set_current_page {
3050 my ($self, $page) = @_;
3051
3052 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current});
2740} 3054}
2741 3055
2742############################################################################# 3056#############################################################################
2743 3057
2744package CFClient::UI::Statusbox; 3058package CFClient::UI::Statusbox;
… …
2804sub add { 3118sub add {
2805 my ($self, $text, %arg) = @_; 3119 my ($self, $text, %arg) = @_;
2806 3120
2807 $text =~ s/^\s+//; 3121 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3122 $text =~ s/\s+$//;
3123
3124 return unless $text;
2809 3125
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3126 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 3127
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3129
… …
2847 $self->SUPER::reconfigure; 3163 $self->SUPER::reconfigure;
2848} 3164}
2849 3165
2850############################################################################# 3166#############################################################################
2851 3167
2852package CFClient::UI::Root; 3168package CFClient::UI::Inventory;
2853 3169
2854our @ISA = CFClient::UI::Container::; 3170our @ISA = CFClient::UI::ScrolledWindow::;
2855
2856use CFClient::OpenGL;
2857 3171
2858sub new { 3172sub new {
2859 my $class = shift; 3173 my $class = shift;
2860 3174
2861 $class->SUPER::new ( 3175 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_,
3178 );
3179
3180 $self
3181}
3182
3183sub set_items {
3184 my ($self, $items) = @_;
3185
3186 $self->{scrolled}->clear;
3187 return unless $items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206}
3207
3208#############################################################################
3209
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList;
3408
3409our @ISA = CFClient::UI::ScrolledWindow::;
3410
3411sub new {
3412 my $class = shift;
3413
3414 my $self = $class->SUPER::new (
3415 binding => [],
3416 commands => [],
3417 scrolled => (new CFClient::UI::Table),
2862 @_, 3418 @_,
2863 ) 3419 )
2864} 3420}
2865 3421
2866sub configure { 3422# XXX: Do sorting? Argl...
2867 my ($self, $x, $y, $w, $h) = @_; 3423sub add_spell {
2868
2869 $self->{w} = $w;
2870 $self->{h} = $h;
2871}
2872
2873sub check_size {
2874 my ($self) = @_; 3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
2875 3426
2876 $self->size_allocate ($self->{w}, $self->{h}) 3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2877 if $self->{w}; 3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454}
3455
3456sub remove_spell {
3457 my ($self, $spell) = @_;
3458 delete $self->{spells}->{$spell->{name}};
3459 $self->rebuild_spell_list;
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::Root;
3465
3466our @ISA = CFClient::UI::Container::;
3467
3468use CFClient::OpenGL;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 visible => 1,
3475 @_,
3476 );
3477
3478 Scalar::Util::weaken ($self->{root} = $self);
3479
3480 $self
2878} 3481}
2879 3482
2880sub size_request { 3483sub size_request {
2881 my ($self) = @_; 3484 my ($self) = @_;
2882 3485
2883 ($self->{w}, $self->{h}) 3486 ($self->{w}, $self->{h})
3487}
3488
3489sub _to_pixel {
3490 my ($coord, $size, $max) = @_;
3491
3492 $coord =
3493 $coord eq "center" ? ($max - $size) * 0.5
3494 : $coord eq "max" ? $max
3495 : $coord;
3496
3497 $coord = 0 if $coord < 0;
3498 $coord = $max - $size if $coord > $max - $size;
3499
3500 int $coord + 0.5
2884} 3501}
2885 3502
2886sub size_allocate { 3503sub size_allocate {
2887 my ($self, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
2888 3505
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894
2895 for my $child ($self->children) { 3506 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 3508
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3509 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 3510 $Y = $child->{force_y} if exists $child->{force_y};
2900 3511
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3512 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 3513 $Y = _to_pixel $Y, $H, $self->{h};
2903
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 3514
2907 $child->configure ($X, $Y, $W, $H); 3515 $child->configure ($X, $Y, $W, $H);
2908 } 3516 }
2909} 3517}
2910 3518
… …
2921} 3529}
2922 3530
2923sub update { 3531sub update {
2924 my ($self) = @_; 3532 my ($self) = @_;
2925 3533
2926 $self->check_size;
2927 $::WANT_REFRESH++; 3534 $::WANT_REFRESH++;
2928} 3535}
2929 3536
2930sub add { 3537sub add {
2931 my ($self, @children) = @_; 3538 my ($self, @children) = @_;
2932 3539
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 3540 $_->{is_toplevel} = 1
2935 3541 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 3542
2941 $self->SUPER::add (@children); 3543 $self->SUPER::add (@children);
3544}
3545
3546sub remove {
3547 my ($self, @children) = @_;
3548
3549 $self->SUPER::remove (@children);
3550
3551 delete $self->{is_toplevel}
3552 for @children;
3553
3554 while (@children) {
3555 my $w = pop @children;
3556 push @children, $w->children;
3557 $w->set_invisible;
3558 }
2942} 3559}
2943 3560
2944sub on_refresh { 3561sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3562 my ($self, $id, $cb) = @_;
2946 3563
… …
2959 while ($self->{refresh_hook}) { 3576 while ($self->{refresh_hook}) {
2960 $_->() 3577 $_->()
2961 for values %{delete $self->{refresh_hook}}; 3578 for values %{delete $self->{refresh_hook}};
2962 } 3579 }
2963 3580
2964 if ($self->{check_size}) { 3581 if ($self->{realloc}) {
2965 my @queue = ([], []); 3582 my %queue;
3583 my @queue;
3584 my $widget;
2966 3585
2967 for (;;) { 3586 outer:
2968 if ($self->{check_size}) { 3587 while () {
2969 # heuristic: check containers last 3588 if (my $realloc = delete $self->{realloc}) {
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3589 for $widget (values %$realloc) {
2971 for values %{delete $self->{check_size}} 3590 $widget->{visible} or next; # do not resize invisible widgets
3591
3592 $queue{$widget+0}++ and next; # duplicates are common
3593
3594 push @{ $queue[$widget->{visible}] }, $widget;
3595 }
2972 } 3596 }
2973 3597
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3598 while () {
3599 @queue or last outer;
2975 3600
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3601 $widget = pop @{ $queue[-1] || [] }
2977 ? @$widget{qw(user_w user_h)} 3602 and last;
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983 3603
3604 pop @queue;
3605 }
3606
3607 delete $queue{$widget+0};
3608
3609 my ($w, $h) = $widget->size_request;
3610
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3613
3614 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h};
3616
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3618 || delete $widget->{force_realloc}) {
2984 $widget->{req_w} = $w; 3619 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 3620 $widget->{req_h} = $h;
2986 3621
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3622 $self->{size_alloc}{$widget+0} = $widget;
2988 3623
2989 $widget->{parent}->check_size
2990 if $widget->{parent}; 3624 if (my $parent = $widget->{parent}) {
3625 $self->{realloc}{$parent+0} = $parent
3626 unless $queue{$parent+0};
3627
3628 $parent->{force_size_alloc} = 1;
3629 $self->{size_alloc}{$parent+0} = $parent;
3630 }
2991 } 3631 }
3632
3633 delete $self->{realloc}{$widget+0};
2992 } 3634 }
2993 } 3635 }
2994 3636
2995 while ($self->{size_alloc}) { 3637 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 3638 my @queue = sort { $b->{visible} <=> $a->{visible} }
2997 my ($widget, $w, $h) = @$_; 3639 values %$size_alloc;
3640
3641 while () {
3642 my $widget = pop @queue || last;
3643
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2998 3645
2999 $w = 0 if $w < 0; 3646 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3647 $h = 0 if $h < 0;
3001 3648
3649 $w = int $w + 0.5;
3650 $h = int $h + 0.5;
3651
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3653 $widget->{old_w} = $widget->{w};
3654 $widget->{old_h} = $widget->{h};
3655
3002 $widget->{w} = $w; 3656 $widget->{w} = $w;
3003 $widget->{h} = $h; 3657 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 3658
3005 $widget->emit (size_allocate => $w, $h); 3659 $widget->emit (size_allocate => $w, $h);
3660 }
3006 } 3661 }
3007 } 3662 }
3008 3663
3009 while ($self->{post_alloc_hook}) { 3664 while ($self->{post_alloc_hook}) {
3010 $_->() 3665 $_->()
3011 for values %{delete $self->{post_alloc_hook}}; 3666 for values %{delete $self->{post_alloc_hook}};
3012 } 3667 }
3013 3668
3669
3014 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3670 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3671 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3672 glClear GL_COLOR_BUFFER_BIT;
3017 3673
3018 glMatrixMode GL_PROJECTION; 3674 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3675 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3677 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3678 glLoadIdentity;
3023 3679
3680 {
3681 package CFClient::UI::Base;
3682
3683 ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h});
3685 }
3686
3024 $self->_draw; 3687 $self->_draw;
3025} 3688}
3026 3689
3027############################################################################# 3690#############################################################################
3028 3691

Diff Legend

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