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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC

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

Diff Legend

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