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.198 by root, Fri May 12 02:08:52 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
19our %WIDGET; # all widgets, weak-referenced
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
17sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
18 if (!$GRAB) { 47 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
23 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
24 54
25 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
26 56
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 58
29 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 61 }
42 62
43 return; 63 return;
44 } 64 }
45 } 65 }
… …
49 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
50} 70}
51 71
52# class methods for events 72# class methods for events
53sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 75 if $FOCUS;
56} 76}
57 77
58sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 80 if $FOCUS;
61} 81}
62 82
63sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
64 my ($ev) = @_; 84 my ($ev) = @_;
… …
73 check_tooltip; 93 check_tooltip;
74 } 94 }
75 95
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 97
78 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
82} 100}
83 101
84sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
85 my ($ev) = @_; 103 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
87 105
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89 107
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 109
92 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 112
97 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 115 $grab->update if $grab;
100 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
116 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
117 133
118 check_tooltip; 134 check_tooltip;
119 } 135 }
120 136
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124 } 138 if $HOVER;
125} 139}
126 140
127# convert position array to integers 141# convert position array to integers
128sub harmonize { 142sub harmonize {
129 my ($vals) = @_; 143 my ($vals) = @_;
… …
135 $rem += $_ - $i; 149 $rem += $_ - $i;
136 $_ = $i; 150 $_ = $i;
137 } 151 }
138} 152}
139 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
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
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
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_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
189 }
190 }
191
192 reconfigure_widgets;
193}
194
140############################################################################# 195#############################################################################
141 196
142package CFClient::UI::Base; 197package CFClient::UI::Base;
143 198
144use strict; 199use strict;
… …
147 202
148sub new { 203sub new {
149 my $class = shift; 204 my $class = shift;
150 205
151 my $self = bless { 206 my $self = bless {
152 x => 0, 207 x => "center",
153 y => 0, 208 y => "center",
154 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
155 can_events => 1, 212 can_events => 1,
156 @_ 213 @_
157 }, $class; 214 }, $class;
158 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
159 for (keys %$self) { 218 for (keys %$self) {
160 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
162 } 221 }
163 } 222 }
164 223
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 }
235
165 $self 236 $self
166} 237}
167 238
168sub destroy { 239sub destroy {
169 my ($self) = @_; 240 my ($self) = @_;
… …
178 return if $self->{parent}; 249 return if $self->{parent};
179 250
180 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
181} 252}
182 253
183sub hide { 254sub set_visible {
184 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};
185 278
186 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
188 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
189 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
190 if $self->{parent}; 313 if $self->{parent};
191} 314}
192 315
193sub move { 316sub move_abs {
194 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
195 318
196 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
197 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
198 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
199 322
200 $self->update; 323 $self->update;
201} 324}
202 325
203sub set_size { 326sub set_size {
204 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
205 328
206 $self->{user_w} = $w; 329 $self->{force_w} = $w;
207 $self->{user_h} = $h; 330 $self->{force_h} = $h;
208 331
209 $self->check_size; 332 $self->realloc;
210} 333}
211 334
212sub size_request { 335sub size_request {
213 require Carp; 336 require Carp;
214 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
216 339
217sub configure { 340sub configure {
218 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
219 342
220 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
221 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
223 348
224 # use alignment to adjust x, y 349 # use alignment to adjust x, y
225 350
226 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
227 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
228
229 ($w, $h) = ($w2, $h2);
230 } 353 }
231 354
232 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
233 $self->{x} = $x; 356 $self->{x} = $x;
234 $self->{y} = $y; 357 $self->{y} = $y;
235 $self->update; 358 $self->update;
236 } 359 }
237 360
238 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
239 $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;
240 } 368 }
241} 369}
242 370
243sub size_allocate { 371sub size_allocate {
244 # nothing to be done 372 # nothing to be done
245} 373}
246 374
247sub children { 375sub children {
376 # nop
248} 377}
249 378
250# call when resolution changes etc. 379sub visible_children {
251sub reconfigure { 380 $_[0]->children
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259} 381}
260 382
261sub set_max_size { 383sub set_max_size {
262 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
263 385
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 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 }
266} 404}
267 405
268# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
269sub coord2local { 407sub coord2local {
270 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
… …
285 return if $FOCUS == $self; 423 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
287 425
288 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
289 427
290 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
291 429
292 $focus->update if $focus; 430 $focus->update if $focus;
293 $FOCUS->update; 431 $FOCUS->update;
294} 432}
295 433
… …
298 436
299 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
300 438
301 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
302 440
303 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
304 442
305 $focus->update if $focus; #? 443 $focus->update if $focus; #?
306}
307 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
308sub mouse_motion { } 449sub mouse_motion { 0 }
309sub button_up { } 450sub button_up { 0 }
310sub key_down { } 451sub key_down { 0 }
311sub key_up { } 452sub key_up { 0 }
312 453
313sub button_down { 454sub button_down {
314 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
315 456
316 $self->focus_in; 457 $self->focus_in;
317}
318 458
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
323sub 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
324 535
325sub draw { 536sub draw {
326 my ($self) = @_; 537 my ($self) = @_;
327 538
328 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);
329 550
330 glPushMatrix; 551 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw; 553 $self->_draw;
333 glPopMatrix; 554 glPopMatrix;
… …
345 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
346 glEnd; 567 glEnd;
347 glDisable GL_BLEND; 568 glDisable GL_BLEND;
348 } 569 }
349 570
350 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
351 glPushMatrix; 572 glPushMatrix;
352 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 576 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
357 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
358 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
359 glEnd; 580 glEnd;
360 glPopMatrix; 581 glPopMatrix;
361 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;
362 } 583 }
363} 584}
364 585
365sub _draw { 586sub _draw {
366 my ($self) = @_; 587 my ($self) = @_;
367 588
368 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
369} 590}
370 591
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388
389 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size
391 unless exists $self->{req_w};
392}
393
394sub check_size {
395 my ($self, $forced) = @_;
396
397 $self->{force_alloc} = 1 if $forced;
398 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399}
400
401sub update {
402 my ($self) = @_;
403
404 $self->{parent}->update
405 if $self->{parent};
406}
407
408sub connect {
409 my ($self, $signal, $cb) = @_;
410
411 push @{ $self->{signal_cb}{$signal} }, $cb;
412}
413
414sub emit {
415 my ($self, $signal, @args) = @_;
416
417 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
418}
419
420sub DESTROY { 592sub DESTROY {
421 my ($self) = @_; 593 my ($self) = @_;
422 594
595 delete $WIDGET{$self+0};
423 #$self->deactivate; 596 #$self->deactivate;
424} 597}
425 598
426############################################################################# 599#############################################################################
427 600
… …
436 my $class = shift; 609 my $class = shift;
437 610
438 # range [value, low, high, page] 611 # range [value, low, high, page]
439 612
440 $class->SUPER::new ( 613 $class->SUPER::new (
441 bg => [0, 0, 0, 0.2], 614 #bg => [0, 0, 0, 0.2],
442 active_bg => [1, 1, 1, 0.5], 615 #active_bg => [1, 1, 1, 0.5],
443 @_ 616 @_
444 ) 617 )
445} 618}
446 619
447sub _draw { 620sub _draw {
448 my ($self) = @_; 621 my ($self) = @_;
449 622
623 my $color = $FOCUS == $self && $self->{active_bg}
624 ? $self->{active_bg}
625 : $self->{bg};
626
627 if ($color && (@$color < 4 || $color->[3])) {
450 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
451 629
452 glEnable GL_BLEND; 630 glEnable GL_BLEND;
453 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
454 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 632 glColor @$color;
455 633
456 glBegin GL_QUADS; 634 glBegin GL_QUADS;
457 glVertex 0 , 0; 635 glVertex 0 , 0;
458 glVertex 0 , $h; 636 glVertex 0 , $h;
459 glVertex $w, $h; 637 glVertex $w, $h;
460 glVertex $w, 0; 638 glVertex $w, 0;
461 glEnd; 639 glEnd;
462 640
463 glDisable GL_BLEND; 641 glDisable GL_BLEND;
642 }
464} 643}
465 644
466############################################################################# 645#############################################################################
467 646
468package CFClient::UI::Empty; 647package CFClient::UI::Empty;
… …
473 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
474 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
475} 654}
476 655
477sub size_request { 656sub size_request {
478 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
479} 660}
480 661
481sub draw { } 662sub draw { }
482 663
483############################################################################# 664#############################################################################
… …
487our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
488 669
489sub new { 670sub new {
490 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
491 672
492 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
493 674
494 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
495 children => [], 676 children => [],
496 can_events => 0, 677 can_events => 0,
497 %arg, 678 %arg,
498 ); 679 );
680
499 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
500 683
501 $self 684 $self
502} 685}
503 686
504sub add { 687sub add {
… …
512 $self->{children} = [ 695 $self->{children} = [
513 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
514 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
515 ]; 698 ];
516 699
517 $self->check_size (1); 700 $self->realloc;
518 $self->update;
519} 701}
520 702
521sub children { 703sub children {
522 @{ $_[0]{children} } 704 @{ $_[0]{children} }
523} 705}
… …
528 delete $child->{parent}; 710 delete $child->{parent};
529 $child->hide; 711 $child->hide;
530 712
531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532 714
533 $self->check_size; 715 $self->realloc;
534 $self->update;
535} 716}
536 717
537sub clear { 718sub clear {
538 my ($self) = @_; 719 my ($self) = @_;
539 720
… …
543 for (@$children) { 724 for (@$children) {
544 delete $_->{parent}; 725 delete $_->{parent};
545 $_->hide; 726 $_->hide;
546 } 727 }
547 728
548 $self->check_size; 729 $self->realloc;
549 $self->update;
550} 730}
551 731
552sub find_widget { 732sub find_widget {
553 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
554 734
555 $x -= $self->{x}; 735 $x -= $self->{x};
556 $y -= $self->{y}; 736 $y -= $self->{y};
557 737
558 my $res; 738 my $res;
559 739
560 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
561 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
562 and return $res; 742 and return $res;
563 } 743 }
564 744
565 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
614 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
615} 795}
616 796
617############################################################################# 797#############################################################################
618 798
799# back-buffered drawing area
800
619package CFClient::UI::Window; 801package CFClient::UI::Window;
620 802
621our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
622 804
623use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
641 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
642 $self->update; 824 $self->update;
643} 825}
644 826
645sub _render { 827sub _render {
828 my ($self) = @_;
829
646 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
647} 831}
648 832
649sub render_child { 833sub render_child {
650 my ($self) = @_; 834 my ($self) = @_;
651 835
652 $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 {
653 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
654 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
655 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
656 $self->_render; 847 $self->_render;
657# glColorMask 1, 1, 1, 0;
658# glEnable GL_BLEND;
659# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660# glRasterPos 0, 0;
661# glCopyPixels 0, 0, $self->{w}, $self->{h};
662# glDisable GL_BLEND;
663# glColorMask 1, 1, 1, 1;
664 }; 848 };
665} 849}
666 850
667sub _draw { 851sub _draw {
668 my ($self) = @_; 852 my ($self) = @_;
669 853
670 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
671 855
672 my $tex = $self->{texture} 856 my $tex = $self->{texture}
673 or return; 857 or return;
674 858
675 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677 glColor 0, 0, 0, 1; 861 glColor 1, 1, 1, 1;
678 862
679 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
680 864
681 glDisable GL_TEXTURE_2D; 865 glDisable GL_TEXTURE_2D;
682} 866}
… …
685 869
686package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
687 871
688our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
689 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
690sub size_request { 884sub size_request {
691 my ($self) = @_; 885 my ($self) = @_;
692 886
693 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
695 888
696 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
697} 893}
698 894
699sub size_allocate { 895sub size_allocate {
700 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
701 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);
702 $self->update; 904 $self->update;
703} 905}
704 906
705sub set_offset { 907sub set_offset {
706 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
… …
740} 942}
741 943
742sub _render { 944sub _render {
743 my ($self) = @_; 945 my ($self) = @_;
744 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
745 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
746 951
747 $self->SUPER::_render; 952 $self->SUPER::_render;
748} 953}
749 954
750############################################################################# 955#############################################################################
751 956
752package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
753 958
754our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
960
961sub new {
962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
965
966 my $self;
967
968 my $slider = new CFClient::UI::Slider
969 vertical => 1,
970 range => [0, 0, 1, 0.01], # HACK fix
971 on_changed => sub {
972 $self->{vp}->set_offset (0, $_[1]);
973 },
974 ;
975
976 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1),
978 slider => $slider,
979 %arg,
980 );
981
982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
984
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]);
1011}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015
1016#############################################################################
1017
1018package CFClient::UI::Frame;
1019
1020our @ISA = CFClient::UI::Bin::;
1021
1022use CFClient::OpenGL;
755 1023
756sub new { 1024sub new {
757 my $class = shift; 1025 my $class = shift;
758 1026
759 my $self;
760
761 my $slider = new CFClient::UI::Slider
762 vertical => 1,
763 range => [0, 0, 1, 0.01], # HACK fix
764 connect_changed => sub {
765 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
766 },
767 ;
768
769 $self = $class->SUPER::new ( 1027 $class->SUPER::new (
770 vp => (new CFClient::UI::ViewPort), 1028 bg => undef,
771 slider => $slider,
772 @_, 1029 @_,
1030 )
1031}
1032
1033sub _draw {
1034 my ($self) = @_;
1035
1036 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)};
1038
1039 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} };
1042
1043 glBegin GL_QUADS;
1044 glVertex 0 , 0;
1045 glVertex 0 , $h;
1046 glVertex $w, $h;
1047 glVertex $w, 0;
1048 glEnd;
1049
1050 glDisable GL_BLEND;
1051 }
1052
1053 $self->SUPER::_draw;
1054}
1055
1056#############################################################################
1057
1058package CFClient::UI::FancyFrame;
1059
1060our @ISA = CFClient::UI::Bin::;
1061
1062use CFClient::OpenGL;
1063
1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071
1072sub new {
1073 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1076
1077 my $self = $class->SUPER::new (
1078 bg => [1, 1, 1, 1],
1079 border_bg => [1, 1, 1, 1],
1080 border => 0.6,
1081 can_events => 1,
1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
773 ); 1085 );
774 1086
775 $self->{vp}->add ($self->{scrolled});
776 $self->add ($self->{vp});
777 $self->add ($self->{slider});
778
779 $self
780}
781
782#TODO# update range on size_allocate depeneing on child
783# update viewport offset on scroll
784
785#############################################################################
786
787package CFClient::UI::Frame;
788
789our @ISA = CFClient::UI::Bin::;
790
791use CFClient::OpenGL;
792
793#############################################################################
794
795package CFClient::UI::FancyFrame;
796
797our @ISA = CFClient::UI::Bin::;
798
799use CFClient::OpenGL;
800
801my @tex =
802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
803 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
804
805sub new {
806 my $class = shift;
807
808 # TODO: user_x, user_y, overwrite moveto?
809
810 my $self = $class->SUPER::new (
811 bg => [1, 1, 1, 1],
812 border_bg => [1, 1, 1, 1],
813 border => 0.6,
814 can_events => 1,
815 @_
816 );
817
818 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
819 align => 0, 1088 align => 0,
820 valign => 1, 1089 valign => 1,
821 text => $self->{title}, 1090 text => $title,
822 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
823 1093
824 $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};
825} 1102}
826 1103
827sub border { 1104sub border {
828 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
829} 1106}
830 1107
831sub size_request { 1108sub size_request {
832 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
833 1113
834 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
835 1115
836 ( 1116 (
837 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
840} 1120}
841 1121
842sub size_allocate { 1122sub size_allocate {
843 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
844 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
845 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
846 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
847 1135
848 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
849 if $self->{title};
850
851 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
852} 1137}
853 1138
854sub button_down { 1139sub button_down {
855 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
856 1141
… …
872 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
873 1158
874 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
875 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
876 1161
877 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
878 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
1165 $self->realloc;
879 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
880 $self->check_size;
881 }; 1167 };
882 1168
883 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
884 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
885 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
887 $self->{motion} = sub { 1173 $self->{motion} = sub {
888 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
889 1175
890 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
891 1177
892 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
893 $self->update;
894 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
895 } 1184 1
896} 1185}
897 1186
898sub button_up { 1187sub button_up {
899 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
900 1189
901 delete $self->{motion}; 1190 !!delete $self->{motion}
902} 1191}
903 1192
904sub mouse_motion { 1193sub mouse_motion {
905 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
906 1195
907 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
908} 1199}
909 1200
910sub _draw { 1201sub _draw {
911 my ($self) = @_; 1202 my ($self) = @_;
912 1203
1204 my $child = $self->{children}[0];
1205
913 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
914 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
915 1208
916 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
918 1211
919 my $border = $self->border; 1212 my $border = $self->border;
920 1213
921 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
922 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
923 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
924 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
925 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
926 1219
927 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
928 my $bg = $tex[0]; 1221 glColor @{ $self->{bg} };
929 1222
930 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
1224 # solve this better(?)
931 my $rep_x = $cw / $bg->{w}; 1225 $bg->{s} = $cw / $bg->{w};
932 my $rep_y = $ch / $bg->{h}; 1226 $bg->{t} = $ch / $bg->{h};
933
934 glColor @{ $self->{bg} };
935
936 $bg->{s} = $rep_x;
937 $bg->{t} = $rep_y;
938 $bg->{wrap_mode} = 1;
939 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
940 } 1228 }
941 1229
942 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
943 1231
944 $self->{title}->draw if $self->{title};
945
946 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
947} 1238}
948 1239
949############################################################################# 1240#############################################################################
950 1241
951package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
959sub new { 1250sub new {
960 my $class = shift; 1251 my $class = shift;
961 1252
962 $class->SUPER::new ( 1253 $class->SUPER::new (
963 col_expand => [], 1254 col_expand => [],
964 @_ 1255 @_,
965 ) 1256 )
1257}
1258
1259sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} }
966} 1261}
967 1262
968sub add { 1263sub add {
969 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
970 1265
971 $child->set_parent ($self); 1266 $child->set_parent ($self);
972 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
973 1268
974 $child->check_size; 1269 $self->realloc;
975} 1270}
976 1271
977sub children {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} }
979}
980
981# 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?
982sub clear { 1273sub clear {
983 my ($self) = @_; 1274 my ($self) = @_;
984 1275
985 my @children = $self->children; 1276 my @children = $self->children;
986 delete $self->{children}; 1277 delete $self->{children};
… …
988 for (@children) { 1279 for (@children) {
989 delete $_->{parent}; 1280 delete $_->{parent};
990 $_->hide; 1281 $_->hide;
991 } 1282 }
992 1283
993 $self->update; 1284 $self->realloc;
994} 1285}
995 1286
996sub get_wh { 1287sub get_wh {
997 my ($self) = @_; 1288 my ($self) = @_;
998 1289
… …
1029sub size_allocate { 1320sub size_allocate {
1030 my ($self, $w, $h) = @_; 1321 my ($self, $w, $h) = @_;
1031 1322
1032 my ($ws, $hs) = $self->get_wh; 1323 my ($ws, $hs) = $self->get_wh;
1033 1324
1034 my $req_w = sum @$ws; 1325 my $req_w = (sum @$ws) || 1;
1035 my $req_h = sum @$hs; 1326 my $req_h = (sum @$hs) || 1;
1036 1327
1037 # TODO: nicer code && do row_expand 1328 # TODO: nicer code && do row_expand
1038 my @col_expand = @{$self->{col_expand}}; 1329 my @col_expand = @{$self->{col_expand}};
1039 @col_expand = (1) x @$ws unless @col_expand; 1330 @col_expand = (1) x @$ws unless @col_expand;
1040 my $col_expand = (sum @col_expand) || 1; 1331 my $col_expand = (sum @col_expand) || 1;
… …
1094 } 1385 }
1095} 1386}
1096 1387
1097############################################################################# 1388#############################################################################
1098 1389
1099package CFClient::UI::HBox; 1390package CFClient::UI::Box;
1100
1101# TODO: wrap into common Box base class
1102 1391
1103our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Container::;
1104 1393
1105sub size_request { 1394sub size_request {
1106 my ($self) = @_; 1395 my ($self) = @_;
1107 1396
1108 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $self->{vertical}
1109 1398 ? (
1110 ( 1399 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1111 (List::Util::sum map $_->[0], @alloc), 1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1112 (List::Util::max map $_->[1], @alloc), 1401 )
1113 ) 1402 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 )
1114} 1406}
1115 1407
1116sub size_allocate { 1408sub size_allocate {
1117 my ($self, $w, $h) = @_; 1409 my ($self, $w, $h) = @_;
1118 1410
1119 ($h, $w) = ($w, $h); 1411 my $space = $self->{vertical} ? $h : $w;
1120
1121 my $children = $self->{children}; 1412 my $children = $self->{children};
1122 1413
1123 my @h = map $_->{req_w}, @$children; 1414 my @req;
1124 1415
1125 my $req_h = List::Util::sum @h; 1416 if ($self->{homogeneous}) {
1126 1417 @req = ($space / (@$children || 1)) x @$children;
1127 if ($req_h > $h) {
1128 # ah well, not enough space
1129 $_ *= $h / $req_h for @h;
1130 } 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 {
1131 my $exp = List::Util::sum map $_->{expand}, @$children; 1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1132 $exp ||= 1;
1133 1427
1428 $space = ($space - $req) / $expand; # remaining space to give away
1429
1430 $req[$_] += $space * $children->[$_]{expand}
1134 for (0 .. $#$children) { 1431 for 0 .. $#$children;
1135 my $child = $children->[$_];
1136
1137 my $alloc_h = $h[$_];
1138 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1139 $h[$_] = $alloc_h;
1140 } 1432 }
1141 } 1433 }
1142 1434
1143 CFClient::UI::harmonize \@h; 1435 CFClient::UI::harmonize \@req;
1144 1436
1145 my $y = 0; 1437 my $pos = 0;
1146 for (0 .. $#$children) { 1438 for (0 .. $#$children) {
1147 my $child = $children->[$_];
1148 my $h = $h[$_]; 1439 my $alloc = $req[$_];
1149 $child->configure ($y, 0, $h, $w); 1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1150 1441
1151 $y += $h; 1442 $pos += $alloc;
1152 } 1443 }
1153 1444
1154 1 1445 1
1155} 1446}
1156 1447
1157############################################################################# 1448#############################################################################
1158 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
1159package CFClient::UI::VBox; 1465package CFClient::UI::VBox;
1160 1466
1161# TODO: wrap into common Box base class
1162
1163our @ISA = CFClient::UI::Container::; 1467our @ISA = CFClient::UI::Box::;
1164 1468
1165sub size_request { 1469sub new {
1166 my ($self) = @_; 1470 my $class = shift;
1167 1471
1168 my @alloc = map [$_->size_request], @{$self->{children}}; 1472 $class->SUPER::new (
1169 1473 vertical => 1,
1170 ( 1474 @_,
1171 (List::Util::max map $_->[0], @alloc),
1172 (List::Util::sum map $_->[1], @alloc),
1173 ) 1475 )
1174} 1476}
1175 1477
1176sub size_allocate {
1177 my ($self, $w, $h) = @_;
1178
1179 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1180
1181 my $children = $self->{children};
1182
1183 my @h = map $_->{req_h}, @$children;
1184
1185 my $req_h = List::Util::sum @h;
1186
1187 if ($req_h > $h) {
1188 # ah well, not enough space
1189 $_ *= $h / $req_h for @h;
1190 } else {
1191 my $exp = List::Util::sum map $_->{expand}, @$children;
1192 $exp ||= 1;
1193
1194 for (0 .. $#$children) {
1195 my $child = $children->[$_];
1196
1197 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1198 }
1199 }
1200
1201 CFClient::UI::harmonize \@h;
1202
1203 my $y = 0;
1204 for (0 .. $#$children) {
1205 my $child = $children->[$_];
1206 my $h = $h[$_];
1207 $child->configure (0, $y, $w, $h);
1208
1209 $y += $h;
1210 }
1211
1212 1
1213}
1214
1215############################################################################# 1478#############################################################################
1216 1479
1217package CFClient::UI::Label; 1480package CFClient::UI::Label;
1218 1481
1219our @ISA = CFClient::UI::Base::; 1482our @ISA = CFClient::UI::DrawBG::;
1220 1483
1221use CFClient::OpenGL; 1484use CFClient::OpenGL;
1222 1485
1223sub new { 1486sub new {
1224 my ($class, %arg) = @_; 1487 my ($class, %arg) = @_;
1225 1488
1226 my $self = $class->SUPER::new ( 1489 my $self = $class->SUPER::new (
1227 fg => [1, 1, 1], 1490 fg => [1, 1, 1],
1491 #bg => none
1492 #active_bg => none
1228 #font => default_font 1493 #font => default_font
1229 #text => initial text 1494 #text => initial text
1230 #markup => initial narkup 1495 #markup => initial narkup
1496 #max_w => maximum pixel width
1497 ellipsise => 3, # end
1231 layout => (new CFClient::Layout), 1498 layout => (new CFClient::Layout),
1232 fontsize => 1, 1499 fontsize => 1,
1233 align => -1, 1500 align => -1,
1234 valign => -1, 1501 valign => -1,
1235 padding => 2, 1502 padding_x => 2,
1503 padding_y => 2,
1236 can_events => 0, 1504 can_events => 0,
1237 %arg 1505 %arg
1238 ); 1506 );
1239 1507
1240 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1250 } 1518 }
1251 1519
1252 $self 1520 $self
1253} 1521}
1254 1522
1255sub escape { 1523sub escape($) {
1256 local $_ = $_[1]; 1524 local $_ = $_[0];
1257 1525
1258 s/&/&amp;/g; 1526 s/&/&amp;/g;
1259 s/>/&gt;/g; 1527 s/>/&gt;/g;
1260 s/</&lt;/g; 1528 s/</&lt;/g;
1261 1529
1262 $_[1] 1530 $_
1263} 1531}
1264 1532
1265sub update { 1533sub update {
1266 my ($self) = @_; 1534 my ($self) = @_;
1267 1535
… …
1276 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1277 1545
1278 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1279 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1280 1548
1549 $self->realloc;
1281 $self->update; 1550 $self->update;
1282 $self->check_size;
1283} 1551}
1284 1552
1285sub set_markup { 1553sub set_markup {
1286 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1287 1555
… …
1291 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1292 1560
1293 $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;
1294 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1295 1563
1564 $self->realloc;
1296 $self->update; 1565 $self->update;
1297 $self->check_size;
1298} 1566}
1299 1567
1300sub size_request { 1568sub size_request {
1301 my ($self) = @_; 1569 my ($self) = @_;
1302 1570
1303 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1571 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $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});
1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306 1576
1307 my ($w, $h) = $self->{layout}->size; 1577 my ($w, $h) = $self->{layout}->size;
1308 1578
1309 if (exists $self->{template}) { 1579 if (exists $self->{template}) {
… …
1314 1584
1315 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1316 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1317 } 1587 }
1318 1588
1319 ( 1589 ($w, $h)
1320 $w + $self->{padding} * 2,
1321 $h + $self->{padding} * 2,
1322 )
1323} 1590}
1324 1591
1325sub size_allocate { 1592sub size_allocate {
1326 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1327 1594
1595 delete $self->{ox};
1596
1328 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1329} 1599}
1330 1600
1331sub set_fontsize { 1601sub set_fontsize {
1332 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1333 1603
1334 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1335 delete $self->{texture}; 1605 delete $self->{texture};
1336 1606
1337 $self->update; 1607 $self->realloc;
1338 $self->check_size;
1339} 1608}
1340 1609
1341sub _draw { 1610sub _draw {
1342 my ($self) = @_; 1611 my ($self) = @_;
1612
1613 $self->SUPER::_draw; # draw background, if applicable
1343 1614
1344 my $tex = $self->{texture} ||= do { 1615 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}}); 1616 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1617 $self->{layout}->set_font ($self->{font}) if $self->{font};
1347 $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});
1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1622
1350 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1351 1625
1626 unless (exists $self->{ox}) {
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1354 : ($self->{w} - $tex->{w}) * 0.5; 1629 : ($self->{w} - $tex->{w}) * 0.5);
1355 1630
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1358 : ($self->{h} - $tex->{h}) * 0.5; 1633 : ($self->{h} - $tex->{h}) * 0.5);
1359
1360 $tex
1361 }; 1634 };
1362 1635
1363 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1365 1638
… …
1391 active_fg => [0, 0, 0], 1664 active_fg => [0, 0, 0],
1392 can_hover => 1, 1665 can_hover => 1,
1393 can_focus => 1, 1666 can_focus => 1,
1394 valign => 0, 1667 valign => 0,
1395 can_events => 1, 1668 can_events => 1,
1669 #text => ...
1396 @_ 1670 @_
1397 ) 1671 )
1398} 1672}
1399 1673
1400sub _set_text { 1674sub _set_text {
… …
1402 1676
1403 delete $self->{cur_h}; 1677 delete $self->{cur_h};
1404 1678
1405 return if $self->{text} eq $text; 1679 return if $self->{text} eq $text;
1406 1680
1407 delete $self->{texture};
1408
1409 $self->{last_activity} = $::NOW; 1681 $self->{last_activity} = $::NOW;
1410 $self->{text} = $text; 1682 $self->{text} = $text;
1411 1683
1412 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1413 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1414 1686
1415 $self->emit (changed => $self->{text}); 1687 $self->_emit (changed => $self->{text});
1688 $self->update;
1416} 1689}
1417 1690
1418sub set_text { 1691sub set_text {
1419 my ($self, $text) = @_; 1692 my ($self, $text) = @_;
1420 1693
1421 $self->{cursor} = length $text; 1694 $self->{cursor} = length $text;
1422 $self->_set_text ($text); 1695 $self->_set_text ($text);
1423 $self->check_size; 1696
1424 $self->update; 1697 $self->realloc;
1425} 1698}
1426 1699
1427sub get_text { 1700sub get_text {
1428 $_[0]{text} 1701 $_[0]{text}
1429} 1702}
… …
1432 my ($self) = @_; 1705 my ($self) = @_;
1433 1706
1434 my ($w, $h) = $self->SUPER::size_request; 1707 my ($w, $h) = $self->SUPER::size_request;
1435 1708
1436 ($w + 1, $h) # add 1 for cursor 1709 ($w + 1, $h) # add 1 for cursor
1437}
1438
1439sub size_allocate {
1440 my ($self, $w, $h) = @_;
1441
1442 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1443} 1710}
1444 1711
1445sub key_down { 1712sub key_down {
1446 my ($self, $ev) = @_; 1713 my ($self, $ev) = @_;
1447 1714
… …
1449 my $sym = $ev->{sym}; 1716 my $sym = $ev->{sym};
1450 my $uni = $ev->{unicode}; 1717 my $uni = $ev->{unicode};
1451 1718
1452 my $text = $self->get_text; 1719 my $text = $self->get_text;
1453 1720
1454 if ($sym == 8) { 1721 if ($uni == 8) {
1455 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1722 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456 } elsif ($sym == 127) { 1723 } elsif ($uni == 127) {
1457 substr $text, $self->{cursor}, 1, ""; 1724 substr $text, $self->{cursor}, 1, "";
1458 } elsif ($sym == CFClient::SDLK_LEFT) { 1725 } elsif ($sym == CFClient::SDLK_LEFT) {
1459 --$self->{cursor} if $self->{cursor}; 1726 --$self->{cursor} if $self->{cursor};
1460 } elsif ($sym == CFClient::SDLK_RIGHT) { 1727 } elsif ($sym == CFClient::SDLK_RIGHT) {
1461 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1728 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1462 } elsif ($sym == CFClient::SDLK_HOME) { 1729 } elsif ($sym == CFClient::SDLK_HOME) {
1463 $self->{cursor} = 0; 1730 $self->{cursor} = 0;
1464 } elsif ($sym == CFClient::SDLK_END) { 1731 } elsif ($sym == CFClient::SDLK_END) {
1465 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1466 } elsif ($sym == 27) { 1733 } elsif ($uni == 27) {
1467 $self->emit ('escape'); 1734 $self->_emit ('escape');
1468 } elsif ($uni) { 1735 } elsif ($uni) {
1469 substr $text, $self->{cursor}++, 0, chr $uni; 1736 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else {
1738 return 0;
1470 } 1739 }
1471 1740
1472 $self->_set_text ($text); 1741 $self->_set_text ($text);
1473 $self->update; 1742
1743 $self->realloc;
1744
1745 1
1474} 1746}
1475 1747
1476sub focus_in { 1748sub focus_in {
1477 my ($self) = @_; 1749 my ($self) = @_;
1478 1750
… …
1493 utf8::encode $text; 1765 utf8::encode $text;
1494 $self->{cursor} = length substr $text, 0, $idx; 1766 $self->{cursor} = length substr $text, 0, $idx;
1495 1767
1496 $self->_set_text ($self->{text}); 1768 $self->_set_text ($self->{text});
1497 $self->update; 1769 $self->update;
1770
1771 1
1498} 1772}
1499 1773
1500sub mouse_motion { 1774sub mouse_motion {
1501 my ($self, $ev, $x, $y) = @_; 1775 my ($self, $ev, $x, $y) = @_;
1502# 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
1503} 1779}
1504 1780
1505sub _draw { 1781sub _draw {
1506 my ($self) = @_; 1782 my ($self) = @_;
1507 1783
… …
1558 if ($sym == 13) { 1834 if ($sym == 13) {
1559 unshift @{$self->{history}}, 1835 unshift @{$self->{history}},
1560 my $txt = $self->get_text; 1836 my $txt = $self->get_text;
1561 $self->{history_pointer} = -1; 1837 $self->{history_pointer} = -1;
1562 $self->{history_saveback} = ''; 1838 $self->{history_saveback} = '';
1563 $self->emit (activate => $txt); 1839 $self->_emit (activate => $txt);
1564 $self->update; 1840 $self->update;
1565 1841
1566 } elsif ($sym == CFClient::SDLK_UP) { 1842 } elsif ($sym == CFClient::SDLK_UP) {
1567 if ($self->{history_pointer} < 0) { 1843 if ($self->{history_pointer} < 0) {
1568 $self->{history_saveback} = $self->get_text; 1844 $self->{history_saveback} = $self->get_text;
… …
1584 } else { 1860 } else {
1585 $self->set_text ($self->{history_saveback}); 1861 $self->set_text ($self->{history_saveback});
1586 } 1862 }
1587 1863
1588 } else { 1864 } else {
1589 $self->SUPER::key_down ($ev); 1865 return $self->SUPER::key_down ($ev)
1866 }
1867
1590 } 1868 1
1591
1592} 1869}
1593 1870
1594############################################################################# 1871#############################################################################
1595 1872
1596package CFClient::UI::Button; 1873package CFClient::UI::Button;
… …
1605 1882
1606sub new { 1883sub new {
1607 my $class = shift; 1884 my $class = shift;
1608 1885
1609 $class->SUPER::new ( 1886 $class->SUPER::new (
1610 padding => 4, 1887 padding_x => 4,
1888 padding_y => 4,
1611 fg => [1, 1, 1], 1889 fg => [1, 1, 1],
1612 bg => [1, 1, 1, 0.2],
1613 active_fg => [0, 0, 1], 1890 active_fg => [0, 0, 1],
1614 can_hover => 1, 1891 can_hover => 1,
1615 align => 0, 1892 align => 0,
1616 valign => 0, 1893 valign => 0,
1617 can_events => 1, 1894 can_events => 1,
1618 @_ 1895 @_
1619 ) 1896 )
1620} 1897}
1621 1898
1899sub activate { }
1900
1622sub button_up { 1901sub button_up {
1623 my ($self, $ev, $x, $y) = @_; 1902 my ($self, $ev, $x, $y) = @_;
1624 1903
1904 $self->emit ("activate")
1625 if ($x >= 0 && $x < $self->{w} 1905 if $x >= 0 && $x < $self->{w}
1626 && $y >= 0 && $y < $self->{h}) { 1906 && $y >= 0 && $y < $self->{h};
1627 $self->emit ("activate"); 1907
1628 } 1908 1
1629} 1909}
1630 1910
1631sub _draw { 1911sub _draw {
1632 my ($self) = @_; 1912 my ($self) = @_;
1633 1913
… …
1662 1942
1663sub new { 1943sub new {
1664 my $class = shift; 1944 my $class = shift;
1665 1945
1666 $class->SUPER::new ( 1946 $class->SUPER::new (
1667 padding => 2, 1947 padding_x => 2,
1948 padding_y => 2,
1668 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1669 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],
1670 state => 0, 1953 state => 0,
1671 can_hover => 1, 1954 can_hover => 1,
1672 @_ 1955 @_
1673 ) 1956 )
1674} 1957}
1675 1958
1676sub size_request { 1959sub size_request {
1677 my ($self) = @_; 1960 my ($self) = @_;
1678 1961
1679 ($self->{padding} * 2 + 6) x 2 1962 (6) x 2
1680} 1963}
1681 1964
1682sub button_down { 1965sub button_down {
1683 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1684 1967
1685 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1686 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1687 $self->{state} = !$self->{state}; 1970 $self->{state} = !$self->{state};
1688 $self->emit (changed => $self->{state}); 1971 $self->_emit (changed => $self->{state});
1972 } else {
1973 return 0
1974 }
1975
1689 } 1976 1
1690} 1977}
1691 1978
1692sub _draw { 1979sub _draw {
1693 my ($self) = @_; 1980 my ($self) = @_;
1694 1981
1695 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1696 1983
1697 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1984 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1698 1985
1699 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;
1700 1989
1701 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1990 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1702 1991
1703 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1992 my $tex = $self->{state} ? $tex[1] : $tex[0];
1704 1993
… …
1958 qw(s1_slider.png s1_slider_bg.png); 2247 qw(s1_slider.png s1_slider_bg.png);
1959 2248
1960sub new { 2249sub new {
1961 my $class = shift; 2250 my $class = shift;
1962 2251
1963 # range [value, low, high, page] 2252 # range [value, low, high, page, unit]
1964 2253
1965 # TODO: 0-width page 2254 # TODO: 0-width page
1966 # TODO: req_w/h are wrong with vertical 2255 # TODO: req_w/h are wrong with vertical
1967 # TODO: calculations are off 2256 # TODO: calculations are off
1968 my $self = $class->SUPER::new ( 2257 my $self = $class->SUPER::new (
1969 fg => [1, 1, 1], 2258 fg => [1, 1, 1],
1970 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],
1971 range => [0, 0, 100, 10], 2262 range => [0, 0, 100, 10, 0],
1972 req_w => $::WIDTH / 80, 2263 min_w => $::WIDTH / 80,
1973 req_h => $::WIDTH / 80, 2264 min_h => $::WIDTH / 80,
1974 vertical => 0, 2265 vertical => 0,
1975 can_hover => 1, 2266 can_hover => 1,
1976 inner_pad => 5, 2267 inner_pad => 0.02,
1977 @_ 2268 @_
1978 ); 2269 );
1979 2270
2271 $self->set_value ($self->{range}[0]);
2272 $self->update;
2273
1980 $self 2274 $self
1981} 2275}
1982 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
1983sub size_request { 2311sub size_request {
1984 my ($self) = @_; 2312 my ($self) = @_;
1985 2313
1986 my $w = $self->{req_w}; 2314 ($self->{req_w}, $self->{req_h})
1987 my $h = $self->{req_h};
1988
1989 $self->{vertical} ? ($h, $w) : ($w, $h)
1990} 2315}
1991 2316
1992sub button_down { 2317sub button_down {
1993 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
1994 2319
1995 $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
1996 $self->mouse_motion ($ev, $x, $y); 2324 $self->mouse_motion ($ev, $x, $y)
1997} 2325}
1998 2326
1999sub mouse_motion { 2327sub mouse_motion {
2000 my ($self, $ev, $x, $y) = @_; 2328 my ($self, $ev, $x, $y) = @_;
2001 2329
2002 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
2003 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2358 my ($value, $lo, $hi, $page) = @{$self->{range}};
2359 my $range = ($hi - $page - $lo) || 1e-100;
2004 2360
2005 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2361 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2006 2362
2007 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2363 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2008 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2364 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2009 2365
2010 $x -= $inner_pad_px; # substract the padding 2366 $value = ($value - $lo) / $range;
2011 $x = $x * ($hi - $lo) / $inner_w + $lo; 2367 $value = $value * $self->{scale} + $self->{offset};
2012 $x = $lo if $x < $lo;
2013 $x = $hi - $page if $x > $hi - $page;
2014 $self->{range}[0] = $x;
2015 2368
2016 $self->emit (changed => $x); 2369 $self->{knob_x} = $value - $knob_w * 0.5;
2017 $self->update; 2370 $self->{knob_w} = $knob_w;
2018 } 2371 }
2019}
2020
2021# the inner_* stuff is for generating a padding for the slider handle,
2022# so that the handle doesn't leave the texture. This calculation isn't 100%
2023# correct propably, but it does the job for now
2024sub _calc_inner_pad_px {
2025 my ($self, $w) = @_;
2026 ($w / 100) * $self->{inner_pad} # % to pixels
2027}
2028
2029sub _draw {
2030 my ($self) = @_;
2031 2372
2032 $self->SUPER::_draw (); 2373 $self->SUPER::_draw ();
2033 2374
2034 my ($w, $h) = @$self{qw(w h)}; 2375 glScale $self->{w}, $self->{h};
2035 2376
2036 if ($self->{vertical}) { 2377 if ($self->{vertical}) {
2037 # draw a vertical slider like a rotated horizontal slider 2378 # draw a vertical slider like a rotated horizontal slider
2038 2379
2380 glTranslate 1, 0, 0;
2039 glRotate 90, 0, 0, 1; 2381 glRotate 90, 0, 0, 1;
2040 glTranslate 0, -$self->{w}, 0;
2041
2042 ($w, $h) = ($h, $w);
2043 } 2382 }
2044 2383
2045 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2384 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2385 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047 2386
2048 my ($value, $lo, $hi, $page) = @{$self->{range}};
2049
2050 $hi = $value + 1 if $lo == $hi;
2051
2052 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2053 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2054
2055 $page = int $page * $inner_w / ($hi - $lo);
2056 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2057
2058 $w -= $page;
2059 $page &= ~1;
2060 glTranslate $page * 0.5, 0, 0;
2061 $page ||= 2;
2062
2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2065
2066 glEnable GL_TEXTURE_2D; 2387 glEnable GL_TEXTURE_2D;
2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068 2389
2069 # draw background 2390 # draw background
2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2391 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071 2392
2072 # draw handle 2393 # draw handle
2073 $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);
2074 2395
2075 glDisable GL_TEXTURE_2D; 2396 glDisable GL_TEXTURE_2D;
2076} 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 (@_) }
2077 2439
2078############################################################################# 2440#############################################################################
2079 2441
2080package CFClient::UI::TextView; 2442package CFClient::UI::TextView;
2081 2443
… …
2111 2473
2112 $self->{fontsize} = $fontsize; 2474 $self->{fontsize} = $fontsize;
2113 $self->reflow; 2475 $self->reflow;
2114} 2476}
2115 2477
2116sub text_height {
2117 my ($self, $text) = @_;
2118
2119 my $layout = $self->{layout};
2120
2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2122 $layout->set_width ($self->{children}[0]{w});
2123 $layout->set_markup ($text);
2124
2125 ($layout->size)[1]
2126}
2127
2128sub reflow {
2129 my ($self) = @_;
2130
2131 $self->{need_reflow}++;
2132 $self->update;
2133}
2134
2135sub size_allocate { 2478sub size_allocate {
2136 my ($self, $w, $h) = @_; 2479 my ($self, $w, $h) = @_;
2137 2480
2138 $self->SUPER::size_allocate ($w, $h); 2481 $self->SUPER::size_allocate ($w, $h);
2139 2482
… …
2142 $self->{layout}->set_width ($self->{children}[0]{w}); 2485 $self->{layout}->set_width ($self->{children}[0]{w});
2143 2486
2144 $self->reflow; 2487 $self->reflow;
2145} 2488}
2146 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
2147sub add_paragraph { 2524sub add_paragraph {
2148 my ($self, $color, $text) = @_; 2525 my ($self, $color, $text, $indent) = @_;
2149 2526
2150 #TODO: intelligently "reformat" paragraph 2527 for my $line (split /\n/, $text) {
2151 2528 my ($w, $h) = $self->text_size ($line);
2152 my $height = $self->text_height ($text);
2153
2154 $self->{height} += $height; 2529 $self->{height} += $h;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2531 }
2155 2532
2156 push @{$self->{par}}, [$height, $color, $text];
2157
2158 $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]);
2159 $self->{children}[1]->update;
2160} 2534}
2161 2535
2162sub update { 2536sub update {
2163 my ($self) = @_; 2537 my ($self) = @_;
2164 2538
… …
2167 return unless $self->{h} > 0; 2541 return unless $self->{h} > 0;
2168 2542
2169 delete $self->{texture}; 2543 delete $self->{texture};
2170 2544
2171 $ROOT->on_post_alloc ($self, sub { 2545 $ROOT->on_post_alloc ($self, sub {
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547
2172 if (delete $self->{need_reflow}) { 2548 if (delete $self->{need_reflow}) {
2173 my $height = 0; 2549 my $height = 0;
2174 2550
2175 $height += $_->[0] = $self->text_height ($_->[2]) 2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2176 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 }
2177 2566
2178 $self->{height} = $height; 2567 $self->{height} = $height;
2179 2568
2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2181 2570
2182 delete $self->{texture}; 2571 delete $self->{texture};
2183 } 2572 }
2184 2573
2185 $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 {
2186 glClearColor 0, 0, 0, 0; 2575 glClearColor 0.5, 0.5, 0.5, 0;
2187 glClear GL_COLOR_BUFFER_BIT; 2576 glClear GL_COLOR_BUFFER_BIT;
2188 2577
2189 glEnable GL_TEXTURE_2D;
2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2191
2192 my $top = int $self->{children}[1]{range}[0]; 2578 my $top = int $self->{children}[1]{range}[0];
2193 2579
2194 my $y0 = $top; 2580 my $y0 = $top;
2195 my $y1 = $top + $self->{h}; 2581 my $y1 = $top + $H;
2196 2582
2197 my $y = 0; 2583 my $y = 0;
2198 2584
2199 my $layout = $self->{layout}; 2585 my $layout = $self->{layout};
2200 2586
2201 $layout->set_font ($self->{font}) if $self->{font}; 2587 $layout->set_font ($self->{font}) if $self->{font};
2202 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
2203 for my $par (@{$self->{par}}) { 2593 for my $par (@{$self->{par}}) {
2204 my $h = $par->[0]; 2594 my $h = $par->[1];
2205 2595
2206 if ($y0 < $y + $h && $y < $y1) { 2596 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] }); 2597 $layout->set_foreground (@{ $par->[2] });
2598 $layout->set_width ($W - $par->[3]);
2208 $layout->set_markup ($par->[2]); 2599 $layout->set_markup ($par->[4]);
2209 2600
2210 my ($W, $H) = $layout->size; 2601 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2211 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;
2212 } 2605 }
2213 2606
2214 $y += $h; 2607 $y += $h;
2215 } 2608 }
2216 2609
2217 glDisable GL_TEXTURE_2D; 2610 glDisable GL_BLEND;
2218 }; 2611 };
2219 }); 2612 });
2220} 2613}
2221 2614
2222sub _draw { 2615sub _draw {
2223 my ($self) = @_; 2616 my ($self) = @_;
2224 2617
2225 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227 glColor 1, 1, 1, 1; 2620 glColor 1, 1, 1, 1;
2228 $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});
2229 glDisable GL_TEXTURE_2D; 2622 glDisable GL_TEXTURE_2D;
2230 2623
2231 $self->{children}[1]->draw; 2624 $self->{children}[1]->draw;
2232 2625
2233} 2626}
… …
2282 2675
2283sub new { 2676sub new {
2284 my $class = shift; 2677 my $class = shift;
2285 2678
2286 my $self = $class->SUPER::new ( 2679 my $self = $class->SUPER::new (
2287 state => 0, 2680 state => 0,
2288 connect_activate => \&toggle_flopper, 2681 on_activate => \&toggle_flopper,
2289 @_ 2682 @_
2290 ); 2683 );
2291 2684
2292 if ($self->{state}) {
2293 $self->{state} = 0;
2294 $self->toggle_flopper;
2295 }
2296
2297 $self 2685 $self
2298} 2686}
2299 2687
2300sub toggle_flopper { 2688sub toggle_flopper {
2301 my ($self) = @_; 2689 my ($self) = @_;
2302 2690
2303 # TODO: use animation 2691 $self->{other}->toggle_visibility;
2304 if ($self->{state} = !$self->{state}) {
2305 $CFClient::UI::ROOT->add ($self->{other});
2306 $self->{other}->move ($self->coord2global (0, $self->{h}));
2307 $self->emit ("open");
2308 } else {
2309 $CFClient::UI::ROOT->remove ($self->{other});
2310 $self->emit ("close");
2311 }
2312
2313 $self->emit (changed => $self->{state});
2314} 2692}
2315 2693
2316############################################################################# 2694#############################################################################
2317 2695
2318package CFClient::UI::Tooltip; 2696package CFClient::UI::Tooltip;
… …
2331} 2709}
2332 2710
2333sub set_tooltip_from { 2711sub set_tooltip_from {
2334 my ($self, $widget) = @_; 2712 my ($self, $widget) = @_;
2335 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
2336 $self->add (new CFClient::UI::Label 2723 $self->add (new CFClient::UI::Label
2337 markup => $widget->{tooltip}, 2724 markup => $tooltip,
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8, 2726 fontsize => 0.8,
2340 fg => [0, 0, 0, 1], 2727 fg => [0, 0, 0, 1],
2728 ellipsise => 0,
2341 font => ($widget->{tooltip_font} || $::FONT_PROP), 2729 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 ); 2730 );
2343} 2731}
2344 2732
2345sub size_request { 2733sub size_request {
2346 my ($self) = @_; 2734 my ($self) = @_;
… …
2352 2740
2353sub size_allocate { 2741sub size_allocate {
2354 my ($self, $w, $h) = @_; 2742 my ($self, $w, $h) = @_;
2355 2743
2356 $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 });
2357} 2763}
2358 2764
2359sub _draw { 2765sub _draw {
2360 my ($self) = @_; 2766 my ($self) = @_;
2361 2767
… …
2378 glVertex $w, $h; 2784 glVertex $w, $h;
2379 glVertex $w, 0; 2785 glVertex $w, 0;
2380 glEnd; 2786 glEnd;
2381 2787
2382 glTranslate 2 - 0.375, 2 - 0.375; 2788 glTranslate 2 - 0.375, 2 - 0.375;
2789
2383 $self->SUPER::_draw; 2790 $self->SUPER::_draw;
2384} 2791}
2385 2792
2386############################################################################# 2793#############################################################################
2387 2794
… …
2392use CFClient::OpenGL; 2799use CFClient::OpenGL;
2393 2800
2394sub new { 2801sub new {
2395 my $class = shift; 2802 my $class = shift;
2396 2803
2397 $class->SUPER::new ( 2804 my $self = $class->SUPER::new (
2398 aspect => 1, 2805 aspect => 1,
2806 can_events => 0,
2399 @_, 2807 @_,
2400 ) 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
2401} 2825}
2402 2826
2403sub size_request { 2827sub size_request {
2404 (32, 8) 2828 (32, 8)
2405} 2829}
2406 2830
2831sub update {
2832 my ($self) = @_;
2833
2834 return unless $self->{visible};
2835
2836 $self->SUPER::update;
2837}
2838
2407sub _draw { 2839sub _draw {
2408 my ($self) = @_; 2840 my ($self) = @_;
2409 2841
2410 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
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2412 2854
2413 # TODO animation
2414 if ($tex) { 2855 if ($tex) {
2415 glEnable GL_TEXTURE_2D; 2856 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1; 2858 glColor 1, 1, 1, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D; 2860 glDisable GL_TEXTURE_2D;
2420 } 2861 }
2421} 2862}
2422 2863
2864sub DESTROY {
2865 my ($self) = @_;
2866
2867 $self->{timer}->cancel
2868 if $self->{timer};
2869
2870 $self->SUPER::DESTROY;
2871}
2872
2423############################################################################# 2873#############################################################################
2424 2874
2425package CFClient::UI::InventoryItem; 2875package CFClient::UI::Buttonbar;
2426 2876
2427our @ISA = CFClient::UI::HBox::; 2877our @ISA = CFClient::UI::HBox::;
2428 2878
2429sub new { 2879# TODO: should actualyl wrap buttons and other goodies.
2430 my $class = shift;
2431
2432 my %args = @_;
2433
2434 my $item = delete $args{item};
2435
2436 my $desc = $item->{nrof} < 2
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440
2441 my $self = $class->SUPER::new (
2442 can_hover => 1,
2443 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 # todo: maybe put examine on 1? but should just be a tooltip :(
2450 if ($ev->{button} == 1) {
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2452 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new (
2456 items => [
2457 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465 ],
2466 )->popup ($ev);
2467 }
2468
2469 1
2470 },
2471 %args
2472 );
2473
2474 $self->add (new CFClient::UI::Face
2475 can_events => 0,
2476 face => $item->{face},
2477 anim => $item->{anim},
2478 animspeed => $item->{animspeed},
2479 );
2480
2481 $self->add (new CFClient::UI::Label
2482 can_events => 0,
2483 text => $desc,
2484 );
2485
2486 $self
2487}
2488
2489#############################################################################
2490
2491package CFClient::UI::Inventory;
2492
2493our @ISA = CFClient::UI::ScrolledWindow::;
2494
2495sub new {
2496 my $class = shift;
2497
2498 my $self = $class->SUPER::new (
2499 scrolled => (new CFClient::UI::VBox),
2500 @_,
2501 );
2502
2503 $self
2504}
2505
2506sub set_items {
2507 my ($self, $items) = @_;
2508
2509 $self->{scrolled}->clear;
2510 return unless $items;
2511
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2513
2514 $self->{real_items} = \@items;
2515
2516 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2522 }
2523
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2525}
2526
2527sub size_request {
2528 my ($self) = @_;
2529 ($self->{req_w}, $self->{req_h});
2530}
2531 2880
2532############################################################################# 2881#############################################################################
2533 2882
2534package CFClient::UI::Menu; 2883package CFClient::UI::Menu;
2535 2884
… …
2569 2918
2570# 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)
2571sub popup { 2920sub popup {
2572 my ($self, $ev) = @_; 2921 my ($self, $ev) = @_;
2573 2922
2574 $self->emit ("popdown"); 2923 $self->_emit ("popdown");
2575 2924
2576 # maybe save $GRAB? must be careful about events... 2925 # maybe save $GRAB? must be careful about events...
2577 $GRAB = $self; 2926 $GRAB = $self;
2578 $self->{button} = $ev->{button}; 2927 $self->{button} = $ev->{button};
2579 2928
2580 $self->show; 2929 $self->show;
2581 $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);
2582} 2931}
2583 2932
2584sub mouse_motion { 2933sub mouse_motion {
2585 my ($self, $ev, $x, $y) = @_; 2934 my ($self, $ev, $x, $y) = @_;
2586 2935
2587 # TODO: should use vbox->find_widget or so 2936 # TODO: should use vbox->find_widget or so
2588 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2589 $self->{hover} = $self->{item}{$HOVER}; 2938 $self->{hover} = $self->{item}{$HOVER};
2939
2940 0
2590} 2941}
2591 2942
2592sub button_up { 2943sub button_up {
2593 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2594 2945
2595 if ($ev->{button} == $self->{button}) { 2946 if ($ev->{button} == $self->{button}) {
2596 undef $GRAB; 2947 undef $GRAB;
2597 $self->hide; 2948 $self->hide;
2598 2949
2599 $self->emit ("popdown"); 2950 $self->_emit ("popdown");
2600 $self->{hover}[1]->() if $self->{hover}; 2951 $self->{hover}[1]->() if $self->{hover};
2952 } else {
2953 return 0
2954 }
2955
2601 } 2956 1
2602} 2957}
2603 2958
2604############################################################################# 2959#############################################################################
2605 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
2606package CFClient::UI::Statusbox; 3069package CFClient::UI::Statusbox;
2607 3070
2608our @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}
2609 3081
2610sub reorder { 3082sub reorder {
2611 my ($self) = @_; 3083 my ($self) = @_;
2612 my $NOW = time; 3084 my $NOW = time;
2613 3085
… …
2632 ? "<b>$item->{count} ×</b> $item->{text}" 3104 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text}; 3105 : $item->{text};
2634 3106
2635 for ($short) { 3107 for ($short) {
2636 s/^\s+//; 3108 s/^\s+//;
2637 s/\012.*/…/s; 3109 s/\s+/ /g;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 } 3110 }
2641 3111
2642 new CFClient::UI::Label 3112 new CFClient::UI::Label
2643 markup => $short, 3113 markup => $short,
2644 tooltip => $item->{tooltip}, 3114 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP, 3115 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67, 3116 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize}, 3117 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44,
2648 color => $item->{color}, 3119 fg => $item->{fg},
2649 can_events => 1, 3120 can_events => 1,
2650 can_hover => 1 3121 can_hover => 1
2651 }; 3122 };
2652 } 3123 }
2653 3124
… …
2658sub add { 3129sub add {
2659 my ($self, $text, %arg) = @_; 3130 my ($self, $text, %arg) = @_;
2660 3131
2661 $text =~ s/^\s+//; 3132 $text =~ s/^\s+//;
2662 $text =~ s/\s+$//; 3133 $text =~ s/\s+$//;
3134
3135 return unless $text;
2663 3136
2664 my $timeout = time + ((delete $arg{timeout}) || 60); 3137 my $timeout = time + ((delete $arg{timeout}) || 60);
2665 3138
2666 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667 3140
… …
2679 $self->{item}{$group} = { 3152 $self->{item}{$group} = {
2680 id => ++$self->{id}, 3153 id => ++$self->{id},
2681 text => $text, 3154 text => $text,
2682 timeout => $timeout, 3155 timeout => $timeout,
2683 tooltip => $text, 3156 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8], 3157 fg => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0, 3158 pri => 0,
2687 count => 1, 3159 count => 1,
2688 %arg, 3160 %arg,
2689 }; 3161 };
2690 } 3162 }
2691 3163
2692 $self->reorder; 3164 $self->reorder;
2693} 3165}
2694 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
2695############################################################################# 3177#############################################################################
2696 3178
2697package CFClient::UI::Root; 3179package CFClient::UI::Inventory;
2698 3180
2699our @ISA = CFClient::UI::Container::; 3181our @ISA = CFClient::UI::ScrolledWindow::;
2700
2701use CFClient::OpenGL;
2702 3182
2703sub new { 3183sub new {
2704 my $class = shift; 3184 my $class = shift;
2705 3185
2706 $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 => [],
2707 @_, 3428 @_,
2708 ) 3429 )
2709} 3430}
2710 3431
2711sub configure { 3432# XXX: Do sorting? Argl...
2712 my ($self, $x, $y, $w, $h) = @_; 3433sub add_spell {
2713
2714 $self->{w} = $w;
2715 $self->{h} = $h;
2716}
2717
2718sub check_size {
2719 my ($self) = @_; 3434 my ($self, $spell) = @_;
3435 $self->{spells}->{$spell->{name}} = $spell;
2720 3436
2721 $self->size_allocate ($self->{w}, $self->{h}) 3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2722 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
2723} 3491}
2724 3492
2725sub size_request { 3493sub size_request {
2726 my ($self) = @_; 3494 my ($self) = @_;
2727 3495
2728 ($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
2729} 3511}
2730 3512
2731sub size_allocate { 3513sub size_allocate {
2732 my ($self, $w, $h) = @_; 3514 my ($self, $w, $h) = @_;
2733 3515
2734 my $old_w = $self->{old_w};
2735 my $old_h = $self->{old_h};
2736
2737 if ($old_w && $old_h) {
2738 for my $child ($self->children) {
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749
2750 for my $child ($self->children) { 3516 for my $child ($self->children) {
2751 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)};
2752 3518
2753 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3519 $X = $child->{force_x} if exists $child->{force_x};
2754 $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
2755 $child->configure ($X, $Y, $W, $H); 3525 $child->configure ($X, $Y, $W, $H);
2756 } 3526 }
2757
2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760} 3527}
2761 3528
2762sub coord2local { 3529sub coord2local {
2763 my ($self, $x, $y) = @_; 3530 my ($self, $x, $y) = @_;
2764 3531
… …
2772} 3539}
2773 3540
2774sub update { 3541sub update {
2775 my ($self) = @_; 3542 my ($self) = @_;
2776 3543
2777 $self->check_size;
2778 $::WANT_REFRESH++; 3544 $::WANT_REFRESH++;
2779} 3545}
2780 3546
2781sub add { 3547sub add {
2782 my ($self, $child) = @_; 3548 my ($self, @children) = @_;
2783 3549
2784 # integerise window positions 3550 $_->{is_toplevel} = 1
2785 $child->{x} = int $child->{x}; 3551 for @children;
2786 $child->{y} = int $child->{y};
2787 3552
2788 $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 }
2789} 3569}
2790 3570
2791sub on_refresh { 3571sub on_refresh {
2792 my ($self, $id, $cb) = @_; 3572 my ($self, $id, $cb) = @_;
2793 3573
… …
2806 while ($self->{refresh_hook}) { 3586 while ($self->{refresh_hook}) {
2807 $_->() 3587 $_->()
2808 for values %{delete $self->{refresh_hook}}; 3588 for values %{delete $self->{refresh_hook}};
2809 } 3589 }
2810 3590
2811 if ($self->{check_size}) { 3591 if ($self->{realloc}) {
2812 my @queue = ([], []); 3592 my %queue;
3593 my @queue;
3594 my $widget;
2813 3595
2814 for (;;) { 3596 outer:
2815 if ($self->{check_size}) { 3597 while () {
2816 # heuristic: check containers last 3598 if (my $realloc = delete $self->{realloc}) {
2817 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3599 for $widget (values %$realloc) {
2818 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 }
2819 } 3606 }
2820 3607
2821 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3608 while () {
3609 @queue or last outer;
2822 3610
2823 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3611 $widget = pop @{ $queue[-1] || [] }
2824 ? @$widget{qw(user_w user_h)} 3612 and last;
2825 : $widget->size_request;
2826
2827 if (delete $widget->{force_alloc}
2828 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2829 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2830 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}) {
2831 $widget->{req_w} = $w; 3629 $widget->{req_w} = $w;
2832 $widget->{req_h} = $h; 3630 $widget->{req_h} = $h;
2833 3631
2834 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3632 $self->{size_alloc}{$widget+0} = $widget;
2835 3633
2836 $widget->{parent}->check_size
2837 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 }
2838 } 3641 }
3642
3643 delete $self->{realloc}{$widget+0};
2839 } 3644 }
2840 } 3645 }
2841 3646
2842 while ($self->{size_alloc}) { 3647 while (my $size_alloc = delete $self->{size_alloc}) {
2843 for (values %{delete $self->{size_alloc}}) { 3648 my @queue = sort { $b->{visible} <=> $a->{visible} }
2844 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)};
2845 3655
2846 $w = 0 if $w < 0; 3656 $w = 0 if $w < 0;
2847 $h = 0 if $h < 0; 3657 $h = 0 if $h < 0;
2848 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
2849 $widget->{w} = $w; 3666 $widget->{w} = $w;
2850 $widget->{h} = $h; 3667 $widget->{h} = $h;
2851 $widget->size_allocate ($w, $h); 3668
2852 $widget->emit (size_allocate => $w, $h); 3669 $widget->emit (size_allocate => $w, $h);
3670 }
2853 } 3671 }
2854 } 3672 }
2855 3673
2856 while ($self->{post_alloc_hook}) { 3674 while ($self->{post_alloc_hook}) {
2857 $_->() 3675 $_->()
2858 for values %{delete $self->{post_alloc_hook}}; 3676 for values %{delete $self->{post_alloc_hook}};
2859 } 3677 }
2860 3678
3679
2861 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3680 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3681 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2863 glClear GL_COLOR_BUFFER_BIT; 3682 glClear GL_COLOR_BUFFER_BIT;
2864 3683
2865 glMatrixMode GL_PROJECTION; 3684 glMatrixMode GL_PROJECTION;
2866 glLoadIdentity; 3685 glLoadIdentity;
2867 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2868 glMatrixMode GL_MODELVIEW; 3687 glMatrixMode GL_MODELVIEW;
2869 glLoadIdentity; 3688 glLoadIdentity;
2870 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
2871 $self->_draw; 3697 $self->_draw;
2872} 3698}
2873 3699
2874############################################################################# 3700#############################################################################
2875 3701
2876package CFClient::UI; 3702package CFClient::UI;
2877 3703
2878$ROOT = new CFClient::UI::Root; 3704$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip; 3705$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2880 3706
28811 37071
2882 3708

Diff Legend

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