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.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC

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

Diff Legend

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