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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC

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

Diff Legend

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