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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC

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

Diff Legend

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