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.227 by root, Wed May 24 03:29:20 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 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) = @_;
… …
144 157
145 $_->update 158 $_->update
146 for @widgets; 159 for @widgets;
147} 160}
148 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
149# call when resolution changes etc. 170# call when resolution changes etc.
150sub rescale_widgets { 171sub rescale_widgets {
151 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
152 173
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $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
166 } 189 }
167
168 $widget->reconfigure;
169 } 190 }
191
192 reconfigure_widgets;
170} 193}
171 194
172############################################################################# 195#############################################################################
173 196
174package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 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 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
… …
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub show_centered { 254sub set_visible {
217 my ($self) = @_; 255 my ($self) = @_;
256
218 return if $self->{parent}; 257 return if $self->{visible};
219 258
220 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
221 261
222 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 263
229sub hide { 264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
230 my ($self) = @_; 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};
231 278
232 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
234 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
235 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
236 if $self->{parent}; 313 if $self->{parent};
237} 314}
238 315
239sub move { 316sub move_abs {
240 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
241 318
242 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
245 322
246 $self->update; 323 $self->update;
247} 324}
248 325
249sub set_size { 326sub set_size {
250 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
251 328
252 $self->{user_w} = $w; 329 $self->{force_w} = $w;
253 $self->{user_h} = $h; 330 $self->{force_h} = $h;
254 331
255 $self->check_size; 332 $self->realloc;
256} 333}
257 334
258sub size_request { 335sub size_request {
259 require Carp; 336 require Carp;
260 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
262 339
263sub configure { 340sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
265 342
266 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
269 348
270 # use alignment to adjust x, y 349 # use alignment to adjust x, y
271 350
272 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 353 }
277 354
278 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 356 $self->{x} = $x;
280 $self->{y} = $y; 357 $self->{y} = $y;
281 $self->update; 358 $self->update;
282 } 359 }
283 360
284 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $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;
286 } 368 }
287} 369}
288 370
289sub size_allocate { 371sub size_allocate {
290 # nothing to be done 372 # nothing to be done
291} 373}
292 374
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
301} 381}
302 382
303sub set_max_size { 383sub set_max_size {
304 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
305 385
… …
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
308} 388}
309 389
310sub set_tooltip { 390sub set_tooltip {
311 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
312 397
313 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
314 399
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
338 return if $FOCUS == $self; 423 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
340 425
341 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
342 427
343 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
344 429
345 $focus->update if $focus; 430 $focus->update if $focus;
346 $FOCUS->update; 431 $FOCUS->update;
347} 432}
348 433
… …
351 436
352 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
353 438
354 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
355 440
356 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
357 442
358 $focus->update if $focus; #? 443 $focus->update if $focus; #?
359}
360 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
361sub mouse_motion { } 449sub mouse_motion { 0 }
362sub button_up { } 450sub button_up { 0 }
363sub key_down { } 451sub key_down { 0 }
364sub key_up { } 452sub key_up { 0 }
365 453
366sub button_down { 454sub button_down {
367 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
368 456
369 $self->focus_in; 457 $self->focus_in;
370}
371 458
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
376sub 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
377 535
378sub draw { 536sub draw {
379 my ($self) = @_; 537 my ($self) = @_;
380 538
381 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);
382 550
383 glPushMatrix; 551 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 553
388 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 556 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 558 glBegin GL_QUADS;
395 glVertex $x , $y;
396 glVertex $x + $self->{w}, $y;
397 glVertex $x + $self->{w}, $y + $self->{h};
398 glVertex $x , $y + $self->{h};
399 glEnd;
400 glDisable GL_BLEND;
401 }
402
403 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix;
405 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 559 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
412 glEnd; 563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
413 glPopMatrix; 577 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
416} 583}
417 584
418sub _draw { 585sub _draw {
419 my ($self) = @_; 586 my ($self) = @_;
420 587
421 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
422}
423
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472} 589}
473 590
474sub DESTROY { 591sub DESTROY {
475 my ($self) = @_; 592 my ($self) = @_;
476 593
… …
508 625
509 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
511 628
512 glEnable GL_BLEND; 629 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 631 glColor_premultiply @$color;
515 632
516 glBegin GL_QUADS; 633 glBegin GL_QUADS;
517 glVertex 0 , 0; 634 glVertex 0 , 0;
518 glVertex 0 , $h; 635 glVertex 0 , $h;
519 glVertex $w, $h; 636 glVertex $w, $h;
… …
534 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
536} 653}
537 654
538sub size_request { 655sub size_request {
539 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
540} 659}
541 660
542sub draw { } 661sub draw { }
543 662
544############################################################################# 663#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
549 668
550sub new { 669sub new {
551 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
552 671
553 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
554 673
555 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
556 children => [], 675 children => [],
557 can_events => 0, 676 can_events => 0,
558 %arg, 677 %arg,
559 ); 678 );
679
560 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
561 682
562 $self 683 $self
563} 684}
564 685
565sub add { 686sub add {
… …
573 $self->{children} = [ 694 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
576 ]; 697 ];
577 698
578 $self->check_size (1); 699 $self->realloc;
579 $self->update;
580} 700}
581 701
582sub children { 702sub children {
583 @{ $_[0]{children} } 703 @{ $_[0]{children} }
584} 704}
… …
589 delete $child->{parent}; 709 delete $child->{parent};
590 $child->hide; 710 $child->hide;
591 711
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 713
594 $self->check_size; 714 $self->realloc;
595 $self->update;
596} 715}
597 716
598sub clear { 717sub clear {
599 my ($self) = @_; 718 my ($self) = @_;
600 719
… …
604 for (@$children) { 723 for (@$children) {
605 delete $_->{parent}; 724 delete $_->{parent};
606 $_->hide; 725 $_->hide;
607 } 726 }
608 727
609 $self->check_size; 728 $self->realloc;
610 $self->update;
611} 729}
612 730
613sub find_widget { 731sub find_widget {
614 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
615 733
616 $x -= $self->{x}; 734 $x -= $self->{x};
617 $y -= $self->{y}; 735 $y -= $self->{y};
618 736
619 my $res; 737 my $res;
620 738
621 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
623 and return $res; 741 and return $res;
624 } 742 }
625 743
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
675 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
676} 794}
677 795
678############################################################################# 796#############################################################################
679 797
798# back-buffered drawing area
799
680package CFClient::UI::Window; 800package CFClient::UI::Window;
681 801
682our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
683 803
684use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
702 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 823 $self->update;
704} 824}
705 825
706sub _render { 826sub _render {
827 my ($self) = @_;
828
707 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
708} 830}
709 831
710sub render_child { 832sub render_child {
711 my ($self) = @_; 833 my ($self) = @_;
712 834
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
716 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
717 $self->_render; 846 $self->_render;
718 }; 847 };
719} 848}
720 849
721sub _draw { 850sub _draw {
722 my ($self) = @_; 851 my ($self) = @_;
723 852
724 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
725 854
726 my $tex = $self->{texture} 855 my $tex = $self->{texture}
727 or return; 856 or return;
728 857
729 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
731 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
732 863
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad (0, 0, $w, $h);
734 865
866 glDisable GL_BLEND;
735 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
736} 868}
737 869
738############################################################################# 870#############################################################################
739 871
740package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
741 873
742our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
743 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
744sub size_request { 886sub size_request {
745 my ($self) = @_; 887 my ($self) = @_;
746 888
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 890
749 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
750} 895}
751 896
752sub size_allocate { 897sub size_allocate {
753 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
754 899
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 900 my $child = $self->child;
756# $w = $self->{w}; 901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
757 $self->child->configure (0, 0, $cw, $ch); 905 $self->child->configure (0, 0, $w, $h);
758 $self->update; 906 $self->update;
759} 907}
760 908
761sub set_offset { 909sub set_offset {
762 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
796} 944}
797 945
798sub _render { 946sub _render {
799 my ($self) = @_; 947 my ($self) = @_;
800 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 953
803 $self->SUPER::_render; 954 $self->SUPER::_render;
804} 955}
805 956
… …
808package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
809 960
810our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
811 962
812sub new { 963sub new {
813 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
814 967
815 my $self; 968 my $self;
816 969
817 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
818 vertical => 1, 971 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 973 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 974 $self->{vp}->set_offset (0, $_[1]);
822 }, 975 },
823 ; 976 ;
824 977
825 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
827 slider => $slider, 980 slider => $slider,
828 @_, 981 %arg,
829 ); 982 );
830 983
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
834 986
835 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004}
1005
1006sub size_allocate {
1007 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 1013}
837 1014
838#TODO# update range on size_allocate depending on child 1015#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 1016# update viewport offset on scroll
840 1017
… …
860 1037
861 if ($self->{bg}) { 1038 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
863 1040
864 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
867 1044
868 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
869 glVertex 0 , 0; 1046 glVertex 0 , 0;
870 glVertex 0 , $h; 1047 glVertex 0 , $h;
871 glVertex $w, $h; 1048 glVertex $w, $h;
… …
884 1061
885our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
886 1063
887use CFClient::OpenGL; 1064use CFClient::OpenGL;
888 1065
889my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892 1073
893sub new { 1074sub new {
894 my $class = shift; 1075 my ($class, %arg) = @_;
895 1076
896 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
897 1078
898 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1082 border => 0.6,
902 toplevel => 1,
903 can_events => 1, 1083 can_events => 1,
904 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
905 ); 1087 );
906 1088
907 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
908 align => 0, 1090 align => 0,
909 valign => 1, 1091 valign => 1,
910 text => $self->{title}, 1092 text => $title,
911 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
912 1095
913 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
914} 1104}
915 1105
916sub border { 1106sub border {
917 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
918} 1108}
919 1109
920sub size_request { 1110sub size_request {
921 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
922 1115
923 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
924 1117
925 ( 1118 (
926 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
929} 1122}
930 1123
931sub size_allocate { 1124sub size_allocate {
932 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
933 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
934 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
935 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
936 1137
937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
938 if $self->{title};
939
940 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
941} 1139}
942 1140
943sub button_down { 1141sub button_down {
944 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
945 1143
… …
961 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
962 1160
963 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
965 1163
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size; 1168 $self->realloc;
970 }; 1169 };
971 1170
972 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1175 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
978 1177
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
980 1179
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
983 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
984 } 1188 1
985} 1189}
986 1190
987sub button_up { 1191sub button_up {
988 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
989 1193
990 delete $self->{motion}; 1194 !!delete $self->{motion}
991} 1195}
992 1196
993sub mouse_motion { 1197sub mouse_motion {
994 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
995 1199
996 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
997} 1203}
998 1204
999sub _draw { 1205sub _draw {
1000 my ($self) = @_; 1206 my ($self) = @_;
1001 1207
1208 my $child = $self->{children}[0];
1209
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1212
1005 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1215
1008 my $border = $self->border; 1216 my $border = $self->border;
1009 1217
1010 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015 1223
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1018 1226
1019 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1022
1023 glColor @{ $self->{bg} };
1024
1025 $bg->{s} = $rep_x;
1026 $bg->{t} = $rep_y;
1027 $bg->{wrap_mode} = 1;
1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1232 }
1030 1233
1031 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1032 1235
1033 $self->{title}->draw if $self->{title};
1034
1035 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1036} 1242}
1037 1243
1038############################################################################# 1244#############################################################################
1039 1245
1040package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1048sub new { 1254sub new {
1049 my $class = shift; 1255 my $class = shift;
1050 1256
1051 $class->SUPER::new ( 1257 $class->SUPER::new (
1052 col_expand => [], 1258 col_expand => [],
1053 @_ 1259 @_,
1054 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1265}
1056 1266
1057sub add { 1267sub add {
1058 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1059 1269
1060 $child->set_parent ($self); 1270 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1062 1272
1063 $child->check_size; 1273 $self->realloc;
1064} 1274}
1065 1275
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1277sub clear {
1072 my ($self) = @_; 1278 my ($self) = @_;
1073 1279
1074 my @children = $self->children; 1280 my @children = $self->children;
1075 delete $self->{children}; 1281 delete $self->{children};
… …
1077 for (@children) { 1283 for (@children) {
1078 delete $_->{parent}; 1284 delete $_->{parent};
1079 $_->hide; 1285 $_->hide;
1080 } 1286 }
1081 1287
1082 $self->update; 1288 $self->realloc;
1083} 1289}
1084 1290
1085sub get_wh { 1291sub get_wh {
1086 my ($self) = @_; 1292 my ($self) = @_;
1087 1293
… …
1118sub size_allocate { 1324sub size_allocate {
1119 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1120 1326
1121 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1122 1328
1123 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1125 1331
1126 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1183 } 1389 }
1184} 1390}
1185 1391
1186############################################################################# 1392#############################################################################
1187 1393
1188package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1189
1190# TODO: wrap into common Box base class
1191 1395
1192our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1193 1397
1194sub size_request { 1398sub size_request {
1195 my ($self) = @_; 1399 my ($self) = @_;
1196 1400
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1198 1402 ? (
1199 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1200 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201 (List::Util::max map $_->[1], @alloc), 1405 )
1202 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1203} 1410}
1204 1411
1205sub size_allocate { 1412sub size_allocate {
1206 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1207 1414
1208 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1209
1210 my $children = $self->{children}; 1416 my $children = $self->{children};
1211 1417
1212 my @h = map $_->{req_w}, @$children; 1418 my @req;
1213 1419
1214 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1215 1421 @req = ($space / (@$children || 1)) x @$children;
1216 if ($req_h > $h) {
1217 # ah well, not enough space
1218 $_ *= $h / $req_h for @h;
1219 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1220 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221 $exp ||= 1;
1222 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1223 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1224 my $child = $children->[$_];
1225
1226 my $alloc_h = $h[$_];
1227 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228 $h[$_] = $alloc_h;
1229 } 1436 }
1230 } 1437 }
1231 1438
1232 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1233 1440
1234 my $y = 0; 1441 my $pos = 0;
1235 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1238 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239 1445
1240 $y += $h; 1446 $pos += $alloc;
1241 } 1447 }
1242 1448
1243 1 1449 1
1244} 1450}
1245 1451
1246############################################################################# 1452#############################################################################
1247 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1248package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1249 1470
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1253 1472
1254sub size_request { 1473sub new {
1255 my ($self) = @_; 1474 my $class = shift;
1256 1475
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1258 1477 vertical => 1,
1259 ( 1478 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1479 )
1263}
1264
1265sub size_allocate {
1266 my ($self, $w, $h) = @_;
1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270 my $children = $self->{children};
1271
1272 my @h = map $_->{req_h}, @$children;
1273
1274 my $req_h = List::Util::sum @h;
1275
1276 if ($req_h > $h) {
1277 # ah well, not enough space
1278 $_ *= $h / $req_h for @h;
1279 } else {
1280 my $exp = List::Util::sum map $_->{expand}, @$children;
1281 $exp ||= 1;
1282
1283 for (0 .. $#$children) {
1284 my $child = $children->[$_];
1285
1286 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287 }
1288 }
1289
1290 CFClient::UI::harmonize \@h;
1291
1292 my $y = 0;
1293 for (0 .. $#$children) {
1294 my $child = $children->[$_];
1295 my $h = $h[$_];
1296 $child->configure (0, $y, $w, $h);
1297
1298 $y += $h;
1299 }
1300
1301 1
1302} 1480}
1303 1481
1304############################################################################# 1482#############################################################################
1305 1483
1306package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1323 ellipsise => 3, # end 1501 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1325 fontsize => 1, 1503 fontsize => 1,
1326 align => -1, 1504 align => -1,
1327 valign => -1, 1505 valign => -1,
1328 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1329 can_events => 0, 1508 can_events => 0,
1330 %arg 1509 %arg
1331 ); 1510 );
1332 1511
1333 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1369 $self->{text} = "T$text"; 1548 $self->{text} = "T$text";
1370 1549
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1551 $self->{layout}->set_text ($text);
1373 1552
1553 $self->realloc;
1374 $self->update; 1554 $self->update;
1375 $self->check_size;
1376} 1555}
1377 1556
1378sub set_markup { 1557sub set_markup {
1379 my ($self, $markup) = @_; 1558 my ($self, $markup) = @_;
1380 1559
… …
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1563 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1564
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387 $self->{layout}->set_markup ($markup); 1566 $self->{layout}->set_markup ($markup);
1388 1567
1568 $self->realloc;
1389 $self->update; 1569 $self->update;
1390 $self->check_size;
1391} 1570}
1392 1571
1393sub size_request { 1572sub size_request {
1394 my ($self) = @_; 1573 my ($self) = @_;
1395 1574
… …
1409 1588
1410 $w = List::Util::max $w, $w2; 1589 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 1590 $h = List::Util::max $h, $h2;
1412 } 1591 }
1413 1592
1414 ( 1593 ($w, $h)
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 1594}
1419 1595
1420sub size_allocate { 1596sub size_allocate {
1421 my ($self, $w, $h) = @_; 1597 my ($self, $w, $h) = @_;
1422 1598
1599 delete $self->{ox};
1600
1423 delete $self->{texture}; 1601 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1424} 1603}
1425 1604
1426sub set_fontsize { 1605sub set_fontsize {
1427 my ($self, $fontsize) = @_; 1606 my ($self, $fontsize) = @_;
1428 1607
1429 $self->{fontsize} = $fontsize; 1608 $self->{fontsize} = $fontsize;
1430 delete $self->{texture}; 1609 delete $self->{texture};
1431 1610
1432 $self->update; 1611 $self->realloc;
1433 $self->check_size;
1434} 1612}
1435 1613
1436sub _draw { 1614sub _draw {
1437 my ($self) = @_; 1615 my ($self) = @_;
1438 1616
… …
1444 $self->{layout}->set_width ($self->{w}); 1622 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1623 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 1626
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1627 new_from_layout CFClient::Texture $self->{layout}
1628 };
1450 1629
1630 unless (exists $self->{ox}) {
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453 : ($self->{w} - $tex->{w}) * 0.5); 1633 : ($self->{w} - $tex->{w}) * 0.5);
1454 1634
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457 : ($self->{h} - $tex->{h}) * 0.5); 1637 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1460 }; 1638 };
1461 1639
1462 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 1642
… …
1502 1680
1503 delete $self->{cur_h}; 1681 delete $self->{cur_h};
1504 1682
1505 return if $self->{text} eq $text; 1683 return if $self->{text} eq $text;
1506 1684
1507 delete $self->{texture};
1508
1509 $self->{last_activity} = $::NOW; 1685 $self->{last_activity} = $::NOW;
1510 $self->{text} = $text; 1686 $self->{text} = $text;
1511 1687
1512 $text =~ s/./*/g if $self->{hidden}; 1688 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1689 $self->{layout}->set_text ("$text ");
1514 1690
1515 $self->emit (changed => $self->{text}); 1691 $self->_emit (changed => $self->{text});
1692 $self->update;
1516} 1693}
1517 1694
1518sub set_text { 1695sub set_text {
1519 my ($self, $text) = @_; 1696 my ($self, $text) = @_;
1520 1697
1521 $self->{cursor} = length $text; 1698 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 1699 $self->_set_text ($text);
1523 $self->update; 1700
1524 $self->check_size; 1701 $self->realloc;
1525} 1702}
1526 1703
1527sub get_text { 1704sub get_text {
1528 $_[0]{text} 1705 $_[0]{text}
1529} 1706}
… …
1532 my ($self) = @_; 1709 my ($self) = @_;
1533 1710
1534 my ($w, $h) = $self->SUPER::size_request; 1711 my ($w, $h) = $self->SUPER::size_request;
1535 1712
1536 ($w + 1, $h) # add 1 for cursor 1713 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1714}
1544 1715
1545sub key_down { 1716sub key_down {
1546 my ($self, $ev) = @_; 1717 my ($self, $ev) = @_;
1547 1718
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1733 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1734 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1735 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1736 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1737 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1738 $self->_emit ('escape');
1568 } elsif ($uni) { 1739 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1740 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else {
1742 return 0;
1570 } 1743 }
1571 1744
1572 $self->_set_text ($text); 1745 $self->_set_text ($text);
1573 $self->update; 1746
1574 $self->check_size; 1747 $self->realloc;
1748
1749 1
1575} 1750}
1576 1751
1577sub focus_in { 1752sub focus_in {
1578 my ($self) = @_; 1753 my ($self) = @_;
1579 1754
… …
1594 utf8::encode $text; 1769 utf8::encode $text;
1595 $self->{cursor} = length substr $text, 0, $idx; 1770 $self->{cursor} = length substr $text, 0, $idx;
1596 1771
1597 $self->_set_text ($self->{text}); 1772 $self->_set_text ($self->{text});
1598 $self->update; 1773 $self->update;
1774
1775 1
1599} 1776}
1600 1777
1601sub mouse_motion { 1778sub mouse_motion {
1602 my ($self, $ev, $x, $y) = @_; 1779 my ($self, $ev, $x, $y) = @_;
1603# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781
1782 0
1604} 1783}
1605 1784
1606sub _draw { 1785sub _draw {
1607 my ($self) = @_; 1786 my ($self) = @_;
1608 1787
1609 local $self->{fg} = $self->{fg}; 1788 local $self->{fg} = $self->{fg};
1610 1789
1611 if ($FOCUS == $self) { 1790 if ($FOCUS == $self) {
1612 glColor @{$self->{active_bg}}; 1791 glColor_premultiply @{$self->{active_bg}};
1613 $self->{fg} = $self->{active_fg}; 1792 $self->{fg} = $self->{active_fg};
1614 } else { 1793 } else {
1615 glColor @{$self->{bg}}; 1794 glColor_premultiply @{$self->{bg}};
1616 } 1795 }
1617 1796
1618 glEnable GL_BLEND; 1797 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620 glBegin GL_QUADS; 1799 glBegin GL_QUADS;
1621 glVertex 0 , 0; 1800 glVertex 0 , 0;
1622 glVertex 0 , $self->{h}; 1801 glVertex 0 , $self->{h};
1623 glVertex $self->{w}, $self->{h}; 1802 glVertex $self->{w}, $self->{h};
1624 glVertex $self->{w}, 0; 1803 glVertex $self->{w}, 0;
… …
1659 if ($sym == 13) { 1838 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1839 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1840 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1841 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1842 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1843 $self->_emit (activate => $txt);
1665 $self->update; 1844 $self->update;
1666 1845
1667 } elsif ($sym == CFClient::SDLK_UP) { 1846 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1847 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1848 $self->{history_saveback} = $self->get_text;
… …
1685 } else { 1864 } else {
1686 $self->set_text ($self->{history_saveback}); 1865 $self->set_text ($self->{history_saveback});
1687 } 1866 }
1688 1867
1689 } else { 1868 } else {
1690 $self->SUPER::key_down ($ev); 1869 return $self->SUPER::key_down ($ev)
1870 }
1871
1691 } 1872 1
1692
1693} 1873}
1694 1874
1695############################################################################# 1875#############################################################################
1696 1876
1697package CFClient::UI::Button; 1877package CFClient::UI::Button;
… …
1706 1886
1707sub new { 1887sub new {
1708 my $class = shift; 1888 my $class = shift;
1709 1889
1710 $class->SUPER::new ( 1890 $class->SUPER::new (
1711 padding => 4, 1891 padding_x => 4,
1892 padding_y => 4,
1712 fg => [1, 1, 1], 1893 fg => [1, 1, 1],
1713 active_fg => [0, 0, 1], 1894 active_fg => [0, 0, 1],
1714 can_hover => 1, 1895 can_hover => 1,
1715 align => 0, 1896 align => 0,
1716 valign => 0, 1897 valign => 0,
1717 can_events => 1, 1898 can_events => 1,
1718 @_ 1899 @_
1719 ) 1900 )
1720} 1901}
1721 1902
1903sub activate { }
1904
1722sub button_up { 1905sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1906 my ($self, $ev, $x, $y) = @_;
1724 1907
1908 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1909 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1910 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate"); 1911
1728 } 1912 1
1729} 1913}
1730 1914
1731sub _draw { 1915sub _draw {
1732 my ($self) = @_; 1916 my ($self) = @_;
1733 1917
… …
1762 1946
1763sub new { 1947sub new {
1764 my $class = shift; 1948 my $class = shift;
1765 1949
1766 $class->SUPER::new ( 1950 $class->SUPER::new (
1767 padding => 2, 1951 padding_x => 2,
1952 padding_y => 2,
1768 fg => [1, 1, 1], 1953 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 1954 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 1955 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 1956 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 1957 state => 0,
… …
1776} 1961}
1777 1962
1778sub size_request { 1963sub size_request {
1779 my ($self) = @_; 1964 my ($self) = @_;
1780 1965
1781 ($self->{padding} * 2 + 6) x 2 1966 (6) x 2
1782} 1967}
1783 1968
1784sub button_down { 1969sub button_down {
1785 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1786 1971
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 1974 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1975 $self->_emit (changed => $self->{state});
1976 } else {
1977 return 0
1978 }
1979
1791 } 1980 1
1792} 1981}
1793 1982
1794sub _draw { 1983sub _draw {
1795 my ($self) = @_; 1984 my ($self) = @_;
1796 1985
1797 $self->SUPER::_draw; 1986 $self->SUPER::_draw;
1798 1987
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 1989
1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1990 my ($w, $h) = @$self{qw(w h)};
1991
1992 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802 1993
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1994 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 1995
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1996 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 1997
… …
1961 2152
1962 my $h1 = $self->{h} * (1 - $ycut1); 2153 my $h1 = $self->{h} * (1 - $ycut1);
1963 my $h2 = $self->{h} * (1 - $ycut2); 2154 my $h2 = $self->{h} * (1 - $ycut2);
1964 2155
1965 glEnable GL_BLEND; 2156 glEnable GL_BLEND;
1966 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1967 glEnable GL_TEXTURE_2D; 2159 glEnable GL_TEXTURE_2D;
1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969 2161
1970 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t1->{name};
1971 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
… …
2071 fg => [1, 1, 1], 2263 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2264 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2265 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2266 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10, 0], 2267 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2268 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2269 min_h => $::WIDTH / 80,
2078 vertical => 0, 2270 vertical => 0,
2079 can_hover => 1, 2271 can_hover => 1,
2080 inner_pad => 0.02, 2272 inner_pad => 0.02,
2081 @_ 2273 @_
2082 ); 2274 );
… …
2085 $self->update; 2277 $self->update;
2086 2278
2087 $self 2279 $self
2088} 2280}
2089 2281
2282sub changed { }
2283
2090sub set_range { 2284sub set_range {
2091 my ($self, $range) = @_; 2285 my ($self, $range) = @_;
2092 2286
2093 $self->{range} = $range; 2287 ($range, $self->{range}) = ($self->{range}, $range);
2094 2288
2095 $self->update; 2289 $self->update
2290 if "@$range" ne "@{$self->{range}}";
2096} 2291}
2097 2292
2098sub set_value { 2293sub set_value {
2099 my ($self, $value) = @_; 2294 my ($self, $value) = @_;
2100 2295
… …
2111 if $unit; 2306 if $unit;
2112 2307
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2309
2115 if ($value != $old_value) { 2310 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2311 $self->_emit (changed => $value);
2117 $self->update; 2312 $self->update;
2118 } 2313 }
2119} 2314}
2120 2315
2121sub size_request { 2316sub size_request {
2122 my ($self) = @_; 2317 my ($self) = @_;
2123 2318
2124 my $w = $self->{req_w}; 2319 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2320}
2129 2321
2130sub button_down { 2322sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2323 my ($self, $ev, $x, $y) = @_;
2132 2324
2133 $self->SUPER::button_down ($ev, $x, $y); 2325 $self->SUPER::button_down ($ev, $x, $y);
2134 2326
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136 2328
2137 $self->mouse_motion ($ev, $x, $y); 2329 $self->mouse_motion ($ev, $x, $y)
2138} 2330}
2139 2331
2140sub mouse_motion { 2332sub mouse_motion {
2141 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2142 2334
… …
2146 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2338 my (undef, $lo, $hi, $page) = @{$self->{range}};
2147 2339
2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2340 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149 2341
2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2342 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2343 } else {
2344 return 0;
2345 }
2346
2151 } 2347 1
2152} 2348}
2153 2349
2154sub update { 2350sub update {
2155 my ($self) = @_; 2351 my ($self) = @_;
2156 2352
2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2353 delete $self->{knob_w};
2354 $self->SUPER::update;
2355}
2356
2357sub _draw {
2358 my ($self) = @_;
2359
2360 unless ($self->{knob_w}) {
2158 $self->set_value ($self->{range}[0]); 2361 $self->set_value ($self->{range}[0]);
2159 2362
2160 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2363 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100; 2364 my $range = ($hi - $page - $lo) || 1e-100;
2162 2365
… …
2168 $value = ($value - $lo) / $range; 2371 $value = ($value - $lo) / $range;
2169 $value = $value * $self->{scale} + $self->{offset}; 2372 $value = $value * $self->{scale} + $self->{offset};
2170 2373
2171 $self->{knob_x} = $value - $knob_w * 0.5; 2374 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $knob_w; 2375 $self->{knob_w} = $knob_w;
2173 }); 2376 }
2174
2175 $self->SUPER::update;
2176}
2177
2178sub _draw {
2179 my ($self) = @_;
2180 2377
2181 $self->SUPER::_draw (); 2378 $self->SUPER::_draw ();
2182 2379
2183 glScale $self->{w}, $self->{h}; 2380 glScale $self->{w}, $self->{h};
2184 2381
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2490 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2491
2295 $self->reflow; 2492 $self->reflow;
2296} 2493}
2297 2494
2298sub text_height { 2495sub text_size {
2299 my ($self, $text, $indent) = @_; 2496 my ($self, $text, $indent) = @_;
2300 2497
2301 my $layout = $self->{layout}; 2498 my $layout = $self->{layout};
2302 2499
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2501 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2502 $layout->set_markup ($text);
2306 2503
2307 ($layout->size)[1] 2504 $layout->size
2308} 2505}
2309 2506
2310sub reflow { 2507sub reflow {
2311 my ($self) = @_; 2508 my ($self) = @_;
2312 2509
… …
2331 2528
2332sub add_paragraph { 2529sub add_paragraph {
2333 my ($self, $color, $text, $indent) = @_; 2530 my ($self, $color, $text, $indent) = @_;
2334 2531
2335 for my $line (split /\n/, $text) { 2532 for my $line (split /\n/, $text) {
2336 my $height = $self->text_height ($line); 2533 my ($w, $h) = $self->text_size ($line);
2337 $self->{height} += $height; 2534 $self->{height} += $h;
2338 push @{$self->{par}}, [$height, $color, $indent, $line]; 2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2339 } 2536 }
2340 2537
2341 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2342} 2539}
2343 2540
… …
2349 return unless $self->{h} > 0; 2546 return unless $self->{h} > 0;
2350 2547
2351 delete $self->{texture}; 2548 delete $self->{texture};
2352 2549
2353 $ROOT->on_post_alloc ($self, sub { 2550 $ROOT->on_post_alloc ($self, sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552
2354 if (delete $self->{need_reflow}) { 2553 if (delete $self->{need_reflow}) {
2355 my $height = 0; 2554 my $height = 0;
2356 2555
2357 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2358 for @{$self->{par}}; 2560 for (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2562 $layout->set_width ($W - $_->[3]);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3];
2566 $_->[1] = $h;
2567 }
2568
2569 $height += $_->[1];
2570 }
2359 2571
2360 $self->{height} = $height; 2572 $self->{height} = $height;
2361 2573
2362 $self->{children}[1]->set_range ([$height, 0, $height, $self->{h}, 1]); 2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2363 2575
2364 delete $self->{texture}; 2576 delete $self->{texture};
2365 } 2577 }
2366 2578
2367 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2368 glClearColor 0.5, 0.5, 0.5, 0; 2580 glClearColor 0.5, 0.5, 0.5, 0;
2369 glClear GL_COLOR_BUFFER_BIT; 2581 glClear GL_COLOR_BUFFER_BIT;
2370 2582
2371 my $top = int $self->{children}[1]{range}[0]; 2583 my $top = int $self->{children}[1]{range}[0];
2372 2584
2373 my $y0 = $top; 2585 my $y0 = $top;
2374 my $y1 = $top + $self->{h}; 2586 my $y1 = $top + $H;
2375 2587
2376 my $y = 0; 2588 my $y = 0;
2377 2589
2378 my $layout = $self->{layout}; 2590 my $layout = $self->{layout};
2379 2591
2380 $layout->set_font ($self->{font}) if $self->{font}; 2592 $layout->set_font ($self->{font}) if $self->{font};
2381 2593
2382 glEnable GL_BLEND; 2594 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off
2383 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2384 2597
2385 for my $par (@{$self->{par}}) { 2598 for my $par (@{$self->{par}}) {
2386 my $h = $par->[0]; 2599 my $h = $par->[1];
2387 2600
2388 if ($y0 < $y + $h && $y < $y1) { 2601 if ($y0 < $y + $h && $y < $y1) {
2389 $layout->set_foreground (@{ $par->[1] }); 2602 $layout->set_foreground (@{ $par->[2] });
2390 $layout->set_width ($self->{w} - $par->[2]); 2603 $layout->set_width ($W - $par->[3]);
2391 $layout->set_markup ($par->[3]); 2604 $layout->set_markup ($par->[4]);
2392 2605
2393 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2606 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2394 2607
2395 glRasterPos $par->[2], $y - $y0; 2608 glRasterPos $par->[3], $y - $y0;
2396 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2397 } 2610 }
2398 2611
2399 $y += $h; 2612 $y += $h;
2400 } 2613 }
… …
2467 2680
2468sub new { 2681sub new {
2469 my $class = shift; 2682 my $class = shift;
2470 2683
2471 my $self = $class->SUPER::new ( 2684 my $self = $class->SUPER::new (
2472 state => 0, 2685 state => 0,
2473 connect_activate => \&toggle_flopper, 2686 on_activate => \&toggle_flopper,
2474 @_ 2687 @_
2475 ); 2688 );
2476 2689
2477 if ($self->{state}) {
2478 $self->{state} = 0;
2479 $self->toggle_flopper;
2480 }
2481
2482 $self 2690 $self
2483} 2691}
2484 2692
2485sub toggle_flopper { 2693sub toggle_flopper {
2486 my ($self) = @_; 2694 my ($self) = @_;
2487 2695
2488 # TODO: use animation 2696 $self->{other}->toggle_visibility;
2489 if ($self->{state} = !$self->{state}) {
2490 $CFClient::UI::ROOT->add ($self->{other});
2491 $self->{other}->move ($self->coord2global (0, $self->{h}));
2492 $self->emit ("open");
2493 } else {
2494 $CFClient::UI::ROOT->remove ($self->{other});
2495 $self->emit ("close");
2496 }
2497
2498 $self->emit (changed => $self->{state});
2499} 2697}
2500 2698
2501############################################################################# 2699#############################################################################
2502 2700
2503package CFClient::UI::Tooltip; 2701package CFClient::UI::Tooltip;
… …
2516} 2714}
2517 2715
2518sub set_tooltip_from { 2716sub set_tooltip_from {
2519 my ($self, $widget) = @_; 2717 my ($self, $widget) = @_;
2520 2718
2719 my $tooltip = $widget->{tooltip};
2720
2721 if ($ENV{CFPLUS_DEBUG} & 2) {
2722 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}";
2726 }
2727
2521 $self->add (new CFClient::UI::Label 2728 $self->add (new CFClient::UI::Label
2522 markup => $widget->{tooltip}, 2729 markup => $tooltip,
2523 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2524 fontsize => 0.8, 2731 fontsize => 0.8,
2525 fg => [0, 0, 0, 1], 2732 fg => [0, 0, 0, 1],
2526 ellipsise => 0, 2733 ellipsise => 0,
2527 font => ($widget->{tooltip_font} || $::FONT_PROP), 2734 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2538 2745
2539sub size_allocate { 2746sub size_allocate {
2540 my ($self, $w, $h) = @_; 2747 my ($self, $w, $h) = @_;
2541 2748
2542 $self->SUPER::size_allocate ($w - 4, $h - 4); 2749 $self->SUPER::size_allocate ($w - 4, $h - 4);
2750}
2751
2752sub visibility_change {
2753 my ($self, $visible) = @_;
2754
2755 return unless $visible;
2756
2757 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner}
2759 or return;
2760
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH;
2765
2766 $self->move_abs ($x, $y);
2767 });
2543} 2768}
2544 2769
2545sub _draw { 2770sub _draw {
2546 my ($self) = @_; 2771 my ($self) = @_;
2547 2772
… …
2564 glVertex $w, $h; 2789 glVertex $w, $h;
2565 glVertex $w, 0; 2790 glVertex $w, 0;
2566 glEnd; 2791 glEnd;
2567 2792
2568 glTranslate 2 - 0.375, 2 - 0.375; 2793 glTranslate 2 - 0.375, 2 - 0.375;
2794
2569 $self->SUPER::_draw; 2795 $self->SUPER::_draw;
2570} 2796}
2571 2797
2572############################################################################# 2798#############################################################################
2573 2799
… …
2579 2805
2580sub new { 2806sub new {
2581 my $class = shift; 2807 my $class = shift;
2582 2808
2583 my $self = $class->SUPER::new ( 2809 my $self = $class->SUPER::new (
2584 aspect => 1, 2810 aspect => 1,
2811 can_events => 0,
2585 @_, 2812 @_,
2586 ); 2813 );
2587 2814
2588 if ($self->{anim} && $self->{animspeed}) { 2815 if ($self->{anim} && $self->{animspeed}) {
2589 Scalar::Util::weaken (my $widget = $self); 2816 Scalar::Util::weaken (my $widget = $self);
… …
2648 $self->SUPER::DESTROY; 2875 $self->SUPER::DESTROY;
2649} 2876}
2650 2877
2651############################################################################# 2878#############################################################################
2652 2879
2653package CFClient::UI::InventoryItem; 2880package CFClient::UI::Buttonbar;
2654 2881
2655our @ISA = CFClient::UI::HBox::; 2882our @ISA = CFClient::UI::HBox::;
2656 2883
2657sub _item_to_desc { 2884# TODO: should actualyl wrap buttons and other goodies.
2658 my ($item) = @_;
2659
2660 my $desc =
2661 $item->{nrof} < 2
2662 ? $item->{name}
2663 : "$item->{nrof} × $item->{name_pl}";
2664
2665 $item->{flags} & Crossfire::Protocol::F_OPEN
2666 and $desc .= " (open)";
2667 $item->{flags} & Crossfire::Protocol::F_APPLIED
2668 and $desc .= " (applied)";
2669 $item->{flags} & Crossfire::Protocol::F_UNPAID
2670 and $desc .= " (unpaid)";
2671 $item->{flags} & Crossfire::Protocol::F_MAGIC
2672 and $desc .= " (magic)";
2673 $item->{flags} & Crossfire::Protocol::F_CURSED
2674 and $desc .= " (cursed)";
2675 $item->{flags} & Crossfire::Protocol::F_DAMNED
2676 and $desc .= " (damned)";
2677 $item->{flags} & Crossfire::Protocol::F_LOCKED
2678 and $desc .= " *";
2679
2680 $desc
2681}
2682
2683sub new {
2684 my $class = shift;
2685
2686 my %args = @_;
2687
2688 my $item = delete $args{item};
2689
2690 my $desc = _item_to_desc ($item);
2691
2692 my $self = $class->SUPER::new (
2693 can_hover => 1,
2694 can_events => 1,
2695 tooltip => ((CFClient::UI::Label::escape $desc)
2696 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2697 connect_button_down => sub {
2698 my ($self, $ev, $x, $y) = @_;
2699
2700 # todo: maybe put examine on 1? but should just be a tooltip :(
2701 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2702 my $targ = $::CONN->{player}{tag};
2703
2704 if ($item->{container} == $::CONN->{player}{tag}) {
2705 $targ = $main::OPENCONT;
2706 }
2707
2708 $::CONN->send ("move $targ $item->{tag} 0");
2709 } elsif ($ev->{button} == 1) {
2710 $::CONN->send ("examine $item->{tag}");
2711 } elsif ($ev->{button} == 2) {
2712 $::CONN->send ("apply $item->{tag}");
2713 } elsif ($ev->{button} == 3) {
2714 my @menu_items = (
2715 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2716 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2717 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2718 (
2719 $item->{flags} & Crossfire::Protocol::F_LOCKED
2720 ? (
2721 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2722 )
2723 : (
2724 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2725 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2726 )
2727 ),
2728 );
2729
2730 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2731 }
2732
2733 1
2734 },
2735 %args
2736 );
2737
2738
2739 $self->add (new CFClient::UI::Face
2740 can_events => 0,
2741 face => $item->{face},
2742 anim => $item->{anim},
2743 animspeed => $item->{animspeed},
2744 );
2745
2746 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2747
2748 $self->{item} = $item;
2749
2750 $self->update_item;
2751
2752 $self
2753}
2754
2755sub update_item {
2756 my ($self) = @_;
2757
2758 my $desc = _item_to_desc ($self->{item});
2759
2760 $self->{name_lbl}->set_text ($desc);
2761}
2762
2763#############################################################################
2764
2765package CFClient::UI::Inventory;
2766
2767our @ISA = CFClient::UI::ScrolledWindow::;
2768
2769sub new {
2770 my $class = shift;
2771
2772 my $self = $class->SUPER::new (
2773 scrolled => (new CFClient::UI::Table),
2774 @_,
2775 );
2776
2777 $self
2778}
2779
2780sub set_items {
2781 my ($self, $items) = @_;
2782
2783 $self->{scrolled}->clear;
2784 return unless $items;
2785
2786 my @items = sort {
2787 ($a->{type} <=> $b->{type})
2788 or ($a->{name} cmp $b->{name})
2789 } @$items;
2790
2791 $self->{real_items} = \@items;
2792
2793 for my $item (@items) {
2794 $item->{item} = $item;
2795 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2796 $item->update_item ();
2797 }
2798
2799 my $i = 0;
2800 for (@items) {
2801 $self->{scrolled}->add (0, $i, $_);
2802 my $nrof = $_->{item}->{nrof} || 1;
2803 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2804 }
2805
2806# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812}
2813 2885
2814############################################################################# 2886#############################################################################
2815 2887
2816package CFClient::UI::Menu; 2888package CFClient::UI::Menu;
2817 2889
… …
2851 2923
2852# popup given the event (must be a mouse button down event currently) 2924# popup given the event (must be a mouse button down event currently)
2853sub popup { 2925sub popup {
2854 my ($self, $ev) = @_; 2926 my ($self, $ev) = @_;
2855 2927
2856 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2857 2929
2858 # maybe save $GRAB? must be careful about events... 2930 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 2931 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 2932 $self->{button} = $ev->{button};
2861 2933
2862 $self->show; 2934 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 2936}
2865 2937
2866sub mouse_motion { 2938sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 2939 my ($self, $ev, $x, $y) = @_;
2868 2940
2869 # TODO: should use vbox->find_widget or so 2941 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 2943 $self->{hover} = $self->{item}{$HOVER};
2944
2945 0
2872} 2946}
2873 2947
2874sub button_up { 2948sub button_up {
2875 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2876 2950
2877 if ($ev->{button} == $self->{button}) { 2951 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB; 2952 undef $GRAB;
2879 $self->hide; 2953 $self->hide;
2880 2954
2881 $self->emit ("popdown"); 2955 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 2956 $self->{hover}[1]->() if $self->{hover};
2957 } else {
2958 return 0
2959 }
2960
2961 1
2962}
2963
2964#############################################################################
2965
2966package CFClient::UI::Multiplexer;
2967
2968our @ISA = CFClient::UI::Container::;
2969
2970sub new {
2971 my $class = shift;
2972
2973 my $self = $class->SUPER::new (
2974 @_,
2975 );
2976
2977 $self->{current} = $self->{children}[0]
2978 if @{ $self->{children} };
2979
2980 $self
2981}
2982
2983sub add {
2984 my ($self, @widgets) = @_;
2985
2986 $self->SUPER::add (@widgets);
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990}
2991
2992sub set_current_page {
2993 my ($self, $page_or_widget) = @_;
2994
2995 my $widget = ref $page_or_widget
2996 ? $page_or_widget
2997 : $self->{children}[$page_or_widget];
2998
2999 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001
3002 $self->_emit (page_changed => $self->{current});
3003
3004 $self->realloc;
3005}
3006
3007sub visible_children {
3008 $_[0]{current}
3009}
3010
3011sub size_request {
3012 my ($self) = @_;
3013
3014 $self->{current}->size_request
3015}
3016
3017sub size_allocate {
3018 my ($self, $w, $h) = @_;
3019
3020 $self->{current}->configure (0, 0, $w, $h);
3021}
3022
3023sub _draw {
3024 my ($self) = @_;
3025
3026 $self->{current}->draw;
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::Notebook;
3032
3033our @ISA = CFClient::UI::VBox::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (
3039 buttonbar => (new CFClient::UI::Buttonbar),
3040 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3041 # filter => # will be put between multiplexer and $self
3042 @_,
3043 );
2883 } 3044
3045 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3046 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3047
3048 $self
3049}
3050
3051sub add {
3052 my ($self, $title, $widget, $tooltip) = @_;
3053
3054 Scalar::Util::weaken $self;
3055
3056 $self->{buttonbar}->add (new CFClient::UI::Button
3057 markup => $title,
3058 tooltip => $tooltip,
3059 on_activate => sub { $self->set_current_page ($widget) },
3060 );
3061
3062 $self->{multiplexer}->add ($widget);
3063}
3064
3065sub set_current_page {
3066 my ($self, $page) = @_;
3067
3068 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current});
2884} 3070}
2885 3071
2886############################################################################# 3072#############################################################################
2887 3073
2888package CFClient::UI::Statusbox; 3074package CFClient::UI::Statusbox;
… …
2948sub add { 3134sub add {
2949 my ($self, $text, %arg) = @_; 3135 my ($self, $text, %arg) = @_;
2950 3136
2951 $text =~ s/^\s+//; 3137 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3138 $text =~ s/\s+$//;
3139
3140 return unless $text;
2953 3141
2954 my $timeout = time + ((delete $arg{timeout}) || 60); 3142 my $timeout = time + ((delete $arg{timeout}) || 60);
2955 3143
2956 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2957 3145
… …
2991 $self->SUPER::reconfigure; 3179 $self->SUPER::reconfigure;
2992} 3180}
2993 3181
2994############################################################################# 3182#############################################################################
2995 3183
2996package CFClient::UI::Root; 3184package CFClient::UI::Inventory;
2997 3185
2998our @ISA = CFClient::UI::Container::; 3186our @ISA = CFClient::UI::ScrolledWindow::;
2999
3000use CFClient::OpenGL;
3001 3187
3002sub new { 3188sub new {
3003 my $class = shift; 3189 my $class = shift;
3004 3190
3005 $class->SUPER::new ( 3191 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3193 @_,
3194 );
3195
3196 $self
3197}
3198
3199sub set_items {
3200 my ($self, $items) = @_;
3201
3202 $self->{child}->clear;
3203 return unless $items;
3204
3205 my @items = sort {
3206 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name})
3208 } @$items;
3209
3210 $self->{real_items} = \@items;
3211
3212 my $row = 0;
3213 for my $item (@items) {
3214 CFClient::Item::update_widgets $item;
3215
3216 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget});
3219
3220 $row++;
3221 }
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 }
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::SpellList;
3424
3425our @ISA = CFClient::UI::Table::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
3431 binding => [],
3432 commands => [],
3006 @_, 3433 @_,
3007 ) 3434 )
3008} 3435}
3009 3436
3010sub configure { 3437# XXX: Do sorting? Argl...
3011 my ($self, $x, $y, $w, $h) = @_; 3438sub add_spell {
3012
3013 $self->{w} = $w;
3014 $self->{h} = $h;
3015}
3016
3017sub check_size {
3018 my ($self) = @_; 3439 my ($self, $spell) = @_;
3440 $self->{spells}->{$spell->{name}} = $spell;
3019 3441
3020 $self->size_allocate ($self->{w}, $self->{h}) 3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3021 if $self->{w}; 3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469}
3470
3471sub remove_spell {
3472 my ($self, $spell) = @_;
3473 delete $self->{spells}->{$spell->{name}};
3474 $self->rebuild_spell_list;
3475}
3476
3477#############################################################################
3478
3479package CFClient::UI::Root;
3480
3481our @ISA = CFClient::UI::Container::;
3482
3483use CFClient::OpenGL;
3484
3485sub new {
3486 my $class = shift;
3487
3488 my $self = $class->SUPER::new (
3489 visible => 1,
3490 @_,
3491 );
3492
3493 Scalar::Util::weaken ($self->{root} = $self);
3494
3495 $self
3022} 3496}
3023 3497
3024sub size_request { 3498sub size_request {
3025 my ($self) = @_; 3499 my ($self) = @_;
3026 3500
3027 ($self->{w}, $self->{h}) 3501 ($self->{w}, $self->{h})
3502}
3503
3504sub _to_pixel {
3505 my ($coord, $size, $max) = @_;
3506
3507 $coord =
3508 $coord eq "center" ? ($max - $size) * 0.5
3509 : $coord eq "max" ? $max
3510 : $coord;
3511
3512 $coord = 0 if $coord < 0;
3513 $coord = $max - $size if $coord > $max - $size;
3514
3515 int $coord + 0.5
3028} 3516}
3029 3517
3030sub size_allocate { 3518sub size_allocate {
3031 my ($self, $w, $h) = @_; 3519 my ($self, $w, $h) = @_;
3032 3520
3033 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3034 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3035
3036 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3037 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3038
3039 for my $child ($self->children) { 3521 for my $child ($self->children) {
3040 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3041 3523
3042 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3524 $X = $child->{force_x} if exists $child->{force_x};
3043 if exists $child->{req_x}; 3525 $Y = $child->{force_y} if exists $child->{force_y};
3044 3526
3045 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3527 $X = _to_pixel $X, $W, $self->{w};
3046 if exists $child->{req_y}; 3528 $Y = _to_pixel $Y, $H, $self->{h};
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3529
3051 $child->configure ($X, $Y, $W, $H); 3530 $child->configure ($X, $Y, $W, $H);
3052 } 3531 }
3053} 3532}
3054 3533
… …
3065} 3544}
3066 3545
3067sub update { 3546sub update {
3068 my ($self) = @_; 3547 my ($self) = @_;
3069 3548
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3549 $::WANT_REFRESH++;
3072} 3550}
3073 3551
3074sub add { 3552sub add {
3075 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3076 3554
3077 for my $child (@children) {
3078 $child->{toplevel} = 1; 3555 $_->{is_toplevel} = 1
3079 3556 for @children;
3080 # integerise window positions
3081 $child->{x} = int $child->{x};
3082 $child->{y} = int $child->{y};
3083 }
3084 3557
3085 $self->SUPER::add (@children); 3558 $self->SUPER::add (@children);
3559}
3560
3561sub remove {
3562 my ($self, @children) = @_;
3563
3564 $self->SUPER::remove (@children);
3565
3566 delete $self->{is_toplevel}
3567 for @children;
3086 3568
3087 while (@children) { 3569 while (@children) {
3088 my $w = pop @children; 3570 my $w = pop @children;
3089 push @children, $w->children; 3571 push @children, $w->children;
3090 $w->{visible} = 1; 3572 $w->set_invisible;
3091 }
3092}
3093
3094sub remove {
3095 my ($self, @children) = @_;
3096
3097 $self->SUPER::remove (@children);
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 delete $w->{visible};
3103 } 3573 }
3104} 3574}
3105 3575
3106sub on_refresh { 3576sub on_refresh {
3107 my ($self, $id, $cb) = @_; 3577 my ($self, $id, $cb) = @_;
… …
3121 while ($self->{refresh_hook}) { 3591 while ($self->{refresh_hook}) {
3122 $_->() 3592 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3593 for values %{delete $self->{refresh_hook}};
3124 } 3594 }
3125 3595
3126 if ($self->{check_size}) { 3596 if ($self->{realloc}) {
3127 my @queue = ([], []); 3597 my %queue;
3598 my @queue;
3599 my $widget;
3128 3600
3129 for (;;) { 3601 outer:
3130 if ($self->{check_size}) { 3602 while () {
3131 # heuristic: check containers last 3603 if (my $realloc = delete $self->{realloc}) {
3132 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3604 for $widget (values %$realloc) {
3133 for values %{delete $self->{check_size}} 3605 $widget->{visible} or next; # do not resize invisible widgets
3606
3607 $queue{$widget+0}++ and next; # duplicates are common
3608
3609 push @{ $queue[$widget->{visible}] }, $widget;
3610 }
3134 } 3611 }
3135 3612
3136 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3613 while () {
3614 @queue or last outer;
3137 3615
3138 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3616 $widget = pop @{ $queue[-1] || [] }
3139 ? @$widget{qw(user_w user_h)} 3617 and last;
3140 : $widget->size_request;
3141
3142 if (delete $widget->{force_alloc}
3143 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3144 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3145 3618
3619 pop @queue;
3620 }
3621
3622 delete $queue{$widget+0};
3623
3624 my ($w, $h) = $widget->size_request;
3625
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3628
3629 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h};
3631
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3633 || delete $widget->{force_realloc}) {
3146 $widget->{req_w} = $w; 3634 $widget->{req_w} = $w;
3147 $widget->{req_h} = $h; 3635 $widget->{req_h} = $h;
3148 3636
3149 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3637 $self->{size_alloc}{$widget+0} = $widget;
3150 3638
3151 $widget->{parent}->check_size
3152 if $widget->{parent}; 3639 if (my $parent = $widget->{parent}) {
3640 $self->{realloc}{$parent+0} = $parent
3641 unless $queue{$parent+0};
3642
3643 $parent->{force_size_alloc} = 1;
3644 $self->{size_alloc}{$parent+0} = $parent;
3645 }
3153 } 3646 }
3647
3648 delete $self->{realloc}{$widget+0};
3154 } 3649 }
3155 } 3650 }
3156 3651
3157 while ($self->{size_alloc}) { 3652 while (my $size_alloc = delete $self->{size_alloc}) {
3158 for (values %{delete $self->{size_alloc}}) { 3653 my @queue = sort { $b->{visible} <=> $a->{visible} }
3159 my ($widget, $w, $h) = @$_; 3654 values %$size_alloc;
3655
3656 while () {
3657 my $widget = pop @queue || last;
3658
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3160 3660
3161 $w = 0 if $w < 0; 3661 $w = 0 if $w < 0;
3162 $h = 0 if $h < 0; 3662 $h = 0 if $h < 0;
3163 3663
3664 $w = int $w + 0.5;
3665 $h = int $h + 0.5;
3666
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3668 $widget->{old_w} = $widget->{w};
3669 $widget->{old_h} = $widget->{h};
3670
3164 $widget->{w} = $w; 3671 $widget->{w} = $w;
3165 $widget->{h} = $h; 3672 $widget->{h} = $h;
3166 $widget->size_allocate ($w, $h); 3673
3167 $widget->emit (size_allocate => $w, $h); 3674 $widget->emit (size_allocate => $w, $h);
3675 }
3168 } 3676 }
3169 } 3677 }
3170 3678
3171 while ($self->{post_alloc_hook}) { 3679 while ($self->{post_alloc_hook}) {
3172 $_->() 3680 $_->()
3173 for values %{delete $self->{post_alloc_hook}}; 3681 for values %{delete $self->{post_alloc_hook}};
3174 } 3682 }
3683
3175 3684
3176 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3685 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3177 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3178 glClear GL_COLOR_BUFFER_BIT; 3687 glClear GL_COLOR_BUFFER_BIT;
3179 3688
… …
3181 glLoadIdentity; 3690 glLoadIdentity;
3182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3183 glMatrixMode GL_MODELVIEW; 3692 glMatrixMode GL_MODELVIEW;
3184 glLoadIdentity; 3693 glLoadIdentity;
3185 3694
3695 {
3696 package CFClient::UI::Base;
3697
3698 ($draw_x, $draw_y, $draw_w, $draw_h) =
3699 (0, 0, $self->{w}, $self->{h});
3700 }
3701
3186 $self->_draw; 3702 $self->_draw;
3187} 3703}
3188 3704
3189############################################################################# 3705#############################################################################
3190 3706

Diff Legend

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