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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 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) = @_;
… …
144 157
145 $_->update 158 $_->update
146 for @widgets; 159 for @widgets;
147} 160}
148 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
149# call when resolution changes etc. 170# call when resolution changes etc.
150sub rescale_widgets { 171sub rescale_widgets {
151 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
152 173
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $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
166 } 189 }
167
168 $widget->reconfigure;
169 } 190 }
191
192 reconfigure_widgets;
170} 193}
171 194
172############################################################################# 195#############################################################################
173 196
174package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 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 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
… …
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub hide { 254sub set_visible {
217 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};
218 278
219 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
220 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
221 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
222 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
223 if $self->{parent}; 313 if $self->{parent};
224} 314}
225 315
226sub move { 316sub move_abs {
227 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
228 318
229 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
230 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
231 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
232 322
233 $self->update; 323 $self->update;
234} 324}
235 325
236sub set_size { 326sub set_size {
237 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
238 328
239 $self->{user_w} = $w; 329 $self->{force_w} = $w;
240 $self->{user_h} = $h; 330 $self->{force_h} = $h;
241 331
242 $self->check_size; 332 $self->realloc;
243} 333}
244 334
245sub size_request { 335sub size_request {
246 require Carp; 336 require Carp;
247 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
249 339
250sub configure { 340sub configure {
251 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
252 342
253 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
254 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
255 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
256 348
257 # use alignment to adjust x, y 349 # use alignment to adjust x, y
258 350
259 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
260 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
261
262 ($w, $h) = ($w2, $h2);
263 } 353 }
264 354
265 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
266 $self->{x} = $x; 356 $self->{x} = $x;
267 $self->{y} = $y; 357 $self->{y} = $y;
268 $self->update; 358 $self->update;
269 } 359 }
270 360
271 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
272 $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;
273 } 368 }
274} 369}
275 370
276sub size_allocate { 371sub size_allocate {
277 # nothing to be done 372 # nothing to be done
278} 373}
279 374
280sub reconfigure {
281 my ($self) = @_;
282
283 $self->check_size (1);
284 $self->update;
285}
286
287sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
288} 381}
289 382
290sub set_max_size { 383sub set_max_size {
291 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
292 385
… …
294 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
295} 388}
296 389
297sub set_tooltip { 390sub set_tooltip {
298 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
299 397
300 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
301 399
302 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
325 return if $FOCUS == $self; 423 return if $FOCUS == $self;
326 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
327 425
328 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
329 427
330 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
331 429
332 $focus->update if $focus; 430 $focus->update if $focus;
333 $FOCUS->update; 431 $FOCUS->update;
334} 432}
335 433
… …
338 436
339 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
340 438
341 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
342 440
343 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
344 442
345 $focus->update if $focus; #? 443 $focus->update if $focus; #?
346}
347 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
348sub mouse_motion { } 449sub mouse_motion { 0 }
349sub button_up { } 450sub button_up { 0 }
350sub key_down { } 451sub key_down { 0 }
351sub key_up { } 452sub key_up { 0 }
352 453
353sub button_down { 454sub button_down {
354 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
355 456
356 $self->focus_in; 457 $self->focus_in;
357}
358 458
359sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
360sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
361sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
362sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
363sub 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
364 535
365sub draw { 536sub draw {
366 my ($self) = @_; 537 my ($self) = @_;
367 538
368 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);
369 550
370 glPushMatrix; 551 glPushMatrix;
371 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
372 $self->_draw; 553 $self->_draw;
373 glPopMatrix; 554 glPopMatrix;
… …
385 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
386 glEnd; 567 glEnd;
387 glDisable GL_BLEND; 568 glDisable GL_BLEND;
388 } 569 }
389 570
390 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
391 glPushMatrix; 572 glPushMatrix;
392 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
393 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
395 glVertex 0 , 0; 576 glVertex 0 , 0;
396 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
397 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
398 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
399 glEnd; 580 glEnd;
400 glPopMatrix; 581 glPopMatrix;
401 #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;
402 } 583 }
403} 584}
404 585
405sub _draw { 586sub _draw {
406 my ($self) = @_; 587 my ($self) = @_;
407 588
408 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
409}
410
411sub find_widget {
412 my ($self, $x, $y) = @_;
413
414 return () unless $self->{can_events};
415
416 return $self
417 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
418 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
419
420 ()
421}
422
423sub set_parent {
424 my ($self, $parent) = @_;
425
426 Scalar::Util::weaken ($self->{parent} = $parent);
427
428 # TODO: req_w _does_change after ->reconfigure
429 $self->check_size
430 unless exists $self->{req_w};
431
432 $self->show;
433}
434
435sub check_size {
436 my ($self, $forced) = @_;
437
438 $self->{force_alloc} = 1 if $forced;
439 $CFClient::UI::ROOT->{check_size}{$self} = $self;
440}
441
442sub update {
443 my ($self) = @_;
444
445 $self->{parent}->update
446 if $self->{parent};
447}
448
449sub connect {
450 my ($self, $signal, $cb) = @_;
451
452 push @{ $self->{signal_cb}{$signal} }, $cb;
453}
454
455sub emit {
456 my ($self, $signal, @args) = @_;
457
458 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
459} 590}
460 591
461sub DESTROY { 592sub DESTROY {
462 my ($self) = @_; 593 my ($self) = @_;
463 594
… …
521 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
522 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
523} 654}
524 655
525sub size_request { 656sub size_request {
526 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
527} 660}
528 661
529sub draw { } 662sub draw { }
530 663
531############################################################################# 664#############################################################################
… …
535our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
536 669
537sub new { 670sub new {
538 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
539 672
540 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
541 674
542 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
543 children => [], 676 children => [],
544 can_events => 0, 677 can_events => 0,
545 %arg, 678 %arg,
546 ); 679 );
680
547 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
548 683
549 $self 684 $self
550} 685}
551 686
552sub add { 687sub add {
… …
560 $self->{children} = [ 695 $self->{children} = [
561 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
562 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
563 ]; 698 ];
564 699
565 $self->check_size (1); 700 $self->realloc;
566 $self->update;
567} 701}
568 702
569sub children { 703sub children {
570 @{ $_[0]{children} } 704 @{ $_[0]{children} }
571} 705}
… …
576 delete $child->{parent}; 710 delete $child->{parent};
577 $child->hide; 711 $child->hide;
578 712
579 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580 714
581 $self->check_size; 715 $self->realloc;
582 $self->update;
583} 716}
584 717
585sub clear { 718sub clear {
586 my ($self) = @_; 719 my ($self) = @_;
587 720
… …
591 for (@$children) { 724 for (@$children) {
592 delete $_->{parent}; 725 delete $_->{parent};
593 $_->hide; 726 $_->hide;
594 } 727 }
595 728
596 $self->check_size; 729 $self->realloc;
597 $self->update;
598} 730}
599 731
600sub find_widget { 732sub find_widget {
601 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
602 734
603 $x -= $self->{x}; 735 $x -= $self->{x};
604 $y -= $self->{y}; 736 $y -= $self->{y};
605 737
606 my $res; 738 my $res;
607 739
608 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
609 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
610 and return $res; 742 and return $res;
611 } 743 }
612 744
613 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
662 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
663} 795}
664 796
665############################################################################# 797#############################################################################
666 798
799# back-buffered drawing area
800
667package CFClient::UI::Window; 801package CFClient::UI::Window;
668 802
669our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
670 804
671use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
689 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
690 $self->update; 824 $self->update;
691} 825}
692 826
693sub _render { 827sub _render {
828 my ($self) = @_;
829
694 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
695} 831}
696 832
697sub render_child { 833sub render_child {
698 my ($self) = @_; 834 my ($self) = @_;
699 835
700 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
701 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
702 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
703 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
704 $self->_render; 847 $self->_render;
705 }; 848 };
706} 849}
707 850
708sub _draw { 851sub _draw {
709 my ($self) = @_; 852 my ($self) = @_;
710 853
711 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
712 855
713 my $tex = $self->{texture} 856 my $tex = $self->{texture}
714 or return; 857 or return;
715 858
716 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
… …
726 869
727package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
728 871
729our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
730 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
731sub size_request { 884sub size_request {
732 my ($self) = @_; 885 my ($self) = @_;
733 886
734 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
735 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
736 888
737 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
738} 893}
739 894
740sub size_allocate { 895sub size_allocate {
741 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
742 897
898 my $child = $self->child;
899
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902
903 $self->child->configure (0, 0, $w, $h);
743 $self->update; 904 $self->update;
744} 905}
745 906
746sub set_offset { 907sub set_offset {
747 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
… …
781} 942}
782 943
783sub _render { 944sub _render {
784 my ($self) = @_; 945 my ($self) = @_;
785 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
786 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
787 951
788 $self->SUPER::_render; 952 $self->SUPER::_render;
789} 953}
790 954
… …
793package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
794 958
795our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
796 960
797sub new { 961sub new {
798 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
799 965
800 my $self; 966 my $self;
801 967
802 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
803 vertical => 1, 969 vertical => 1,
804 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
805 connect_changed => sub { 971 on_changed => sub {
806 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 972 $self->{vp}->set_offset (0, $_[1]);
807 }, 973 },
808 ; 974 ;
809 975
810 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
811 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
812 slider => $slider, 978 slider => $slider,
813 @_, 979 %arg,
814 ); 980 );
815 981
816 $self->{vp}->add ($self->{scrolled});
817 $self->add ($self->{vp});
818 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
819 984
820 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
992}
993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002}
1003
1004sub size_allocate {
1005 my ($self, $w, $h) = @_;
1006
1007 $self->SUPER::size_allocate ($w, $h);
1008
1009 my $child = $self->{vp}->child;
1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
821} 1011}
822 1012
823#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
824# update viewport offset on scroll 1014# update viewport offset on scroll
825 1015
… …
869 1059
870our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
871 1061
872use CFClient::OpenGL; 1062use CFClient::OpenGL;
873 1063
874my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
875 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
876 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
877 1071
878sub new { 1072sub new {
879 my $class = shift; 1073 my ($class, %arg) = @_;
880 1074
881 # TODO: user_x, user_y, overwrite moveto? 1075 my $title = delete $arg{title};
882 1076
883 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
884 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
885 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
886 border => 0.6, 1080 border => 0.6,
887 toplevel => 1,
888 can_events => 1, 1081 can_events => 1,
889 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
890 ); 1085 );
891 1086
892 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
893 align => 0, 1088 align => 0,
894 valign => 1, 1089 valign => 1,
895 text => $self->{title}, 1090 text => $title,
896 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
897 1093
898 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
899} 1102}
900 1103
901sub border { 1104sub border {
902 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
903} 1106}
904 1107
905sub size_request { 1108sub size_request {
906 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
907 1113
908 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
909 1115
910 ( 1116 (
911 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
914} 1120}
915 1121
916sub size_allocate { 1122sub size_allocate {
917 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
918 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
919 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
920 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
921 1135
922 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
923 if $self->{title};
924
925 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
926} 1137}
927 1138
928sub button_down { 1139sub button_down {
929 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
930 1141
… …
946 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
947 1158
948 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
949 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
950 1161
951 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
952 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
953 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
954 $self->check_size; 1166 $self->realloc;
955 }; 1167 };
956 1168
957 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
958 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
959 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
961 $self->{motion} = sub { 1173 $self->{motion} = sub {
962 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
963 1175
964 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
965 1177
966 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
967 $self->update; 1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
968 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
969 } 1186 1
970} 1187}
971 1188
972sub button_up { 1189sub button_up {
973 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
974 1191
975 delete $self->{motion}; 1192 !!delete $self->{motion}
976} 1193}
977 1194
978sub mouse_motion { 1195sub mouse_motion {
979 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
980 1197
981 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
982} 1201}
983 1202
984sub _draw { 1203sub _draw {
985 my ($self) = @_; 1204 my ($self) = @_;
986 1205
1206 my $child = $self->{children}[0];
1207
987 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
988 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
989 1210
990 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
992 1213
993 my $border = $self->border; 1214 my $border = $self->border;
994 1215
995 glColor @{ $self->{border_bg} }; 1216 glColor @{ $self->{border_bg} };
996 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1217 $border[0]->draw_quad_alpha (0, 0, $w, $border);
997 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
998 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
999 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1220 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1000 1221
1001 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1002 my $bg = $tex[0]; 1223 glColor @{ $self->{bg} };
1003 1224
1004 # TODO: repeat texture not scale 1225 # TODO: repeat texture not scale
1226 # solve this better(?)
1005 my $rep_x = $cw / $bg->{w}; 1227 $bg->{s} = $cw / $bg->{w};
1006 my $rep_y = $ch / $bg->{h}; 1228 $bg->{t} = $ch / $bg->{h};
1007
1008 glColor @{ $self->{bg} };
1009
1010 $bg->{s} = $rep_x;
1011 $bg->{t} = $rep_y;
1012 $bg->{wrap_mode} = 1;
1013 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014 } 1230 }
1015 1231
1016 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
1017 1233
1018 $self->{title}->draw if $self->{title};
1019
1020 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
1021} 1240}
1022 1241
1023############################################################################# 1242#############################################################################
1024 1243
1025package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
1033sub new { 1252sub new {
1034 my $class = shift; 1253 my $class = shift;
1035 1254
1036 $class->SUPER::new ( 1255 $class->SUPER::new (
1037 col_expand => [], 1256 col_expand => [],
1038 @_ 1257 @_,
1039 ) 1258 )
1259}
1260
1261sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040} 1263}
1041 1264
1042sub add { 1265sub add {
1043 my ($self, $x, $y, $child) = @_; 1266 my ($self, $x, $y, $child) = @_;
1044 1267
1045 $child->set_parent ($self); 1268 $child->set_parent ($self);
1046 $self->{children}[$y][$x] = $child; 1269 $self->{children}[$y][$x] = $child;
1047 1270
1048 $child->check_size; 1271 $self->realloc;
1049} 1272}
1050 1273
1051sub children {
1052 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053}
1054
1055# TODO: move to container class maybe? send childs a signal on removal? 1274# TODO: move to container class maybe? send children a signal on removal?
1056sub clear { 1275sub clear {
1057 my ($self) = @_; 1276 my ($self) = @_;
1058 1277
1059 my @children = $self->children; 1278 my @children = $self->children;
1060 delete $self->{children}; 1279 delete $self->{children};
… …
1062 for (@children) { 1281 for (@children) {
1063 delete $_->{parent}; 1282 delete $_->{parent};
1064 $_->hide; 1283 $_->hide;
1065 } 1284 }
1066 1285
1067 $self->update; 1286 $self->realloc;
1068} 1287}
1069 1288
1070sub get_wh { 1289sub get_wh {
1071 my ($self) = @_; 1290 my ($self) = @_;
1072 1291
… …
1103sub size_allocate { 1322sub size_allocate {
1104 my ($self, $w, $h) = @_; 1323 my ($self, $w, $h) = @_;
1105 1324
1106 my ($ws, $hs) = $self->get_wh; 1325 my ($ws, $hs) = $self->get_wh;
1107 1326
1108 my $req_w = sum @$ws; 1327 my $req_w = (sum @$ws) || 1;
1109 my $req_h = sum @$hs; 1328 my $req_h = (sum @$hs) || 1;
1110 1329
1111 # TODO: nicer code && do row_expand 1330 # TODO: nicer code && do row_expand
1112 my @col_expand = @{$self->{col_expand}}; 1331 my @col_expand = @{$self->{col_expand}};
1113 @col_expand = (1) x @$ws unless @col_expand; 1332 @col_expand = (1) x @$ws unless @col_expand;
1114 my $col_expand = (sum @col_expand) || 1; 1333 my $col_expand = (sum @col_expand) || 1;
… …
1168 } 1387 }
1169} 1388}
1170 1389
1171############################################################################# 1390#############################################################################
1172 1391
1173package CFClient::UI::HBox; 1392package CFClient::UI::Box;
1174
1175# TODO: wrap into common Box base class
1176 1393
1177our @ISA = CFClient::UI::Container::; 1394our @ISA = CFClient::UI::Container::;
1178 1395
1179sub size_request { 1396sub size_request {
1180 my ($self) = @_; 1397 my ($self) = @_;
1181 1398
1182 my @alloc = map [$_->size_request], @{$self->{children}}; 1399 $self->{vertical}
1183 1400 ? (
1184 ( 1401 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1185 (List::Util::sum map $_->[0], @alloc), 1402 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1186 (List::Util::max map $_->[1], @alloc), 1403 )
1187 ) 1404 : (
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 )
1188} 1408}
1189 1409
1190sub size_allocate { 1410sub size_allocate {
1191 my ($self, $w, $h) = @_; 1411 my ($self, $w, $h) = @_;
1192 1412
1193 ($h, $w) = ($w, $h); 1413 my $space = $self->{vertical} ? $h : $w;
1194
1195 my $children = $self->{children}; 1414 my $children = $self->{children};
1196 1415
1197 my @h = map $_->{req_w}, @$children; 1416 my @req;
1198 1417
1199 my $req_h = List::Util::sum @h; 1418 if ($self->{homogeneous}) {
1200 1419 @req = ($space / (@$children || 1)) x @$children;
1201 if ($req_h > $h) {
1202 # ah well, not enough space
1203 $_ *= $h / $req_h for @h;
1204 } else { 1420 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1422 my $req = List::Util::sum @req;
1423
1424 if ($req > $space) {
1425 # ah well, not enough space
1426 $_ *= $space / $req for @req;
1427 } else {
1205 my $exp = List::Util::sum map $_->{expand}, @$children; 1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1206 $exp ||= 1;
1207 1429
1430 $space = ($space - $req) / $expand; # remaining space to give away
1431
1432 $req[$_] += $space * $children->[$_]{expand}
1208 for (0 .. $#$children) { 1433 for 0 .. $#$children;
1209 my $child = $children->[$_];
1210
1211 my $alloc_h = $h[$_];
1212 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1213 $h[$_] = $alloc_h;
1214 } 1434 }
1215 } 1435 }
1216 1436
1217 CFClient::UI::harmonize \@h; 1437 CFClient::UI::harmonize \@req;
1218 1438
1219 my $y = 0; 1439 my $pos = 0;
1220 for (0 .. $#$children) { 1440 for (0 .. $#$children) {
1221 my $child = $children->[$_];
1222 my $h = $h[$_]; 1441 my $alloc = $req[$_];
1223 $child->configure ($y, 0, $h, $w); 1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1224 1443
1225 $y += $h; 1444 $pos += $alloc;
1226 } 1445 }
1227 1446
1228 1 1447 1
1229} 1448}
1230 1449
1231############################################################################# 1450#############################################################################
1232 1451
1452package CFClient::UI::HBox;
1453
1454our @ISA = CFClient::UI::Box::;
1455
1456sub new {
1457 my $class = shift;
1458
1459 $class->SUPER::new (
1460 vertical => 0,
1461 @_,
1462 )
1463}
1464
1465#############################################################################
1466
1233package CFClient::UI::VBox; 1467package CFClient::UI::VBox;
1234 1468
1235# TODO: wrap into common Box base class
1236
1237our @ISA = CFClient::UI::Container::; 1469our @ISA = CFClient::UI::Box::;
1238 1470
1239sub size_request { 1471sub new {
1240 my ($self) = @_; 1472 my $class = shift;
1241 1473
1242 my @alloc = map [$_->size_request], @{$self->{children}}; 1474 $class->SUPER::new (
1243 1475 vertical => 1,
1244 ( 1476 @_,
1245 (List::Util::max map $_->[0], @alloc),
1246 (List::Util::sum map $_->[1], @alloc),
1247 ) 1477 )
1248}
1249
1250sub size_allocate {
1251 my ($self, $w, $h) = @_;
1252
1253 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1255 my $children = $self->{children};
1256
1257 my @h = map $_->{req_h}, @$children;
1258
1259 my $req_h = List::Util::sum @h;
1260
1261 if ($req_h > $h) {
1262 # ah well, not enough space
1263 $_ *= $h / $req_h for @h;
1264 } else {
1265 my $exp = List::Util::sum map $_->{expand}, @$children;
1266 $exp ||= 1;
1267
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270
1271 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1272 }
1273 }
1274
1275 CFClient::UI::harmonize \@h;
1276
1277 my $y = 0;
1278 for (0 .. $#$children) {
1279 my $child = $children->[$_];
1280 my $h = $h[$_];
1281 $child->configure (0, $y, $w, $h);
1282
1283 $y += $h;
1284 }
1285
1286 1
1287} 1478}
1288 1479
1289############################################################################# 1480#############################################################################
1290 1481
1291package CFClient::UI::Label; 1482package CFClient::UI::Label;
… …
1308 ellipsise => 3, # end 1499 ellipsise => 3, # end
1309 layout => (new CFClient::Layout), 1500 layout => (new CFClient::Layout),
1310 fontsize => 1, 1501 fontsize => 1,
1311 align => -1, 1502 align => -1,
1312 valign => -1, 1503 valign => -1,
1313 padding => 2, 1504 padding_x => 2,
1505 padding_y => 2,
1314 can_events => 0, 1506 can_events => 0,
1315 %arg 1507 %arg
1316 ); 1508 );
1317 1509
1318 if (exists $self->{template}) { 1510 if (exists $self->{template}) {
… …
1354 $self->{text} = "T$text"; 1546 $self->{text} = "T$text";
1355 1547
1356 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1357 $self->{layout}->set_text ($text); 1549 $self->{layout}->set_text ($text);
1358 1550
1551 $self->realloc;
1359 $self->update; 1552 $self->update;
1360 $self->check_size;
1361} 1553}
1362 1554
1363sub set_markup { 1555sub set_markup {
1364 my ($self, $markup) = @_; 1556 my ($self, $markup) = @_;
1365 1557
… …
1369 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1561 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370 1562
1371 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1372 $self->{layout}->set_markup ($markup); 1564 $self->{layout}->set_markup ($markup);
1373 1565
1566 $self->realloc;
1374 $self->update; 1567 $self->update;
1375 $self->check_size;
1376} 1568}
1377 1569
1378sub size_request { 1570sub size_request {
1379 my ($self) = @_; 1571 my ($self) = @_;
1380 1572
… …
1394 1586
1395 $w = List::Util::max $w, $w2; 1587 $w = List::Util::max $w, $w2;
1396 $h = List::Util::max $h, $h2; 1588 $h = List::Util::max $h, $h2;
1397 } 1589 }
1398 1590
1399 ( 1591 ($w, $h)
1400 $w + $self->{padding} * 2,
1401 $h + $self->{padding} * 2,
1402 )
1403} 1592}
1404 1593
1405sub size_allocate { 1594sub size_allocate {
1406 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1407 1596
1597 delete $self->{ox};
1598
1408 delete $self->{texture}; 1599 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1409} 1601}
1410 1602
1411sub set_fontsize { 1603sub set_fontsize {
1412 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1413 1605
1414 $self->{fontsize} = $fontsize; 1606 $self->{fontsize} = $fontsize;
1415 delete $self->{texture}; 1607 delete $self->{texture};
1416 1608
1417 $self->update; 1609 $self->realloc;
1418 $self->check_size;
1419} 1610}
1420 1611
1421sub _draw { 1612sub _draw {
1422 my ($self) = @_; 1613 my ($self) = @_;
1423 1614
… …
1429 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1430 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1431 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1432 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1433 1624
1434 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1435 1627
1628 unless (exists $self->{ox}) {
1436 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1437 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1438 : ($self->{w} - $tex->{w}) * 0.5); 1631 : ($self->{w} - $tex->{w}) * 0.5);
1439 1632
1440 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1441 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1442 : ($self->{h} - $tex->{h}) * 0.5); 1635 : ($self->{h} - $tex->{h}) * 0.5);
1443
1444 $tex
1445 }; 1636 };
1446 1637
1447 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1448 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1449 1640
… …
1475 active_fg => [0, 0, 0], 1666 active_fg => [0, 0, 0],
1476 can_hover => 1, 1667 can_hover => 1,
1477 can_focus => 1, 1668 can_focus => 1,
1478 valign => 0, 1669 valign => 0,
1479 can_events => 1, 1670 can_events => 1,
1671 #text => ...
1480 @_ 1672 @_
1481 ) 1673 )
1482} 1674}
1483 1675
1484sub _set_text { 1676sub _set_text {
… …
1486 1678
1487 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1488 1680
1489 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1490 1682
1491 delete $self->{texture};
1492
1493 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1494 $self->{text} = $text; 1684 $self->{text} = $text;
1495 1685
1496 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1497 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1498 1688
1499 $self->emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1500} 1691}
1501 1692
1502sub set_text { 1693sub set_text {
1503 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1504 1695
1505 $self->{cursor} = length $text; 1696 $self->{cursor} = length $text;
1506 $self->_set_text ($text); 1697 $self->_set_text ($text);
1507 $self->update; 1698
1508 $self->check_size; 1699 $self->realloc;
1509} 1700}
1510 1701
1511sub get_text { 1702sub get_text {
1512 $_[0]{text} 1703 $_[0]{text}
1513} 1704}
… …
1516 my ($self) = @_; 1707 my ($self) = @_;
1517 1708
1518 my ($w, $h) = $self->SUPER::size_request; 1709 my ($w, $h) = $self->SUPER::size_request;
1519 1710
1520 ($w + 1, $h) # add 1 for cursor 1711 ($w + 1, $h) # add 1 for cursor
1521}
1522
1523sub size_allocate {
1524 my ($self, $w, $h) = @_;
1525
1526 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1527} 1712}
1528 1713
1529sub key_down { 1714sub key_down {
1530 my ($self, $ev) = @_; 1715 my ($self, $ev) = @_;
1531 1716
… …
1546 } elsif ($sym == CFClient::SDLK_HOME) { 1731 } elsif ($sym == CFClient::SDLK_HOME) {
1547 $self->{cursor} = 0; 1732 $self->{cursor} = 0;
1548 } elsif ($sym == CFClient::SDLK_END) { 1733 } elsif ($sym == CFClient::SDLK_END) {
1549 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1550 } elsif ($uni == 27) { 1735 } elsif ($uni == 27) {
1551 $self->emit ('escape'); 1736 $self->_emit ('escape');
1552 } elsif ($uni) { 1737 } elsif ($uni) {
1553 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1554 } 1741 }
1555 1742
1556 $self->_set_text ($text); 1743 $self->_set_text ($text);
1557 $self->update; 1744
1558 $self->check_size; 1745 $self->realloc;
1746
1747 1
1559} 1748}
1560 1749
1561sub focus_in { 1750sub focus_in {
1562 my ($self) = @_; 1751 my ($self) = @_;
1563 1752
… …
1578 utf8::encode $text; 1767 utf8::encode $text;
1579 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1580 1769
1581 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1582 $self->update; 1771 $self->update;
1772
1773 1
1583} 1774}
1584 1775
1585sub mouse_motion { 1776sub mouse_motion {
1586 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1587# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779
1780 0
1588} 1781}
1589 1782
1590sub _draw { 1783sub _draw {
1591 my ($self) = @_; 1784 my ($self) = @_;
1592 1785
… …
1643 if ($sym == 13) { 1836 if ($sym == 13) {
1644 unshift @{$self->{history}}, 1837 unshift @{$self->{history}},
1645 my $txt = $self->get_text; 1838 my $txt = $self->get_text;
1646 $self->{history_pointer} = -1; 1839 $self->{history_pointer} = -1;
1647 $self->{history_saveback} = ''; 1840 $self->{history_saveback} = '';
1648 $self->emit (activate => $txt); 1841 $self->_emit (activate => $txt);
1649 $self->update; 1842 $self->update;
1650 1843
1651 } elsif ($sym == CFClient::SDLK_UP) { 1844 } elsif ($sym == CFClient::SDLK_UP) {
1652 if ($self->{history_pointer} < 0) { 1845 if ($self->{history_pointer} < 0) {
1653 $self->{history_saveback} = $self->get_text; 1846 $self->{history_saveback} = $self->get_text;
… …
1669 } else { 1862 } else {
1670 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1671 } 1864 }
1672 1865
1673 } else { 1866 } else {
1674 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1675 } 1870 1
1676
1677} 1871}
1678 1872
1679############################################################################# 1873#############################################################################
1680 1874
1681package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1690 1884
1691sub new { 1885sub new {
1692 my $class = shift; 1886 my $class = shift;
1693 1887
1694 $class->SUPER::new ( 1888 $class->SUPER::new (
1695 padding => 4, 1889 padding_x => 4,
1890 padding_y => 4,
1696 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1697 active_fg => [0, 0, 1], 1892 active_fg => [0, 0, 1],
1698 can_hover => 1, 1893 can_hover => 1,
1699 align => 0, 1894 align => 0,
1700 valign => 0, 1895 valign => 0,
1701 can_events => 1, 1896 can_events => 1,
1702 @_ 1897 @_
1703 ) 1898 )
1704} 1899}
1705 1900
1901sub activate { }
1902
1706sub button_up { 1903sub button_up {
1707 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1708 1905
1906 $self->emit ("activate")
1709 if ($x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1710 && $y >= 0 && $y < $self->{h}) { 1908 && $y >= 0 && $y < $self->{h};
1711 $self->emit ("activate"); 1909
1712 } 1910 1
1713} 1911}
1714 1912
1715sub _draw { 1913sub _draw {
1716 my ($self) = @_; 1914 my ($self) = @_;
1717 1915
… …
1746 1944
1747sub new { 1945sub new {
1748 my $class = shift; 1946 my $class = shift;
1749 1947
1750 $class->SUPER::new ( 1948 $class->SUPER::new (
1751 padding => 2, 1949 padding_x => 2,
1950 padding_y => 2,
1752 fg => [1, 1, 1], 1951 fg => [1, 1, 1],
1753 active_fg => [1, 1, 0], 1952 active_fg => [1, 1, 0],
1754 bg => [0, 0, 0, 0.2], 1953 bg => [0, 0, 0, 0.2],
1755 active_bg => [1, 1, 1, 0.5], 1954 active_bg => [1, 1, 1, 0.5],
1756 state => 0, 1955 state => 0,
… …
1760} 1959}
1761 1960
1762sub size_request { 1961sub size_request {
1763 my ($self) = @_; 1962 my ($self) = @_;
1764 1963
1765 ($self->{padding} * 2 + 6) x 2 1964 (6) x 2
1766} 1965}
1767 1966
1768sub button_down { 1967sub button_down {
1769 my ($self, $ev, $x, $y) = @_; 1968 my ($self, $ev, $x, $y) = @_;
1770 1969
1771 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1772 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1773 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1774 $self->emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1775 } 1978 1
1776} 1979}
1777 1980
1778sub _draw { 1981sub _draw {
1779 my ($self) = @_; 1982 my ($self) = @_;
1780 1983
1781 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1782 1985
1783 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1986 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1784 1987
1785 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1988 my ($w, $h) = @$self{qw(w h)};
1989
1990 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1786 1991
1787 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1992 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1788 1993
1789 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1994 my $tex = $self->{state} ? $tex[1] : $tex[0];
1790 1995
… …
2054 my $self = $class->SUPER::new ( 2259 my $self = $class->SUPER::new (
2055 fg => [1, 1, 1], 2260 fg => [1, 1, 1],
2056 active_fg => [0, 0, 0], 2261 active_fg => [0, 0, 0],
2057 bg => [0, 0, 0, 0.2], 2262 bg => [0, 0, 0, 0.2],
2058 active_bg => [1, 1, 1, 0.5], 2263 active_bg => [1, 1, 1, 0.5],
2059 range => [0, 0, 100, 10], 2264 range => [0, 0, 100, 10, 0],
2060 req_w => $::WIDTH / 80, 2265 min_w => $::WIDTH / 80,
2061 req_h => $::WIDTH / 80, 2266 min_h => $::WIDTH / 80,
2062 vertical => 0, 2267 vertical => 0,
2063 can_hover => 1, 2268 can_hover => 1,
2064 inner_pad => 0.02, 2269 inner_pad => 0.02,
2065 @_ 2270 @_
2066 ); 2271 );
… …
2069 $self->update; 2274 $self->update;
2070 2275
2071 $self 2276 $self
2072} 2277}
2073 2278
2279sub changed { }
2280
2281sub set_range {
2282 my ($self, $range) = @_;
2283
2284 ($range, $self->{range}) = ($self->{range}, $range);
2285
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}";
2288}
2289
2074sub set_value { 2290sub set_value {
2075 my ($self, $value) = @_; 2291 my ($self, $value) = @_;
2076 2292
2077 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2293 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078 2294
2079 $hi = $lo + 1 if $hi <= $lo; 2295 $hi = $lo + 1 if $hi <= $lo;
2080 2296
2297 $page = $hi - $lo if $page > $hi - $lo;
2298
2081 $value = $lo if $value < $lo; 2299 $value = $lo if $value < $lo;
2082 $value = $hi if $value > $hi; 2300 $value = $hi - $page if $value > $hi - $page;
2083 2301
2084 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2302 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085 if $unit; 2303 if $unit;
2086 2304
2087 $page = $hi - $lo if $page > $hi - $lo;
2088
2089 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090 2306
2091 if ($value != $old_value) { 2307 if ($value != $old_value) {
2092 $self->emit (changed => $value); 2308 $self->_emit (changed => $value);
2093 $self->update; 2309 $self->update;
2094 } 2310 }
2095} 2311}
2096 2312
2097sub size_request { 2313sub size_request {
2098 my ($self) = @_; 2314 my ($self) = @_;
2099 2315
2100 my $w = $self->{req_w}; 2316 ($self->{req_w}, $self->{req_h})
2101 my $h = $self->{req_h};
2102
2103 $self->{vertical} ? ($h, $w) : ($w, $h)
2104} 2317}
2105 2318
2106sub button_down { 2319sub button_down {
2107 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2108 2321
2109 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2323
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325
2110 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
2111} 2327}
2112 2328
2113sub mouse_motion { 2329sub mouse_motion {
2114 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2115 2331
2116 if ($GRAB == $self) { 2332 if ($GRAB == $self) {
2117 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118 2334
2119 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2120 2336
2121 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2122 2338
2123 $self->set_value ($x * ($hi - $lo) + $lo); 2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else {
2341 return 0;
2342 }
2343
2124 } 2344 1
2125} 2345}
2126 2346
2127sub update { 2347sub update {
2128 my ($self) = @_; 2348 my ($self) = @_;
2129 2349
2130 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2131 $self->set_value ($self->{range}[0]); 2358 $self->set_value ($self->{range}[0]);
2132 2359
2133 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2361 my $range = ($hi - $page - $lo) || 1e-100;
2134 2362
2135 my $inner_w = 1 - 2 * $self->{inner_pad}; 2363 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2136 2364
2137 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2365 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2366 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2138 2367
2139 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2368 $value = ($value - $lo) / $range;
2140 $value = $self->{scale} * ($value - $lo); 2369 $value = $value * $self->{scale} + $self->{offset};
2141 2370
2142 $value = $self->{inner_pad} + ($value - $page * 0.5);
2143
2144 $value = 0 if $value < 0;
2145 $page = 1 - $value if $value + $page > 1;
2146
2147 $self->{knob_x} = $value; 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2148 $self->{knob_w} = $page; 2372 $self->{knob_w} = $knob_w;
2149 }); 2373 }
2150
2151 $self->SUPER::update;
2152}
2153
2154sub _draw {
2155 my ($self) = @_;
2156 2374
2157 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2158 2376
2159 glScale $self->{w}, $self->{h}; 2377 glScale $self->{w}, $self->{h};
2160 2378
… …
2177 # draw handle 2395 # draw handle
2178 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2396 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2179 2397
2180 glDisable GL_TEXTURE_2D; 2398 glDisable GL_TEXTURE_2D;
2181} 2399}
2400
2401#############################################################################
2402
2403package CFClient::UI::ValSlider;
2404
2405our @ISA = CFClient::UI::HBox::;
2406
2407sub new {
2408 my ($class, %arg) = @_;
2409
2410 my $range = delete $arg{range};
2411
2412 my $self = $class->SUPER::new (
2413 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2414 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2415 to_value => sub { shift },
2416 from_value => sub { shift },
2417 %arg,
2418 );
2419
2420 $self->{slider}->connect (changed => sub {
2421 my ($self, $value) = @_;
2422 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2423 $self->{parent}->emit (changed => $value);
2424 });
2425
2426# $self->{entry}->connect (changed => sub {
2427# my ($self, $value) = @_;
2428# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2429# $self->{parent}->emit (changed => $value);
2430# });
2431
2432 $self->add ($self->{slider}, $self->{entry});
2433
2434 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2435
2436 $self
2437}
2438
2439sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) }
2182 2441
2183############################################################################# 2442#############################################################################
2184 2443
2185package CFClient::UI::TextView; 2444package CFClient::UI::TextView;
2186 2445
… …
2228 $self->{layout}->set_width ($self->{children}[0]{w}); 2487 $self->{layout}->set_width ($self->{children}[0]{w});
2229 2488
2230 $self->reflow; 2489 $self->reflow;
2231} 2490}
2232 2491
2233sub text_height { 2492sub text_size {
2234 my ($self, $text, $indent) = @_; 2493 my ($self, $text, $indent) = @_;
2235 2494
2236 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
2237 2496
2238 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239 $layout->set_width ($self->{children}[0]{w} - $indent); 2498 $layout->set_width ($self->{children}[0]{w} - $indent);
2240 $layout->set_markup ($text); 2499 $layout->set_markup ($text);
2241 2500
2242 ($layout->size)[1] 2501 $layout->size
2243} 2502}
2244 2503
2245sub reflow { 2504sub reflow {
2246 my ($self) = @_; 2505 my ($self) = @_;
2247 2506
2248 $self->{need_reflow}++; 2507 $self->{need_reflow}++;
2249 $self->update; 2508 $self->update;
2250} 2509}
2251 2510
2511sub set_offset {
2512 my ($self, $offset) = @_;
2513
2514 # todo: base offset on lines or so, not on pixels
2515 $self->{children}[1]->set_value ($offset);
2516}
2517
2518sub clear {
2519 my ($self) = @_;
2520
2521 $self->{par} = [];
2522 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524}
2525
2252sub add_paragraph { 2526sub add_paragraph {
2253 my ($self, $color, $text, $indent) = @_; 2527 my ($self, $color, $text, $indent) = @_;
2254 2528
2255 #TODO: intelligently "reformat" paragraph
2256
2257 for my $line (split /\n/, $text) { 2529 for my $line (split /\n/, $text) {
2258 my $height = $self->text_height ($line); 2530 my ($w, $h) = $self->text_size ($line);
2259 $self->{height} += $height; 2531 $self->{height} += $h;
2260 push @{$self->{par}}, [$height, $color, $indent, $line]; 2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2261 } 2533 }
2262 2534
2263 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2535 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2264 $self->{children}[1]->update;
2265} 2536}
2266 2537
2267sub update { 2538sub update {
2268 my ($self) = @_; 2539 my ($self) = @_;
2269 2540
… …
2272 return unless $self->{h} > 0; 2543 return unless $self->{h} > 0;
2273 2544
2274 delete $self->{texture}; 2545 delete $self->{texture};
2275 2546
2276 $ROOT->on_post_alloc ($self, sub { 2547 $ROOT->on_post_alloc ($self, sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549
2277 if (delete $self->{need_reflow}) { 2550 if (delete $self->{need_reflow}) {
2278 my $height = 0; 2551 my $height = 0;
2279 2552
2280 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2281 for @{$self->{par}}; 2557 for (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2559 $layout->set_width ($W - $_->[3]);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3];
2563 $_->[1] = $h;
2564 }
2565
2566 $height += $_->[1];
2567 }
2282 2568
2283 $self->{height} = $height; 2569 $self->{height} = $height;
2284 2570
2285 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2286 $self->{children}[1]->update;
2287 2572
2288 delete $self->{texture}; 2573 delete $self->{texture};
2289 } 2574 }
2290 2575
2291 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2292 glClearColor 0.5, 0.5, 0.5, 0; 2577 glClearColor 0.5, 0.5, 0.5, 0;
2293 glClear GL_COLOR_BUFFER_BIT; 2578 glClear GL_COLOR_BUFFER_BIT;
2294 2579
2295 my $top = int $self->{children}[1]{range}[0]; 2580 my $top = int $self->{children}[1]{range}[0];
2296 2581
2297 my $y0 = $top; 2582 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2583 my $y1 = $top + $H;
2299 2584
2300 my $y = 0; 2585 my $y = 0;
2301 2586
2302 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2303 2588
2304 $layout->set_font ($self->{font}) if $self->{font}; 2589 $layout->set_font ($self->{font}) if $self->{font};
2305 2590
2306 glEnable GL_BLEND; 2591 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off
2307 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308 2594
2309 for my $par (@{$self->{par}}) { 2595 for my $par (@{$self->{par}}) {
2310 my $h = $par->[0]; 2596 my $h = $par->[1];
2311 2597
2312 if ($y0 < $y + $h && $y < $y1) { 2598 if ($y0 < $y + $h && $y < $y1) {
2313 $layout->set_foreground (@{ $par->[1] }); 2599 $layout->set_foreground (@{ $par->[2] });
2314 $layout->set_width ($self->{w} - $par->[2]); 2600 $layout->set_width ($W - $par->[3]);
2315 $layout->set_markup ($par->[3]); 2601 $layout->set_markup ($par->[4]);
2316 2602
2317 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2603 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2318 2604
2319 glRasterPos $par->[2], $y - $y0; 2605 glRasterPos $par->[3], $y - $y0;
2320 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2606 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2321 } 2607 }
2322 2608
2323 $y += $h; 2609 $y += $h;
2324 } 2610 }
… …
2391 2677
2392sub new { 2678sub new {
2393 my $class = shift; 2679 my $class = shift;
2394 2680
2395 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2396 state => 0, 2682 state => 0,
2397 connect_activate => \&toggle_flopper, 2683 on_activate => \&toggle_flopper,
2398 @_ 2684 @_
2399 ); 2685 );
2400 2686
2401 if ($self->{state}) {
2402 $self->{state} = 0;
2403 $self->toggle_flopper;
2404 }
2405
2406 $self 2687 $self
2407} 2688}
2408 2689
2409sub toggle_flopper { 2690sub toggle_flopper {
2410 my ($self) = @_; 2691 my ($self) = @_;
2411 2692
2412 # TODO: use animation 2693 $self->{other}->toggle_visibility;
2413 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open");
2417 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close");
2420 }
2421
2422 $self->emit (changed => $self->{state});
2423} 2694}
2424 2695
2425############################################################################# 2696#############################################################################
2426 2697
2427package CFClient::UI::Tooltip; 2698package CFClient::UI::Tooltip;
… …
2440} 2711}
2441 2712
2442sub set_tooltip_from { 2713sub set_tooltip_from {
2443 my ($self, $widget) = @_; 2714 my ($self, $widget) = @_;
2444 2715
2716 my $tooltip = $widget->{tooltip};
2717
2718 if ($ENV{CFPLUS_DEBUG} & 2) {
2719 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}";
2723 }
2724
2445 $self->add (new CFClient::UI::Label 2725 $self->add (new CFClient::UI::Label
2446 markup => $widget->{tooltip}, 2726 markup => $tooltip,
2447 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2448 fontsize => 0.8, 2728 fontsize => 0.8,
2449 fg => [0, 0, 0, 1], 2729 fg => [0, 0, 0, 1],
2450 ellipsise => 0, 2730 ellipsise => 0,
2451 font => ($widget->{tooltip_font} || $::FONT_PROP), 2731 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2462 2742
2463sub size_allocate { 2743sub size_allocate {
2464 my ($self, $w, $h) = @_; 2744 my ($self, $w, $h) = @_;
2465 2745
2466 $self->SUPER::size_allocate ($w - 4, $h - 4); 2746 $self->SUPER::size_allocate ($w - 4, $h - 4);
2747}
2748
2749sub visibility_change {
2750 my ($self, $visible) = @_;
2751
2752 return unless $visible;
2753
2754 $self->{root}->on_post_alloc ("move_$self" => sub {
2755 my $widget = $self->{owner}
2756 or return;
2757
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH;
2762
2763 $self->move_abs ($x, $y);
2764 });
2467} 2765}
2468 2766
2469sub _draw { 2767sub _draw {
2470 my ($self) = @_; 2768 my ($self) = @_;
2471 2769
… …
2488 glVertex $w, $h; 2786 glVertex $w, $h;
2489 glVertex $w, 0; 2787 glVertex $w, 0;
2490 glEnd; 2788 glEnd;
2491 2789
2492 glTranslate 2 - 0.375, 2 - 0.375; 2790 glTranslate 2 - 0.375, 2 - 0.375;
2791
2493 $self->SUPER::_draw; 2792 $self->SUPER::_draw;
2494} 2793}
2495 2794
2496############################################################################# 2795#############################################################################
2497 2796
… …
2503 2802
2504sub new { 2803sub new {
2505 my $class = shift; 2804 my $class = shift;
2506 2805
2507 my $self = $class->SUPER::new ( 2806 my $self = $class->SUPER::new (
2508 aspect => 1, 2807 aspect => 1,
2808 can_events => 0,
2509 @_, 2809 @_,
2510 ); 2810 );
2511 2811
2512 if ($self->{anim} && $self->{animspeed}) { 2812 if ($self->{anim} && $self->{animspeed}) {
2513 Scalar::Util::weaken (my $widget = $self); 2813 Scalar::Util::weaken (my $widget = $self);
… …
2539} 2839}
2540 2840
2541sub _draw { 2841sub _draw {
2542 my ($self) = @_; 2842 my ($self) = @_;
2543 2843
2544 return unless $::CONN;#d# manage and cache textures differently 2844 return unless $::CONN;
2545 2845
2546 my $face; 2846 my $face;
2547 2847
2548 if ($self->{frame}) { 2848 if ($self->{frame}) {
2549 my $anim = $::CONN->{anim}[$self->{anim}]; 2849 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2572 $self->SUPER::DESTROY; 2872 $self->SUPER::DESTROY;
2573} 2873}
2574 2874
2575############################################################################# 2875#############################################################################
2576 2876
2577package CFClient::UI::InventoryItem; 2877package CFClient::UI::Buttonbar;
2578 2878
2579our @ISA = CFClient::UI::HBox::; 2879our @ISA = CFClient::UI::HBox::;
2580 2880
2581sub _item_to_desc { 2881# TODO: should actualyl wrap buttons and other goodies.
2582 my ($item) = @_;
2583
2584 my $desc =
2585 $item->{nrof} < 2
2586 ? $item->{name}
2587 : "$item->{nrof} × $item->{name_pl}";
2588
2589 $item->{flags} & Crossfire::Protocol::F_OPEN
2590 and $desc .= " (open)";
2591 $item->{flags} & Crossfire::Protocol::F_APPLIED
2592 and $desc .= " (applied)";
2593 $item->{flags} & Crossfire::Protocol::F_UNPAID
2594 and $desc .= " (unpaid)";
2595 $item->{flags} & Crossfire::Protocol::F_MAGIC
2596 and $desc .= " (magic)";
2597 $item->{flags} & Crossfire::Protocol::F_CURSED
2598 and $desc .= " (cursed)";
2599 $item->{flags} & Crossfire::Protocol::F_DAMNED
2600 and $desc .= " (damned)";
2601 $item->{flags} & Crossfire::Protocol::F_LOCKED
2602 and $desc .= " *";
2603
2604 $desc
2605}
2606
2607sub new {
2608 my $class = shift;
2609
2610 my %args = @_;
2611
2612 my $item = delete $args{item};
2613
2614 my $desc = _item_to_desc ($item);
2615
2616 my $self = $class->SUPER::new (
2617 can_hover => 1,
2618 can_events => 1,
2619 tooltip => ((CFClient::UI::Label::escape $desc)
2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621 connect_button_down => sub {
2622 my ($self, $ev, $x, $y) = @_;
2623
2624 # todo: maybe put examine on 1? but should just be a tooltip :(
2625 if ($ev->{button} == 1) {
2626 my $targ = $::CONN->{player}{tag};
2627
2628 if ($item->{container} == $::CONN->{player}{tag}) {
2629 $targ = $main::OPENCONT;
2630 }
2631
2632 $::CONN->send ("move $targ $item->{tag} 0");
2633 } elsif ($ev->{button} == 2) {
2634 $::CONN->send ("apply $item->{tag}");
2635 } elsif ($ev->{button} == 3) {
2636 my @menu_items = (
2637 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640 (
2641 $item->{flags} & Crossfire::Protocol::F_LOCKED
2642 ? (
2643 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644 )
2645 : (
2646 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648 )
2649 ),
2650 );
2651
2652 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653 }
2654
2655 1
2656 },
2657 %args
2658 );
2659
2660
2661 $self->add (new CFClient::UI::Face
2662 can_events => 0,
2663 face => $item->{face},
2664 anim => $item->{anim},
2665 animspeed => $item->{animspeed},
2666 );
2667
2668 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670 $self->{item} = $item;
2671
2672 $self->update_item;
2673
2674 $self
2675}
2676
2677sub update_item {
2678 my ($self) = @_;
2679
2680 my $desc = _item_to_desc ($self->{item});
2681
2682 $self->{name_lbl}->set_text ($desc);
2683}
2684
2685#############################################################################
2686
2687package CFClient::UI::Inventory;
2688
2689our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691sub new {
2692 my $class = shift;
2693
2694 my $self = $class->SUPER::new (
2695 scrolled => (new CFClient::UI::VBox),
2696 @_,
2697 );
2698
2699 $self
2700}
2701
2702sub set_items {
2703 my ($self, $items) = @_;
2704
2705 $self->{scrolled}->clear;
2706 return unless $items;
2707
2708 my @items = sort {
2709 ($a->{type} <=> $b->{type})
2710 or ($a->{name} cmp $b->{name})
2711 } @$items;
2712
2713 $self->{real_items} = \@items;
2714
2715 for my $item (@items) {
2716 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717 $item->update_item ();
2718 }
2719
2720 $self->{scrolled}->add (@items);
2721
2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2723}
2724
2725sub size_request {
2726 my ($self) = @_;
2727 ($self->{req_w}, $self->{req_h});
2728}
2729 2882
2730############################################################################# 2883#############################################################################
2731 2884
2732package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2733 2886
… …
2767 2920
2768# popup given the event (must be a mouse button down event currently) 2921# popup given the event (must be a mouse button down event currently)
2769sub popup { 2922sub popup {
2770 my ($self, $ev) = @_; 2923 my ($self, $ev) = @_;
2771 2924
2772 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2773 2926
2774 # maybe save $GRAB? must be careful about events... 2927 # maybe save $GRAB? must be careful about events...
2775 $GRAB = $self; 2928 $GRAB = $self;
2776 $self->{button} = $ev->{button}; 2929 $self->{button} = $ev->{button};
2777 2930
2778 $self->show; 2931 $self->show;
2779 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2780} 2933}
2781 2934
2782sub mouse_motion { 2935sub mouse_motion {
2783 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2784 2937
2785 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2786 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2787 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2788} 2943}
2789 2944
2790sub button_up { 2945sub button_up {
2791 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2792 2947
2793 if ($ev->{button} == $self->{button}) { 2948 if ($ev->{button} == $self->{button}) {
2794 undef $GRAB; 2949 undef $GRAB;
2795 $self->hide; 2950 $self->hide;
2796 2951
2797 $self->emit ("popdown"); 2952 $self->_emit ("popdown");
2798 $self->{hover}[1]->() if $self->{hover}; 2953 $self->{hover}[1]->() if $self->{hover};
2954 } else {
2955 return 0
2956 }
2957
2958 1
2959}
2960
2961#############################################################################
2962
2963package CFClient::UI::Multiplexer;
2964
2965our @ISA = CFClient::UI::Container::;
2966
2967sub new {
2968 my $class = shift;
2969
2970 my $self = $class->SUPER::new (
2971 @_,
2972 );
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976
2977 $self
2978}
2979
2980sub add {
2981 my ($self, @widgets) = @_;
2982
2983 $self->SUPER::add (@widgets);
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987}
2988
2989sub set_current_page {
2990 my ($self, $page_or_widget) = @_;
2991
2992 my $widget = ref $page_or_widget
2993 ? $page_or_widget
2994 : $self->{children}[$page_or_widget];
2995
2996 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998
2999 $self->_emit (page_changed => $self->{current});
3000
3001 $self->realloc;
3002}
3003
3004sub visible_children {
3005 $_[0]{current}
3006}
3007
3008sub size_request {
3009 my ($self) = @_;
3010
3011 $self->{current}->size_request
3012}
3013
3014sub size_allocate {
3015 my ($self, $w, $h) = @_;
3016
3017 $self->{current}->configure (0, 0, $w, $h);
3018}
3019
3020sub _draw {
3021 my ($self) = @_;
3022
3023 $self->{current}->draw;
3024}
3025
3026#############################################################################
3027
3028package CFClient::UI::Notebook;
3029
3030our @ISA = CFClient::UI::VBox::;
3031
3032sub new {
3033 my $class = shift;
3034
3035 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3039 @_,
3040 );
2799 } 3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044
3045 $self
3046}
3047
3048sub add {
3049 my ($self, $title, $widget, $tooltip) = @_;
3050
3051 Scalar::Util::weaken $self;
3052
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget);
3060}
3061
3062sub set_current_page {
3063 my ($self, $page) = @_;
3064
3065 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current});
2800} 3067}
2801 3068
2802############################################################################# 3069#############################################################################
2803 3070
2804package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
… …
2864sub add { 3131sub add {
2865 my ($self, $text, %arg) = @_; 3132 my ($self, $text, %arg) = @_;
2866 3133
2867 $text =~ s/^\s+//; 3134 $text =~ s/^\s+//;
2868 $text =~ s/\s+$//; 3135 $text =~ s/\s+$//;
3136
3137 return unless $text;
2869 3138
2870 my $timeout = time + ((delete $arg{timeout}) || 60); 3139 my $timeout = time + ((delete $arg{timeout}) || 60);
2871 3140
2872 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873 3142
… …
2907 $self->SUPER::reconfigure; 3176 $self->SUPER::reconfigure;
2908} 3177}
2909 3178
2910############################################################################# 3179#############################################################################
2911 3180
2912package CFClient::UI::Root; 3181package CFClient::UI::Inventory;
2913 3182
2914our @ISA = CFClient::UI::Container::; 3183our @ISA = CFClient::UI::ScrolledWindow::;
2915
2916use CFClient::OpenGL;
2917 3184
2918sub new { 3185sub new {
2919 my $class = shift; 3186 my $class = shift;
2920 3187
2921 $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3190 @_,
3191 );
3192
3193 $self
3194}
3195
3196sub set_items {
3197 my ($self, $items) = @_;
3198
3199 $self->{child}->clear;
3200 return unless $items;
3201
3202 my @items = sort {
3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3206
3207 $self->{real_items} = \@items;
3208
3209 my $row = 0;
3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3212
3213 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3216
3217 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 }
3416}
3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList;
3421
3422our @ISA = CFClient::UI::Table::;
3423
3424sub new {
3425 my $class = shift;
3426
3427 my $self = $class->SUPER::new (
3428 binding => [],
3429 commands => [],
2922 @_, 3430 @_,
2923 ) 3431 )
2924} 3432}
2925 3433
2926sub configure { 3434# XXX: Do sorting? Argl...
2927 my ($self, $x, $y, $w, $h) = @_; 3435sub add_spell {
2928
2929 $self->{w} = $w;
2930 $self->{h} = $h;
2931}
2932
2933sub check_size {
2934 my ($self) = @_; 3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
2935 3438
2936 $self->size_allocate ($self->{w}, $self->{h}) 3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2937 if $self->{w}; 3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466}
3467
3468sub remove_spell {
3469 my ($self, $spell) = @_;
3470 delete $self->{spells}->{$spell->{name}};
3471 $self->rebuild_spell_list;
3472}
3473
3474#############################################################################
3475
3476package CFClient::UI::Root;
3477
3478our @ISA = CFClient::UI::Container::;
3479
3480use CFClient::OpenGL;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (
3486 visible => 1,
3487 @_,
3488 );
3489
3490 Scalar::Util::weaken ($self->{root} = $self);
3491
3492 $self
2938} 3493}
2939 3494
2940sub size_request { 3495sub size_request {
2941 my ($self) = @_; 3496 my ($self) = @_;
2942 3497
2943 ($self->{w}, $self->{h}) 3498 ($self->{w}, $self->{h})
3499}
3500
3501sub _to_pixel {
3502 my ($coord, $size, $max) = @_;
3503
3504 $coord =
3505 $coord eq "center" ? ($max - $size) * 0.5
3506 : $coord eq "max" ? $max
3507 : $coord;
3508
3509 $coord = 0 if $coord < 0;
3510 $coord = $max - $size if $coord > $max - $size;
3511
3512 int $coord + 0.5
2944} 3513}
2945 3514
2946sub size_allocate { 3515sub size_allocate {
2947 my ($self, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
2948 3517
2949 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954
2955 for my $child ($self->children) { 3518 for my $child ($self->children) {
2956 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2957 3520
2958 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3521 $X = $child->{force_x} if exists $child->{force_x};
2959 if exists $child->{req_x}; 3522 $Y = $child->{force_y} if exists $child->{force_y};
2960 3523
2961 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3524 $X = _to_pixel $X, $W, $self->{w};
2962 if exists $child->{req_y}; 3525 $Y = _to_pixel $Y, $H, $self->{h};
2963
2964 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2965 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966 3526
2967 $child->configure ($X, $Y, $W, $H); 3527 $child->configure ($X, $Y, $W, $H);
2968 } 3528 }
2969} 3529}
2970 3530
… …
2981} 3541}
2982 3542
2983sub update { 3543sub update {
2984 my ($self) = @_; 3544 my ($self) = @_;
2985 3545
2986 $self->check_size;
2987 $::WANT_REFRESH++; 3546 $::WANT_REFRESH++;
2988} 3547}
2989 3548
2990sub add { 3549sub add {
2991 my ($self, @children) = @_; 3550 my ($self, @children) = @_;
2992 3551
2993 for my $child (@children) {
2994 $child->{toplevel} = 1; 3552 $_->{is_toplevel} = 1
2995 3553 for @children;
2996 # integerise window positions
2997 $child->{x} = int $child->{x};
2998 $child->{y} = int $child->{y};
2999 }
3000 3554
3001 $self->SUPER::add (@children); 3555 $self->SUPER::add (@children);
3556}
3557
3558sub remove {
3559 my ($self, @children) = @_;
3560
3561 $self->SUPER::remove (@children);
3562
3563 delete $self->{is_toplevel}
3564 for @children;
3002 3565
3003 while (@children) { 3566 while (@children) {
3004 my $w = pop @children; 3567 my $w = pop @children;
3005 push @children, $w->children; 3568 push @children, $w->children;
3006 $w->{visible} = 1; 3569 $w->set_invisible;
3007 }
3008}
3009
3010sub remove {
3011 my ($self, @children) = @_;
3012
3013 $self->SUPER::remove (@children);
3014
3015 while (@children) {
3016 my $w = pop @children;
3017 push @children, $w->children;
3018 delete $w->{visible};
3019 } 3570 }
3020} 3571}
3021 3572
3022sub on_refresh { 3573sub on_refresh {
3023 my ($self, $id, $cb) = @_; 3574 my ($self, $id, $cb) = @_;
… …
3037 while ($self->{refresh_hook}) { 3588 while ($self->{refresh_hook}) {
3038 $_->() 3589 $_->()
3039 for values %{delete $self->{refresh_hook}}; 3590 for values %{delete $self->{refresh_hook}};
3040 } 3591 }
3041 3592
3042 if ($self->{check_size}) { 3593 if ($self->{realloc}) {
3043 my @queue = ([], []); 3594 my %queue;
3595 my @queue;
3596 my $widget;
3044 3597
3045 for (;;) { 3598 outer:
3046 if ($self->{check_size}) { 3599 while () {
3047 # heuristic: check containers last 3600 if (my $realloc = delete $self->{realloc}) {
3048 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3601 for $widget (values %$realloc) {
3049 for values %{delete $self->{check_size}} 3602 $widget->{visible} or next; # do not resize invisible widgets
3603
3604 $queue{$widget+0}++ and next; # duplicates are common
3605
3606 push @{ $queue[$widget->{visible}] }, $widget;
3607 }
3050 } 3608 }
3051 3609
3052 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3610 while () {
3611 @queue or last outer;
3053 3612
3054 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3613 $widget = pop @{ $queue[-1] || [] }
3055 ? @$widget{qw(user_w user_h)} 3614 and last;
3056 : $widget->size_request;
3057
3058 if (delete $widget->{force_alloc}
3059 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3061 3615
3616 pop @queue;
3617 }
3618
3619 delete $queue{$widget+0};
3620
3621 my ($w, $h) = $widget->size_request;
3622
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3625
3626 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h};
3628
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3630 || delete $widget->{force_realloc}) {
3062 $widget->{req_w} = $w; 3631 $widget->{req_w} = $w;
3063 $widget->{req_h} = $h; 3632 $widget->{req_h} = $h;
3064 3633
3065 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3634 $self->{size_alloc}{$widget+0} = $widget;
3066 3635
3067 $widget->{parent}->check_size
3068 if $widget->{parent}; 3636 if (my $parent = $widget->{parent}) {
3637 $self->{realloc}{$parent+0} = $parent
3638 unless $queue{$parent+0};
3639
3640 $parent->{force_size_alloc} = 1;
3641 $self->{size_alloc}{$parent+0} = $parent;
3642 }
3069 } 3643 }
3644
3645 delete $self->{realloc}{$widget+0};
3070 } 3646 }
3071 } 3647 }
3072 3648
3073 while ($self->{size_alloc}) { 3649 while (my $size_alloc = delete $self->{size_alloc}) {
3074 for (values %{delete $self->{size_alloc}}) { 3650 my @queue = sort { $b->{visible} <=> $a->{visible} }
3075 my ($widget, $w, $h) = @$_; 3651 values %$size_alloc;
3652
3653 while () {
3654 my $widget = pop @queue || last;
3655
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3076 3657
3077 $w = 0 if $w < 0; 3658 $w = 0 if $w < 0;
3078 $h = 0 if $h < 0; 3659 $h = 0 if $h < 0;
3079 3660
3661 $w = int $w + 0.5;
3662 $h = int $h + 0.5;
3663
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h};
3667
3080 $widget->{w} = $w; 3668 $widget->{w} = $w;
3081 $widget->{h} = $h; 3669 $widget->{h} = $h;
3082 $widget->size_allocate ($w, $h); 3670
3083 $widget->emit (size_allocate => $w, $h); 3671 $widget->emit (size_allocate => $w, $h);
3672 }
3084 } 3673 }
3085 } 3674 }
3086 3675
3087 while ($self->{post_alloc_hook}) { 3676 while ($self->{post_alloc_hook}) {
3088 $_->() 3677 $_->()
3089 for values %{delete $self->{post_alloc_hook}}; 3678 for values %{delete $self->{post_alloc_hook}};
3090 } 3679 }
3680
3091 3681
3092 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3093 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3094 glClear GL_COLOR_BUFFER_BIT; 3684 glClear GL_COLOR_BUFFER_BIT;
3095 3685
… …
3097 glLoadIdentity; 3687 glLoadIdentity;
3098 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3099 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
3100 glLoadIdentity; 3690 glLoadIdentity;
3101 3691
3692 {
3693 package CFClient::UI::Base;
3694
3695 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h});
3697 }
3698
3102 $self->_draw; 3699 $self->_draw;
3103} 3700}
3104 3701
3105############################################################################# 3702#############################################################################
3106 3703

Diff Legend

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