ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

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

Diff Legend

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