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.277 by root, Sun Jun 4 00:21:52 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
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
879 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
880 $self->check_size; 1166 $self->realloc;
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; 1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
894 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
895 } 1186 1
896} 1187}
897 1188
898sub button_up { 1189sub button_up {
899 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
900 1191
901 delete $self->{motion}; 1192 !!delete $self->{motion}
902} 1193}
903 1194
904sub mouse_motion { 1195sub mouse_motion {
905 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
906 1197
907 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
908} 1201}
909 1202
910sub _draw { 1203sub _draw {
911 my ($self) = @_; 1204 my ($self) = @_;
912 1205
1206 my $child = $self->{children}[0];
1207
913 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
914 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
915 1210
916 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
918 1213
919 my $border = $self->border; 1214 my $border = $self->border;
920 1215
921 glColor @{ $self->{border_bg} }; 1216 glColor @{ $self->{border_bg} };
922 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1217 $border[0]->draw_quad_alpha (0, 0, $w, $border);
923 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
924 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
925 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1220 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
926 1221
927 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
928 my $bg = $tex[0]; 1223 glColor @{ $self->{bg} };
929 1224
930 # TODO: repeat texture not scale 1225 # TODO: repeat texture not scale
1226 # solve this better(?)
931 my $rep_x = $cw / $bg->{w}; 1227 $bg->{s} = $cw / $bg->{w};
932 my $rep_y = $ch / $bg->{h}; 1228 $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); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
940 } 1230 }
941 1231
942 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
943 1233
944 $self->{title}->draw if $self->{title};
945
946 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
947} 1240}
948 1241
949############################################################################# 1242#############################################################################
950 1243
951package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
959sub new { 1252sub new {
960 my $class = shift; 1253 my $class = shift;
961 1254
962 $class->SUPER::new ( 1255 $class->SUPER::new (
963 col_expand => [], 1256 col_expand => [],
964 @_ 1257 @_,
965 ) 1258 )
1259}
1260
1261sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} }
966} 1263}
967 1264
968sub add { 1265sub add {
969 my ($self, $x, $y, $child) = @_; 1266 my ($self, $x, $y, $child) = @_;
970 1267
971 $child->set_parent ($self); 1268 $child->set_parent ($self);
972 $self->{children}[$y][$x] = $child; 1269 $self->{children}[$y][$x] = $child;
973 1270
974 $child->check_size; 1271 $self->realloc;
975} 1272}
976 1273
977sub children {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} }
979}
980
981# TODO: move to container class maybe? send childs a signal on removal? 1274# TODO: move to container class maybe? send children a signal on removal?
982sub clear { 1275sub clear {
983 my ($self) = @_; 1276 my ($self) = @_;
984 1277
985 my @children = $self->children; 1278 my @children = $self->children;
986 delete $self->{children}; 1279 delete $self->{children};
… …
988 for (@children) { 1281 for (@children) {
989 delete $_->{parent}; 1282 delete $_->{parent};
990 $_->hide; 1283 $_->hide;
991 } 1284 }
992 1285
993 $self->update; 1286 $self->realloc;
994} 1287}
995 1288
996sub get_wh { 1289sub get_wh {
997 my ($self) = @_; 1290 my ($self) = @_;
998 1291
… …
1029sub size_allocate { 1322sub size_allocate {
1030 my ($self, $w, $h) = @_; 1323 my ($self, $w, $h) = @_;
1031 1324
1032 my ($ws, $hs) = $self->get_wh; 1325 my ($ws, $hs) = $self->get_wh;
1033 1326
1034 my $req_w = sum @$ws; 1327 my $req_w = (sum @$ws) || 1;
1035 my $req_h = sum @$hs; 1328 my $req_h = (sum @$hs) || 1;
1036 1329
1037 # TODO: nicer code && do row_expand 1330 # TODO: nicer code && do row_expand
1038 my @col_expand = @{$self->{col_expand}}; 1331 my @col_expand = @{$self->{col_expand}};
1039 @col_expand = (1) x @$ws unless @col_expand; 1332 @col_expand = (1) x @$ws unless @col_expand;
1040 my $col_expand = (sum @col_expand) || 1; 1333 my $col_expand = (sum @col_expand) || 1;
… …
1094 } 1387 }
1095} 1388}
1096 1389
1097############################################################################# 1390#############################################################################
1098 1391
1099package CFClient::UI::HBox; 1392package CFClient::UI::Box;
1100
1101# TODO: wrap into common Box base class
1102 1393
1103our @ISA = CFClient::UI::Container::; 1394our @ISA = CFClient::UI::Container::;
1104 1395
1105sub size_request { 1396sub size_request {
1106 my ($self) = @_; 1397 my ($self) = @_;
1107 1398
1108 my @alloc = map [$_->size_request], @{$self->{children}}; 1399 $self->{vertical}
1109 1400 ? (
1110 ( 1401 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1111 (List::Util::sum map $_->[0], @alloc), 1402 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1112 (List::Util::max map $_->[1], @alloc), 1403 )
1113 ) 1404 : (
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 )
1114} 1408}
1115 1409
1116sub size_allocate { 1410sub size_allocate {
1117 my ($self, $w, $h) = @_; 1411 my ($self, $w, $h) = @_;
1118 1412
1119 ($h, $w) = ($w, $h); 1413 my $space = $self->{vertical} ? $h : $w;
1120
1121 my $children = $self->{children}; 1414 my $children = $self->{children};
1122 1415
1123 my @h = map $_->{req_w}, @$children; 1416 my @req;
1124 1417
1125 my $req_h = List::Util::sum @h; 1418 if ($self->{homogeneous}) {
1126 1419 @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 { 1420 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1422 my $req = List::Util::sum @req;
1423
1424 if ($req > $space) {
1425 # ah well, not enough space
1426 $_ *= $space / $req for @req;
1427 } else {
1131 my $exp = List::Util::sum map $_->{expand}, @$children; 1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1132 $exp ||= 1;
1133 1429
1430 $space = ($space - $req) / $expand; # remaining space to give away
1431
1432 $req[$_] += $space * $children->[$_]{expand}
1134 for (0 .. $#$children) { 1433 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 } 1434 }
1141 } 1435 }
1142 1436
1143 CFClient::UI::harmonize \@h; 1437 CFClient::UI::harmonize \@req;
1144 1438
1145 my $y = 0; 1439 my $pos = 0;
1146 for (0 .. $#$children) { 1440 for (0 .. $#$children) {
1147 my $child = $children->[$_];
1148 my $h = $h[$_]; 1441 my $alloc = $req[$_];
1149 $child->configure ($y, 0, $h, $w); 1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1150 1443
1151 $y += $h; 1444 $pos += $alloc;
1152 } 1445 }
1153 1446
1154 1 1447 1
1155} 1448}
1156 1449
1157############################################################################# 1450#############################################################################
1158 1451
1452package CFClient::UI::HBox;
1453
1454our @ISA = CFClient::UI::Box::;
1455
1456sub new {
1457 my $class = shift;
1458
1459 $class->SUPER::new (
1460 vertical => 0,
1461 @_,
1462 )
1463}
1464
1465#############################################################################
1466
1159package CFClient::UI::VBox; 1467package CFClient::UI::VBox;
1160 1468
1161# TODO: wrap into common Box base class
1162
1163our @ISA = CFClient::UI::Container::; 1469our @ISA = CFClient::UI::Box::;
1164 1470
1165sub size_request { 1471sub new {
1166 my ($self) = @_; 1472 my $class = shift;
1167 1473
1168 my @alloc = map [$_->size_request], @{$self->{children}}; 1474 $class->SUPER::new (
1169 1475 vertical => 1,
1170 ( 1476 @_,
1171 (List::Util::max map $_->[0], @alloc),
1172 (List::Util::sum map $_->[1], @alloc),
1173 ) 1477 )
1174} 1478}
1175 1479
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############################################################################# 1480#############################################################################
1216 1481
1217package CFClient::UI::Label; 1482package CFClient::UI::Label;
1218 1483
1219our @ISA = CFClient::UI::Base::; 1484our @ISA = CFClient::UI::DrawBG::;
1220 1485
1221use CFClient::OpenGL; 1486use CFClient::OpenGL;
1222 1487
1223sub new { 1488sub new {
1224 my ($class, %arg) = @_; 1489 my ($class, %arg) = @_;
1225 1490
1226 my $self = $class->SUPER::new ( 1491 my $self = $class->SUPER::new (
1227 fg => [1, 1, 1], 1492 fg => [1, 1, 1],
1493 #bg => none
1494 #active_bg => none
1228 #font => default_font 1495 #font => default_font
1229 #text => initial text 1496 #text => initial text
1230 #markup => initial narkup 1497 #markup => initial narkup
1498 #max_w => maximum pixel width
1499 ellipsise => 3, # end
1231 layout => (new CFClient::Layout), 1500 layout => (new CFClient::Layout),
1232 fontsize => 1, 1501 fontsize => 1,
1233 align => -1, 1502 align => -1,
1234 valign => -1, 1503 valign => -1,
1235 padding => 2, 1504 padding_x => 2,
1505 padding_y => 2,
1236 can_events => 0, 1506 can_events => 0,
1237 %arg 1507 %arg
1238 ); 1508 );
1239 1509
1240 if (exists $self->{template}) { 1510 if (exists $self->{template}) {
… …
1250 } 1520 }
1251 1521
1252 $self 1522 $self
1253} 1523}
1254 1524
1255sub escape { 1525sub escape($) {
1256 local $_ = $_[1]; 1526 local $_ = $_[0];
1257 1527
1258 s/&/&amp;/g; 1528 s/&/&amp;/g;
1259 s/>/&gt;/g; 1529 s/>/&gt;/g;
1260 s/</&lt;/g; 1530 s/</&lt;/g;
1261 1531
1262 $_[1] 1532 $_
1263} 1533}
1264 1534
1265sub update { 1535sub update {
1266 my ($self) = @_; 1536 my ($self) = @_;
1267 1537
… …
1276 $self->{text} = "T$text"; 1546 $self->{text} = "T$text";
1277 1547
1278 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1279 $self->{layout}->set_text ($text); 1549 $self->{layout}->set_text ($text);
1280 1550
1551 $self->realloc;
1281 $self->update; 1552 $self->update;
1282 $self->check_size;
1283} 1553}
1284 1554
1285sub set_markup { 1555sub set_markup {
1286 my ($self, $markup) = @_; 1556 my ($self, $markup) = @_;
1287 1557
… …
1291 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1561 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1292 1562
1293 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1294 $self->{layout}->set_markup ($markup); 1564 $self->{layout}->set_markup ($markup);
1295 1565
1566 $self->realloc;
1296 $self->update; 1567 $self->update;
1297 $self->check_size;
1298} 1568}
1299 1569
1300sub size_request { 1570sub size_request {
1301 my ($self) = @_; 1571 my ($self) = @_;
1302 1572
1303 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1573 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $self->{layout}->set_width ($self->{max_w} || -1); 1574 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306 1578
1307 my ($w, $h) = $self->{layout}->size; 1579 my ($w, $h) = $self->{layout}->size;
1308 1580
1309 if (exists $self->{template}) { 1581 if (exists $self->{template}) {
… …
1314 1586
1315 $w = List::Util::max $w, $w2; 1587 $w = List::Util::max $w, $w2;
1316 $h = List::Util::max $h, $h2; 1588 $h = List::Util::max $h, $h2;
1317 } 1589 }
1318 1590
1319 ( 1591 ($w, $h)
1320 $w + $self->{padding} * 2,
1321 $h + $self->{padding} * 2,
1322 )
1323} 1592}
1324 1593
1325sub size_allocate { 1594sub size_allocate {
1326 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1327 1596
1597 delete $self->{ox};
1598
1328 delete $self->{texture}; 1599 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1329} 1601}
1330 1602
1331sub set_fontsize { 1603sub set_fontsize {
1332 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1333 1605
1334 $self->{fontsize} = $fontsize; 1606 $self->{fontsize} = $fontsize;
1335 delete $self->{texture}; 1607 delete $self->{texture};
1336 1608
1337 $self->update; 1609 $self->realloc;
1338 $self->check_size;
1339} 1610}
1340 1611
1341sub _draw { 1612sub _draw {
1342 my ($self) = @_; 1613 my ($self) = @_;
1614
1615 $self->SUPER::_draw; # draw background, if applicable
1343 1616
1344 my $tex = $self->{texture} ||= do { 1617 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}}); 1618 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1619 $self->{layout}->set_font ($self->{font}) if $self->{font};
1347 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1624
1350 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1351 1627
1628 unless (exists $self->{ox}) {
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1354 : ($self->{w} - $tex->{w}) * 0.5; 1631 : ($self->{w} - $tex->{w}) * 0.5);
1355 1632
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1358 : ($self->{h} - $tex->{h}) * 0.5; 1635 : ($self->{h} - $tex->{h}) * 0.5);
1359
1360 $tex
1361 }; 1636 };
1362 1637
1363 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1365 1640
… …
1391 active_fg => [0, 0, 0], 1666 active_fg => [0, 0, 0],
1392 can_hover => 1, 1667 can_hover => 1,
1393 can_focus => 1, 1668 can_focus => 1,
1394 valign => 0, 1669 valign => 0,
1395 can_events => 1, 1670 can_events => 1,
1671 #text => ...
1396 @_ 1672 @_
1397 ) 1673 )
1398} 1674}
1399 1675
1400sub _set_text { 1676sub _set_text {
… …
1402 1678
1403 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1404 1680
1405 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1406 1682
1407 delete $self->{texture};
1408
1409 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1410 $self->{text} = $text; 1684 $self->{text} = $text;
1411 1685
1412 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1413 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1414 1688
1415 $self->emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1416} 1691}
1417 1692
1418sub set_text { 1693sub set_text {
1419 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1420 1695
1421 $self->{cursor} = length $text; 1696 $self->{cursor} = length $text;
1422 $self->_set_text ($text); 1697 $self->_set_text ($text);
1423 $self->check_size; 1698
1424 $self->update; 1699 $self->realloc;
1425} 1700}
1426 1701
1427sub get_text { 1702sub get_text {
1428 $_[0]{text} 1703 $_[0]{text}
1429} 1704}
… …
1432 my ($self) = @_; 1707 my ($self) = @_;
1433 1708
1434 my ($w, $h) = $self->SUPER::size_request; 1709 my ($w, $h) = $self->SUPER::size_request;
1435 1710
1436 ($w + 1, $h) # add 1 for cursor 1711 ($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} 1712}
1444 1713
1445sub key_down { 1714sub key_down {
1446 my ($self, $ev) = @_; 1715 my ($self, $ev) = @_;
1447 1716
… …
1449 my $sym = $ev->{sym}; 1718 my $sym = $ev->{sym};
1450 my $uni = $ev->{unicode}; 1719 my $uni = $ev->{unicode};
1451 1720
1452 my $text = $self->get_text; 1721 my $text = $self->get_text;
1453 1722
1454 if ($sym == 8) { 1723 if ($uni == 8) {
1455 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1724 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456 } elsif ($sym == 127) { 1725 } elsif ($uni == 127) {
1457 substr $text, $self->{cursor}, 1, ""; 1726 substr $text, $self->{cursor}, 1, "";
1458 } elsif ($sym == CFClient::SDLK_LEFT) { 1727 } elsif ($sym == CFClient::SDLK_LEFT) {
1459 --$self->{cursor} if $self->{cursor}; 1728 --$self->{cursor} if $self->{cursor};
1460 } elsif ($sym == CFClient::SDLK_RIGHT) { 1729 } elsif ($sym == CFClient::SDLK_RIGHT) {
1461 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1730 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1462 } elsif ($sym == CFClient::SDLK_HOME) { 1731 } elsif ($sym == CFClient::SDLK_HOME) {
1463 $self->{cursor} = 0; 1732 $self->{cursor} = 0;
1464 } elsif ($sym == CFClient::SDLK_END) { 1733 } elsif ($sym == CFClient::SDLK_END) {
1465 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1466 } elsif ($sym == 27) { 1735 } elsif ($uni == 27) {
1467 $self->emit ('escape'); 1736 $self->_emit ('escape');
1468 } elsif ($uni) { 1737 } elsif ($uni) {
1469 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1470 } 1741 }
1471 1742
1472 $self->_set_text ($text); 1743 $self->_set_text ($text);
1473 $self->update; 1744
1745 $self->realloc;
1746
1747 1
1474} 1748}
1475 1749
1476sub focus_in { 1750sub focus_in {
1477 my ($self) = @_; 1751 my ($self) = @_;
1478 1752
… …
1493 utf8::encode $text; 1767 utf8::encode $text;
1494 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1495 1769
1496 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1497 $self->update; 1771 $self->update;
1772
1773 1
1498} 1774}
1499 1775
1500sub mouse_motion { 1776sub mouse_motion {
1501 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1502# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779
1780 0
1503} 1781}
1504 1782
1505sub _draw { 1783sub _draw {
1506 my ($self) = @_; 1784 my ($self) = @_;
1507 1785
… …
1558 if ($sym == 13) { 1836 if ($sym == 13) {
1559 unshift @{$self->{history}}, 1837 unshift @{$self->{history}},
1560 my $txt = $self->get_text; 1838 my $txt = $self->get_text;
1561 $self->{history_pointer} = -1; 1839 $self->{history_pointer} = -1;
1562 $self->{history_saveback} = ''; 1840 $self->{history_saveback} = '';
1563 $self->emit (activate => $txt); 1841 $self->_emit (activate => $txt);
1564 $self->update; 1842 $self->update;
1565 1843
1566 } elsif ($sym == CFClient::SDLK_UP) { 1844 } elsif ($sym == CFClient::SDLK_UP) {
1567 if ($self->{history_pointer} < 0) { 1845 if ($self->{history_pointer} < 0) {
1568 $self->{history_saveback} = $self->get_text; 1846 $self->{history_saveback} = $self->get_text;
… …
1584 } else { 1862 } else {
1585 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1586 } 1864 }
1587 1865
1588 } else { 1866 } else {
1589 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1590 } 1870 1
1591
1592} 1871}
1593 1872
1594############################################################################# 1873#############################################################################
1595 1874
1596package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1605 1884
1606sub new { 1885sub new {
1607 my $class = shift; 1886 my $class = shift;
1608 1887
1609 $class->SUPER::new ( 1888 $class->SUPER::new (
1610 padding => 4, 1889 padding_x => 4,
1890 padding_y => 4,
1611 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1612 bg => [1, 1, 1, 0.2],
1613 active_fg => [0, 0, 1], 1892 active_fg => [0, 0, 1],
1614 can_hover => 1, 1893 can_hover => 1,
1615 align => 0, 1894 align => 0,
1616 valign => 0, 1895 valign => 0,
1617 can_events => 1, 1896 can_events => 1,
1618 @_ 1897 @_
1619 ) 1898 )
1620} 1899}
1621 1900
1901sub activate { }
1902
1622sub button_up { 1903sub button_up {
1623 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1624 1905
1906 $self->emit ("activate")
1625 if ($x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1626 && $y >= 0 && $y < $self->{h}) { 1908 && $y >= 0 && $y < $self->{h};
1627 $self->emit ("activate"); 1909
1628 } 1910 1
1629} 1911}
1630 1912
1631sub _draw { 1913sub _draw {
1632 my ($self) = @_; 1914 my ($self) = @_;
1633 1915
… …
1662 1944
1663sub new { 1945sub new {
1664 my $class = shift; 1946 my $class = shift;
1665 1947
1666 $class->SUPER::new ( 1948 $class->SUPER::new (
1667 padding => 2, 1949 padding_x => 2,
1950 padding_y => 2,
1668 fg => [1, 1, 1], 1951 fg => [1, 1, 1],
1669 active_fg => [1, 1, 0], 1952 active_fg => [1, 1, 0],
1953 bg => [0, 0, 0, 0.2],
1954 active_bg => [1, 1, 1, 0.5],
1670 state => 0, 1955 state => 0,
1671 can_hover => 1, 1956 can_hover => 1,
1672 @_ 1957 @_
1673 ) 1958 )
1674} 1959}
1675 1960
1676sub size_request { 1961sub size_request {
1677 my ($self) = @_; 1962 my ($self) = @_;
1678 1963
1679 ($self->{padding} * 2 + 6) x 2 1964 (6) x 2
1680} 1965}
1681 1966
1682sub button_down { 1967sub button_down {
1683 my ($self, $ev, $x, $y) = @_; 1968 my ($self, $ev, $x, $y) = @_;
1684 1969
1685 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1686 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1687 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1688 $self->emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1689 } 1978 1
1690} 1979}
1691 1980
1692sub _draw { 1981sub _draw {
1693 my ($self) = @_; 1982 my ($self) = @_;
1694 1983
1695 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1696 1985
1697 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1986 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1698 1987
1699 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1988 my ($w, $h) = @$self{qw(w h)};
1989
1990 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1700 1991
1701 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1992 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1702 1993
1703 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1994 my $tex = $self->{state} ? $tex[1] : $tex[0];
1704 1995
… …
1958 qw(s1_slider.png s1_slider_bg.png); 2249 qw(s1_slider.png s1_slider_bg.png);
1959 2250
1960sub new { 2251sub new {
1961 my $class = shift; 2252 my $class = shift;
1962 2253
1963 # range [value, low, high, page] 2254 # range [value, low, high, page, unit]
1964 2255
1965 # TODO: 0-width page 2256 # TODO: 0-width page
1966 # TODO: req_w/h are wrong with vertical 2257 # TODO: req_w/h are wrong with vertical
1967 # TODO: calculations are off 2258 # TODO: calculations are off
1968 my $self = $class->SUPER::new ( 2259 my $self = $class->SUPER::new (
1969 fg => [1, 1, 1], 2260 fg => [1, 1, 1],
1970 active_fg => [0, 0, 0], 2261 active_fg => [0, 0, 0],
2262 bg => [0, 0, 0, 0.2],
2263 active_bg => [1, 1, 1, 0.5],
1971 range => [0, 0, 100, 10], 2264 range => [0, 0, 100, 10, 0],
1972 req_w => $::WIDTH / 80, 2265 min_w => $::WIDTH / 80,
1973 req_h => $::WIDTH / 80, 2266 min_h => $::WIDTH / 80,
1974 vertical => 0, 2267 vertical => 0,
1975 can_hover => 1, 2268 can_hover => 1,
1976 inner_pad => 5, 2269 inner_pad => 0.02,
1977 @_ 2270 @_
1978 ); 2271 );
1979 2272
2273 $self->set_value ($self->{range}[0]);
2274 $self->update;
2275
1980 $self 2276 $self
1981} 2277}
1982 2278
2279sub changed { }
2280
2281sub set_range {
2282 my ($self, $range) = @_;
2283
2284 ($range, $self->{range}) = ($self->{range}, $range);
2285
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}";
2288}
2289
2290sub set_value {
2291 my ($self, $value) = @_;
2292
2293 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2294
2295 $hi = $lo + 1 if $hi <= $lo;
2296
2297 $page = $hi - $lo if $page > $hi - $lo;
2298
2299 $value = $lo if $value < $lo;
2300 $value = $hi - $page if $value > $hi - $page;
2301
2302 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2303 if $unit;
2304
2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2306
2307 if ($value != $old_value) {
2308 $self->_emit (changed => $value);
2309 $self->update;
2310 }
2311}
2312
1983sub size_request { 2313sub size_request {
1984 my ($self) = @_; 2314 my ($self) = @_;
1985 2315
1986 my $w = $self->{req_w}; 2316 ($self->{req_w}, $self->{req_h})
1987 my $h = $self->{req_h};
1988
1989 $self->{vertical} ? ($h, $w) : ($w, $h)
1990} 2317}
1991 2318
1992sub button_down { 2319sub button_down {
1993 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
1994 2321
1995 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2323
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325
1996 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
1997} 2327}
1998 2328
1999sub mouse_motion { 2329sub mouse_motion {
2000 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2001 2331
2002 if ($GRAB == $self) { 2332 if ($GRAB == $self) {
2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2334
2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2336
2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2338
2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else {
2341 return 0;
2342 }
2343
2344 1
2345}
2346
2347sub update {
2348 my ($self) = @_;
2349
2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2358 $self->set_value ($self->{range}[0]);
2359
2003 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2361 my $range = ($hi - $page - $lo) || 1e-100;
2004 2362
2005 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2363 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2006 2364
2007 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2365 $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 2366 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2009 2367
2010 $x -= $inner_pad_px; # substract the padding 2368 $value = ($value - $lo) / $range;
2011 $x = $x * ($hi - $lo) / $inner_w + $lo; 2369 $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 2370
2016 $self->emit (changed => $x); 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2017 $self->update; 2372 $self->{knob_w} = $knob_w;
2018 } 2373 }
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 2374
2032 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2033 2376
2034 my ($w, $h) = @$self{qw(w h)}; 2377 glScale $self->{w}, $self->{h};
2035 2378
2036 if ($self->{vertical}) { 2379 if ($self->{vertical}) {
2037 # draw a vertical slider like a rotated horizontal slider 2380 # draw a vertical slider like a rotated horizontal slider
2038 2381
2382 glTranslate 1, 0, 0;
2039 glRotate 90, 0, 0, 1; 2383 glRotate 90, 0, 0, 1;
2040 glTranslate 0, -$self->{w}, 0;
2041
2042 ($w, $h) = ($h, $w);
2043 } 2384 }
2044 2385
2045 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2386 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2387 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047 2388
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; 2389 glEnable GL_TEXTURE_2D;
2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068 2391
2069 # draw background 2392 # draw background
2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2393 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071 2394
2072 # draw handle 2395 # draw handle
2073 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2396 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2074 2397
2075 glDisable GL_TEXTURE_2D; 2398 glDisable GL_TEXTURE_2D;
2076} 2399}
2400
2401#############################################################################
2402
2403package CFClient::UI::ValSlider;
2404
2405our @ISA = CFClient::UI::HBox::;
2406
2407sub new {
2408 my ($class, %arg) = @_;
2409
2410 my $range = delete $arg{range};
2411
2412 my $self = $class->SUPER::new (
2413 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2414 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2415 to_value => sub { shift },
2416 from_value => sub { shift },
2417 %arg,
2418 );
2419
2420 $self->{slider}->connect (changed => sub {
2421 my ($self, $value) = @_;
2422 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2423 $self->{parent}->emit (changed => $value);
2424 });
2425
2426# $self->{entry}->connect (changed => sub {
2427# my ($self, $value) = @_;
2428# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2429# $self->{parent}->emit (changed => $value);
2430# });
2431
2432 $self->add ($self->{slider}, $self->{entry});
2433
2434 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2435
2436 $self
2437}
2438
2439sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) }
2077 2441
2078############################################################################# 2442#############################################################################
2079 2443
2080package CFClient::UI::TextView; 2444package CFClient::UI::TextView;
2081 2445
… …
2111 2475
2112 $self->{fontsize} = $fontsize; 2476 $self->{fontsize} = $fontsize;
2113 $self->reflow; 2477 $self->reflow;
2114} 2478}
2115 2479
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 { 2480sub size_allocate {
2136 my ($self, $w, $h) = @_; 2481 my ($self, $w, $h) = @_;
2137 2482
2138 $self->SUPER::size_allocate ($w, $h); 2483 $self->SUPER::size_allocate ($w, $h);
2139 2484
… …
2142 $self->{layout}->set_width ($self->{children}[0]{w}); 2487 $self->{layout}->set_width ($self->{children}[0]{w});
2143 2488
2144 $self->reflow; 2489 $self->reflow;
2145} 2490}
2146 2491
2492sub text_size {
2493 my ($self, $text, $indent) = @_;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $layout->set_width ($self->{children}[0]{w} - $indent);
2499 $layout->set_markup ($text);
2500
2501 $layout->size
2502}
2503
2504sub reflow {
2505 my ($self) = @_;
2506
2507 $self->{need_reflow}++;
2508 $self->update;
2509}
2510
2511sub set_offset {
2512 my ($self, $offset) = @_;
2513
2514 # todo: base offset on lines or so, not on pixels
2515 $self->{children}[1]->set_value ($offset);
2516}
2517
2518sub clear {
2519 my ($self) = @_;
2520
2521 $self->{par} = [];
2522 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524}
2525
2147sub add_paragraph { 2526sub add_paragraph {
2148 my ($self, $color, $text) = @_; 2527 my ($self, $color, $text, $indent) = @_;
2149 2528
2150 #TODO: intelligently "reformat" paragraph 2529 for my $line (split /\n/, $text) {
2151 2530 my ($w, $h) = $self->text_size ($line);
2152 my $height = $self->text_height ($text);
2153
2154 $self->{height} += $height; 2531 $self->{height} += $h;
2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2533 }
2155 2534
2156 push @{$self->{par}}, [$height, $color, $text];
2157
2158 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2535 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2159 $self->{children}[1]->update;
2160} 2536}
2161 2537
2162sub update { 2538sub update {
2163 my ($self) = @_; 2539 my ($self) = @_;
2164 2540
… …
2167 return unless $self->{h} > 0; 2543 return unless $self->{h} > 0;
2168 2544
2169 delete $self->{texture}; 2545 delete $self->{texture};
2170 2546
2171 $ROOT->on_post_alloc ($self, sub { 2547 $ROOT->on_post_alloc ($self, sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549
2172 if (delete $self->{need_reflow}) { 2550 if (delete $self->{need_reflow}) {
2173 my $height = 0; 2551 my $height = 0;
2174 2552
2175 $height += $_->[0] = $self->text_height ($_->[2]) 2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2176 for @{$self->{par}}; 2557 for (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2559 $layout->set_width ($W - $_->[3]);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3];
2563 $_->[1] = $h;
2564 }
2565
2566 $height += $_->[1];
2567 }
2177 2568
2178 $self->{height} = $height; 2569 $self->{height} = $height;
2179 2570
2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2181 2572
2182 delete $self->{texture}; 2573 delete $self->{texture};
2183 } 2574 }
2184 2575
2185 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2186 glClearColor 0, 0, 0, 0; 2577 glClearColor 0.5, 0.5, 0.5, 0;
2187 glClear GL_COLOR_BUFFER_BIT; 2578 glClear GL_COLOR_BUFFER_BIT;
2188 2579
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]; 2580 my $top = int $self->{children}[1]{range}[0];
2193 2581
2194 my $y0 = $top; 2582 my $y0 = $top;
2195 my $y1 = $top + $self->{h}; 2583 my $y1 = $top + $H;
2196 2584
2197 my $y = 0; 2585 my $y = 0;
2198 2586
2199 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2200 2588
2201 $layout->set_font ($self->{font}) if $self->{font}; 2589 $layout->set_font ($self->{font}) if $self->{font};
2202 2590
2591 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off
2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2594
2203 for my $par (@{$self->{par}}) { 2595 for my $par (@{$self->{par}}) {
2204 my $h = $par->[0]; 2596 my $h = $par->[1];
2205 2597
2206 if ($y0 < $y + $h && $y < $y1) { 2598 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] }); 2599 $layout->set_foreground (@{ $par->[2] });
2600 $layout->set_width ($W - $par->[3]);
2208 $layout->set_markup ($par->[2]); 2601 $layout->set_markup ($par->[4]);
2209 2602
2210 my ($W, $H) = $layout->size; 2603 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2211 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2604
2605 glRasterPos $par->[3], $y - $y0;
2606 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2212 } 2607 }
2213 2608
2214 $y += $h; 2609 $y += $h;
2215 } 2610 }
2216 2611
2217 glDisable GL_TEXTURE_2D; 2612 glDisable GL_BLEND;
2218 }; 2613 };
2219 }); 2614 });
2220} 2615}
2221 2616
2222sub _draw { 2617sub _draw {
2223 my ($self) = @_; 2618 my ($self) = @_;
2224 2619
2225 glEnable GL_TEXTURE_2D; 2620 glEnable GL_TEXTURE_2D;
2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227 glColor 1, 1, 1, 1; 2622 glColor 1, 1, 1, 1;
2228 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2623 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2229 glDisable GL_TEXTURE_2D; 2624 glDisable GL_TEXTURE_2D;
2230 2625
2231 $self->{children}[1]->draw; 2626 $self->{children}[1]->draw;
2232 2627
2233} 2628}
… …
2282 2677
2283sub new { 2678sub new {
2284 my $class = shift; 2679 my $class = shift;
2285 2680
2286 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2287 state => 0, 2682 state => 0,
2288 connect_activate => \&toggle_flopper, 2683 on_activate => \&toggle_flopper,
2289 @_ 2684 @_
2290 ); 2685 );
2291 2686
2292 if ($self->{state}) {
2293 $self->{state} = 0;
2294 $self->toggle_flopper;
2295 }
2296
2297 $self 2687 $self
2298} 2688}
2299 2689
2300sub toggle_flopper { 2690sub toggle_flopper {
2301 my ($self) = @_; 2691 my ($self) = @_;
2302 2692
2303 # TODO: use animation 2693 $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} 2694}
2315 2695
2316############################################################################# 2696#############################################################################
2317 2697
2318package CFClient::UI::Tooltip; 2698package CFClient::UI::Tooltip;
… …
2331} 2711}
2332 2712
2333sub set_tooltip_from { 2713sub set_tooltip_from {
2334 my ($self, $widget) = @_; 2714 my ($self, $widget) = @_;
2335 2715
2716 my $tooltip = $widget->{tooltip};
2717
2718 if ($ENV{CFPLUS_DEBUG} & 2) {
2719 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}";
2723 }
2724
2336 $self->add (new CFClient::UI::Label 2725 $self->add (new CFClient::UI::Label
2337 markup => $widget->{tooltip}, 2726 markup => $tooltip,
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8, 2728 fontsize => 0.8,
2340 fg => [0, 0, 0, 1], 2729 fg => [0, 0, 0, 1],
2730 ellipsise => 0,
2341 font => ($widget->{tooltip_font} || $::FONT_PROP), 2731 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 ); 2732 );
2343} 2733}
2344 2734
2345sub size_request { 2735sub size_request {
2346 my ($self) = @_; 2736 my ($self) = @_;
… …
2352 2742
2353sub size_allocate { 2743sub size_allocate {
2354 my ($self, $w, $h) = @_; 2744 my ($self, $w, $h) = @_;
2355 2745
2356 $self->SUPER::size_allocate ($w - 4, $h - 4); 2746 $self->SUPER::size_allocate ($w - 4, $h - 4);
2747}
2748
2749sub visibility_change {
2750 my ($self, $visible) = @_;
2751
2752 return unless $visible;
2753
2754 $self->{root}->on_post_alloc ("move_$self" => sub {
2755 my $widget = $self->{owner}
2756 or return;
2757
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH;
2762
2763 $self->move_abs ($x, $y);
2764 });
2357} 2765}
2358 2766
2359sub _draw { 2767sub _draw {
2360 my ($self) = @_; 2768 my ($self) = @_;
2361 2769
… …
2378 glVertex $w, $h; 2786 glVertex $w, $h;
2379 glVertex $w, 0; 2787 glVertex $w, 0;
2380 glEnd; 2788 glEnd;
2381 2789
2382 glTranslate 2 - 0.375, 2 - 0.375; 2790 glTranslate 2 - 0.375, 2 - 0.375;
2791
2383 $self->SUPER::_draw; 2792 $self->SUPER::_draw;
2384} 2793}
2385 2794
2386############################################################################# 2795#############################################################################
2387 2796
… …
2392use CFClient::OpenGL; 2801use CFClient::OpenGL;
2393 2802
2394sub new { 2803sub new {
2395 my $class = shift; 2804 my $class = shift;
2396 2805
2397 $class->SUPER::new ( 2806 my $self = $class->SUPER::new (
2398 aspect => 1, 2807 aspect => 1,
2808 can_events => 0,
2399 @_, 2809 @_,
2400 ) 2810 );
2811
2812 if ($self->{anim} && $self->{animspeed}) {
2813 Scalar::Util::weaken (my $widget = $self);
2814
2815 $self->{timer} = Event->timer (
2816 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2817 hard => 1,
2818 interval => $self->{animspeed},
2819 cb => sub {
2820 ++$widget->{frame};
2821 $widget->update;
2822 },
2823 );
2824 }
2825
2826 $self
2401} 2827}
2402 2828
2403sub size_request { 2829sub size_request {
2404 (32, 8) 2830 (32, 8)
2405} 2831}
2406 2832
2833sub update {
2834 my ($self) = @_;
2835
2836 return unless $self->{visible};
2837
2838 $self->SUPER::update;
2839}
2840
2407sub _draw { 2841sub _draw {
2408 my ($self) = @_; 2842 my ($self) = @_;
2409 2843
2410 return unless $::CONN;#d# manage and cache textures differently 2844 return unless $::CONN;
2845
2846 my $face;
2847
2848 if ($self->{frame}) {
2849 my $anim = $::CONN->{anim}[$self->{anim}];
2850
2851 $face = $anim->[ $self->{frame} % @$anim ]
2852 if $anim && @$anim;
2853 }
2854
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2412 2856
2413 # TODO animation
2414 if ($tex) { 2857 if ($tex) {
2415 glEnable GL_TEXTURE_2D; 2858 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1; 2860 glColor 1, 1, 1, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D; 2862 glDisable GL_TEXTURE_2D;
2420 } 2863 }
2421} 2864}
2422 2865
2866sub DESTROY {
2867 my ($self) = @_;
2868
2869 $self->{timer}->cancel
2870 if $self->{timer};
2871
2872 $self->SUPER::DESTROY;
2873}
2874
2423############################################################################# 2875#############################################################################
2424 2876
2425package CFClient::UI::InventoryItem; 2877package CFClient::UI::Buttonbar;
2426 2878
2427our @ISA = CFClient::UI::HBox::; 2879our @ISA = CFClient::UI::HBox::;
2428 2880
2429sub new { 2881# 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 2882
2532############################################################################# 2883#############################################################################
2533 2884
2534package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2535 2886
… …
2569 2920
2570# popup given the event (must be a mouse button down event currently) 2921# popup given the event (must be a mouse button down event currently)
2571sub popup { 2922sub popup {
2572 my ($self, $ev) = @_; 2923 my ($self, $ev) = @_;
2573 2924
2574 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2575 2926
2576 # maybe save $GRAB? must be careful about events... 2927 # maybe save $GRAB? must be careful about events...
2577 $GRAB = $self; 2928 $GRAB = $self;
2578 $self->{button} = $ev->{button}; 2929 $self->{button} = $ev->{button};
2579 2930
2580 $self->show; 2931 $self->show;
2581 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2582} 2933}
2583 2934
2584sub mouse_motion { 2935sub mouse_motion {
2585 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2586 2937
2587 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2588 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2589 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2590} 2943}
2591 2944
2592sub button_up { 2945sub button_up {
2593 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2594 2947
2595 if ($ev->{button} == $self->{button}) { 2948 if ($ev->{button} == $self->{button}) {
2596 undef $GRAB; 2949 undef $GRAB;
2597 $self->hide; 2950 $self->hide;
2598 2951
2599 $self->emit ("popdown"); 2952 $self->_emit ("popdown");
2600 $self->{hover}[1]->() if $self->{hover}; 2953 $self->{hover}[1]->() if $self->{hover};
2954 } else {
2955 return 0
2956 }
2957
2601 } 2958 1
2602} 2959}
2603 2960
2604############################################################################# 2961#############################################################################
2605 2962
2963package CFClient::UI::Multiplexer;
2964
2965our @ISA = CFClient::UI::Container::;
2966
2967sub new {
2968 my $class = shift;
2969
2970 my $self = $class->SUPER::new (
2971 @_,
2972 );
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976
2977 $self
2978}
2979
2980sub add {
2981 my ($self, @widgets) = @_;
2982
2983 $self->SUPER::add (@widgets);
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987}
2988
2989sub set_current_page {
2990 my ($self, $page_or_widget) = @_;
2991
2992 my $widget = ref $page_or_widget
2993 ? $page_or_widget
2994 : $self->{children}[$page_or_widget];
2995
2996 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998
2999 $self->_emit (page_changed => $self->{current});
3000
3001 $self->realloc;
3002}
3003
3004sub visible_children {
3005 $_[0]{current}
3006}
3007
3008sub size_request {
3009 my ($self) = @_;
3010
3011 $self->{current}->size_request
3012}
3013
3014sub size_allocate {
3015 my ($self, $w, $h) = @_;
3016
3017 $self->{current}->configure (0, 0, $w, $h);
3018}
3019
3020sub _draw {
3021 my ($self) = @_;
3022
3023 $self->{current}->draw;
3024}
3025
3026#############################################################################
3027
3028package CFClient::UI::Notebook;
3029
3030our @ISA = CFClient::UI::VBox::;
3031
3032sub new {
3033 my $class = shift;
3034
3035 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3039 @_,
3040 );
3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044
3045 $self
3046}
3047
3048sub add {
3049 my ($self, $title, $widget, $tooltip) = @_;
3050
3051 Scalar::Util::weaken $self;
3052
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget);
3060}
3061
3062sub set_current_page {
3063 my ($self, $page) = @_;
3064
3065 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current});
3067}
3068
3069#############################################################################
3070
2606package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
2607 3072
2608our @ISA = CFClient::UI::VBox::; 3073our @ISA = CFClient::UI::VBox::;
3074
3075sub new {
3076 my $class = shift;
3077
3078 $class->SUPER::new (
3079 fontsize => 0.8,
3080 @_,
3081 )
3082}
2609 3083
2610sub reorder { 3084sub reorder {
2611 my ($self) = @_; 3085 my ($self) = @_;
2612 my $NOW = time; 3086 my $NOW = time;
2613 3087
… …
2632 ? "<b>$item->{count} ×</b> $item->{text}" 3106 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text}; 3107 : $item->{text};
2634 3108
2635 for ($short) { 3109 for ($short) {
2636 s/^\s+//; 3110 s/^\s+//;
2637 s/\012.*/…/s; 3111 s/\s+/ /g;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 } 3112 }
2641 3113
2642 new CFClient::UI::Label 3114 new CFClient::UI::Label
2643 markup => $short, 3115 markup => $short,
2644 tooltip => $item->{tooltip}, 3116 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP, 3117 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67, 3118 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize}, 3119 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44,
2648 color => $item->{color}, 3121 fg => $item->{fg},
2649 can_events => 1, 3122 can_events => 1,
2650 can_hover => 1 3123 can_hover => 1
2651 }; 3124 };
2652 } 3125 }
2653 3126
… …
2658sub add { 3131sub add {
2659 my ($self, $text, %arg) = @_; 3132 my ($self, $text, %arg) = @_;
2660 3133
2661 $text =~ s/^\s+//; 3134 $text =~ s/^\s+//;
2662 $text =~ s/\s+$//; 3135 $text =~ s/\s+$//;
3136
3137 return unless $text;
2663 3138
2664 my $timeout = time + ((delete $arg{timeout}) || 60); 3139 my $timeout = time + ((delete $arg{timeout}) || 60);
2665 3140
2666 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667 3142
… …
2679 $self->{item}{$group} = { 3154 $self->{item}{$group} = {
2680 id => ++$self->{id}, 3155 id => ++$self->{id},
2681 text => $text, 3156 text => $text,
2682 timeout => $timeout, 3157 timeout => $timeout,
2683 tooltip => $text, 3158 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8], 3159 fg => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0, 3160 pri => 0,
2687 count => 1, 3161 count => 1,
2688 %arg, 3162 %arg,
2689 }; 3163 };
2690 } 3164 }
2691 3165
2692 $self->reorder; 3166 $self->reorder;
2693} 3167}
2694 3168
3169sub reconfigure {
3170 my ($self) = @_;
3171
3172 delete $_->{label}
3173 for values %{ $self->{item} || {} };
3174
3175 $self->reorder;
3176 $self->SUPER::reconfigure;
3177}
3178
2695############################################################################# 3179#############################################################################
2696 3180
2697package CFClient::UI::Root; 3181package CFClient::UI::Inventory;
2698 3182
2699our @ISA = CFClient::UI::Container::; 3183our @ISA = CFClient::UI::ScrolledWindow::;
2700
2701use CFClient::OpenGL;
2702 3184
2703sub new { 3185sub new {
2704 my $class = shift; 3186 my $class = shift;
2705 3187
2706 $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3190 @_,
3191 );
3192
3193 $self
3194}
3195
3196sub set_items {
3197 my ($self, $items) = @_;
3198
3199 $self->{child}->clear;
3200 return unless $items;
3201
3202 my @items = sort {
3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3206
3207 $self->{real_items} = \@items;
3208
3209 my $row = 0;
3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3212
3213 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3216
3217 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 }
3416}
3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList;
3421
3422our @ISA = CFClient::UI::Table::;
3423
3424sub new {
3425 my $class = shift;
3426
3427 my $self = $class->SUPER::new (
3428 binding => [],
3429 commands => [],
2707 @_, 3430 @_,
2708 ) 3431 )
2709} 3432}
2710 3433
2711sub configure { 3434# XXX: Do sorting? Argl...
2712 my ($self, $x, $y, $w, $h) = @_; 3435sub add_spell {
2713
2714 $self->{w} = $w;
2715 $self->{h} = $h;
2716}
2717
2718sub check_size {
2719 my ($self) = @_; 3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
2720 3438
2721 $self->size_allocate ($self->{w}, $self->{h}) 3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2722 if $self->{w}; 3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466}
3467
3468sub remove_spell {
3469 my ($self, $spell) = @_;
3470 delete $self->{spells}->{$spell->{name}};
3471 $self->rebuild_spell_list;
3472}
3473
3474#############################################################################
3475
3476package CFClient::UI::Root;
3477
3478our @ISA = CFClient::UI::Container::;
3479
3480use CFClient::OpenGL;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (
3486 visible => 1,
3487 @_,
3488 );
3489
3490 Scalar::Util::weaken ($self->{root} = $self);
3491
3492 $self
2723} 3493}
2724 3494
2725sub size_request { 3495sub size_request {
2726 my ($self) = @_; 3496 my ($self) = @_;
2727 3497
2728 ($self->{w}, $self->{h}) 3498 ($self->{w}, $self->{h})
3499}
3500
3501sub _to_pixel {
3502 my ($coord, $size, $max) = @_;
3503
3504 $coord =
3505 $coord eq "center" ? ($max - $size) * 0.5
3506 : $coord eq "max" ? $max
3507 : $coord;
3508
3509 $coord = 0 if $coord < 0;
3510 $coord = $max - $size if $coord > $max - $size;
3511
3512 int $coord + 0.5
2729} 3513}
2730 3514
2731sub size_allocate { 3515sub size_allocate {
2732 my ($self, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
2733 3517
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) { 3518 for my $child ($self->children) {
2751 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2752 3520
2753 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3521 $X = $child->{force_x} if exists $child->{force_x};
2754 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3522 $Y = $child->{force_y} if exists $child->{force_y};
3523
3524 $X = _to_pixel $X, $W, $self->{w};
3525 $Y = _to_pixel $Y, $H, $self->{h};
3526
2755 $child->configure ($X, $Y, $W, $H); 3527 $child->configure ($X, $Y, $W, $H);
2756 } 3528 }
2757
2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760} 3529}
2761 3530
2762sub coord2local { 3531sub coord2local {
2763 my ($self, $x, $y) = @_; 3532 my ($self, $x, $y) = @_;
2764 3533
… …
2772} 3541}
2773 3542
2774sub update { 3543sub update {
2775 my ($self) = @_; 3544 my ($self) = @_;
2776 3545
2777 $self->check_size;
2778 $::WANT_REFRESH++; 3546 $::WANT_REFRESH++;
2779} 3547}
2780 3548
2781sub add { 3549sub add {
2782 my ($self, $child) = @_; 3550 my ($self, @children) = @_;
2783 3551
2784 # integerise window positions 3552 $_->{is_toplevel} = 1
2785 $child->{x} = int $child->{x}; 3553 for @children;
2786 $child->{y} = int $child->{y};
2787 3554
2788 $self->SUPER::add ($child); 3555 $self->SUPER::add (@children);
3556}
3557
3558sub remove {
3559 my ($self, @children) = @_;
3560
3561 $self->SUPER::remove (@children);
3562
3563 delete $self->{is_toplevel}
3564 for @children;
3565
3566 while (@children) {
3567 my $w = pop @children;
3568 push @children, $w->children;
3569 $w->set_invisible;
3570 }
2789} 3571}
2790 3572
2791sub on_refresh { 3573sub on_refresh {
2792 my ($self, $id, $cb) = @_; 3574 my ($self, $id, $cb) = @_;
2793 3575
… …
2806 while ($self->{refresh_hook}) { 3588 while ($self->{refresh_hook}) {
2807 $_->() 3589 $_->()
2808 for values %{delete $self->{refresh_hook}}; 3590 for values %{delete $self->{refresh_hook}};
2809 } 3591 }
2810 3592
2811 if ($self->{check_size}) { 3593 if ($self->{realloc}) {
2812 my @queue = ([], []); 3594 my %queue;
3595 my @queue;
3596 my $widget;
2813 3597
2814 for (;;) { 3598 outer:
2815 if ($self->{check_size}) { 3599 while () {
2816 # heuristic: check containers last 3600 if (my $realloc = delete $self->{realloc}) {
2817 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3601 for $widget (values %$realloc) {
2818 for values %{delete $self->{check_size}} 3602 $widget->{visible} or next; # do not resize invisible widgets
3603
3604 $queue{$widget+0}++ and next; # duplicates are common
3605
3606 push @{ $queue[$widget->{visible}] }, $widget;
3607 }
2819 } 3608 }
2820 3609
2821 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3610 while () {
3611 @queue or last outer;
2822 3612
2823 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3613 $widget = pop @{ $queue[-1] || [] }
2824 ? @$widget{qw(user_w user_h)} 3614 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 3615
3616 pop @queue;
3617 }
3618
3619 delete $queue{$widget+0};
3620
3621 my ($w, $h) = $widget->size_request;
3622
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3625
3626 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h};
3628
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3630 || delete $widget->{force_realloc}) {
2831 $widget->{req_w} = $w; 3631 $widget->{req_w} = $w;
2832 $widget->{req_h} = $h; 3632 $widget->{req_h} = $h;
2833 3633
2834 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3634 $self->{size_alloc}{$widget+0} = $widget;
2835 3635
2836 $widget->{parent}->check_size
2837 if $widget->{parent}; 3636 if (my $parent = $widget->{parent}) {
3637 $self->{realloc}{$parent+0} = $parent
3638 unless $queue{$parent+0};
3639
3640 $parent->{force_size_alloc} = 1;
3641 $self->{size_alloc}{$parent+0} = $parent;
3642 }
2838 } 3643 }
3644
3645 delete $self->{realloc}{$widget+0};
2839 } 3646 }
2840 } 3647 }
2841 3648
2842 while ($self->{size_alloc}) { 3649 while (my $size_alloc = delete $self->{size_alloc}) {
2843 for (values %{delete $self->{size_alloc}}) { 3650 my @queue = sort { $b->{visible} <=> $a->{visible} }
2844 my ($widget, $w, $h) = @$_; 3651 values %$size_alloc;
3652
3653 while () {
3654 my $widget = pop @queue || last;
3655
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2845 3657
2846 $w = 0 if $w < 0; 3658 $w = 0 if $w < 0;
2847 $h = 0 if $h < 0; 3659 $h = 0 if $h < 0;
2848 3660
3661 $w = int $w + 0.5;
3662 $h = int $h + 0.5;
3663
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h};
3667
2849 $widget->{w} = $w; 3668 $widget->{w} = $w;
2850 $widget->{h} = $h; 3669 $widget->{h} = $h;
2851 $widget->size_allocate ($w, $h); 3670
2852 $widget->emit (size_allocate => $w, $h); 3671 $widget->emit (size_allocate => $w, $h);
3672 }
2853 } 3673 }
2854 } 3674 }
2855 3675
2856 while ($self->{post_alloc_hook}) { 3676 while ($self->{post_alloc_hook}) {
2857 $_->() 3677 $_->()
2858 for values %{delete $self->{post_alloc_hook}}; 3678 for values %{delete $self->{post_alloc_hook}};
2859 } 3679 }
2860 3680
3681
2861 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2863 glClear GL_COLOR_BUFFER_BIT; 3684 glClear GL_COLOR_BUFFER_BIT;
2864 3685
2865 glMatrixMode GL_PROJECTION; 3686 glMatrixMode GL_PROJECTION;
2866 glLoadIdentity; 3687 glLoadIdentity;
2867 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2868 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
2869 glLoadIdentity; 3690 glLoadIdentity;
2870 3691
3692 {
3693 package CFClient::UI::Base;
3694
3695 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h});
3697 }
3698
2871 $self->_draw; 3699 $self->_draw;
2872} 3700}
2873 3701
2874############################################################################# 3702#############################################################################
2875 3703
2876package CFClient::UI; 3704package CFClient::UI;
2877 3705
2878$ROOT = new CFClient::UI::Root; 3706$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip; 3707$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2880 3708
28811 37091
2882 3710

Diff Legend

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