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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $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 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $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}; 181 $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}; 182 $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}; 183 $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}; 184 $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}; 185 $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}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
166 } 190 }
167
168 $widget->reconfigure;
169 } 191 }
192
193 reconfigure_widgets;
170} 194}
171 195
172############################################################################# 196#############################################################################
173 197
174package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $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 264
229sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
278 delete $self->{visible};
231 279
232 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
234 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
235 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
236 if $self->{parent}; 314 if $self->{parent};
237} 315}
238 316
239sub move { 317sub move_abs {
240 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
241 319
242 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
245 323
246 $self->update; 324 $self->update;
247} 325}
248 326
249sub set_size { 327sub set_size {
250 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
251 329
252 $self->{user_w} = $w; 330 $self->{force_w} = $w;
253 $self->{user_h} = $h; 331 $self->{force_h} = $h;
254 332
255 $self->check_size; 333 $self->realloc;
256} 334}
257 335
258sub size_request { 336sub size_request {
259 require Carp; 337 require Carp;
260 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
262 340
263sub configure { 341sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
265 343
266 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
269 349
270 # use alignment to adjust x, y 350 # use alignment to adjust x, y
271 351
272 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 354 }
277 355
278 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 357 $self->{x} = $x;
280 $self->{y} = $y; 358 $self->{y} = $y;
281 $self->update; 359 $self->update;
282 } 360 }
283 361
284 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
286 } 369 }
287} 370}
288 371
289sub size_allocate { 372sub size_allocate {
290 # nothing to be done 373 # nothing to be done
291} 374}
292 375
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
301} 382}
302 383
303sub set_max_size { 384sub set_max_size {
304 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
305 386
306 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
308} 391}
309 392
310sub set_tooltip { 393sub set_tooltip {
311 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
312 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
313 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
314 402
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
318 } 406 }
319} 407}
320 408
321# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
322sub coord2local { 410sub coord2local {
… …
338 return if $FOCUS == $self; 426 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
340 428
341 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
342 430
343 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
344 432
345 $focus->update if $focus; 433 $focus->update if $focus;
346 $FOCUS->update; 434 $FOCUS->update;
347} 435}
348 436
… …
351 439
352 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
353 441
354 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
355 443
356 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
357 445
358 $focus->update if $focus; #? 446 $focus->update if $focus; #?
359}
360 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
361sub mouse_motion { } 452sub mouse_motion { 0 }
362sub button_up { } 453sub button_up { 0 }
363sub key_down { } 454sub key_down { 0 }
364sub key_up { } 455sub key_up { 0 }
365 456
366sub button_down { 457sub button_down {
367 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
368 459
369 $self->focus_in; 460 $self->focus_in;
370}
371 461
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
376sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc;
536 $self->update;
537}
538
539# using global variables seems a bit hacky, but passing through all drawing
540# functions seems pointless.
541our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377 542
378sub draw { 543sub draw {
379 my ($self) = @_; 544 my ($self) = @_;
380 545
381 return unless $self->{h} && $self->{w}; 546 return unless $self->{h} && $self->{w};
547
548 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553
554 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382 557
383 glPushMatrix; 558 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 560
388 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 563 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 565 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; 566 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 567 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 568 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 569 glVertex 0 , $self->{h};
412 glEnd; 570 glEnd;
571 glDisable GL_BLEND;
572 }
573
574 if ($ENV{CFPLUS_DEBUG} & 1) {
575 glPushMatrix;
576 glColor 1, 1, 0, 1;
577 glTranslate 0.375, 0.375;
578 glBegin GL_LINE_LOOP;
579 glVertex 0 , 0;
580 glVertex $self->{w} - 1, 0;
581 glVertex $self->{w} - 1, $self->{h} - 1;
582 glVertex 0 , $self->{h} - 1;
583 glEnd;
413 glPopMatrix; 584 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
416} 590}
417 591
418sub _draw { 592sub _draw {
419 my ($self) = @_; 593 my ($self) = @_;
420 594
421 warn "no draw defined for $self\n"; 595 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} 596}
473 597
474sub DESTROY { 598sub DESTROY {
475 my ($self) = @_; 599 my ($self) = @_;
476 600
… …
508 632
509 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
511 635
512 glEnable GL_BLEND; 636 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 638 glColor_premultiply @$color;
515 639
516 glBegin GL_QUADS; 640 glBegin GL_QUADS;
517 glVertex 0 , 0; 641 glVertex 0 , 0;
518 glVertex 0 , $h; 642 glVertex 0 , $h;
519 glVertex $w, $h; 643 glVertex $w, $h;
… …
534 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
536} 660}
537 661
538sub size_request { 662sub size_request {
539 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
540} 666}
541 667
542sub draw { } 668sub draw { }
543 669
544############################################################################# 670#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
549 675
550sub new { 676sub new {
551 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
552 678
553 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
554 680
555 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
556 children => [], 682 children => [],
557 can_events => 0, 683 can_events => 0,
558 %arg, 684 %arg,
559 ); 685 );
686
560 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
561 689
562 $self 690 $self
563} 691}
564 692
565sub add { 693sub add {
… …
573 $self->{children} = [ 701 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 703 @{$self->{children}}, @widgets
576 ]; 704 ];
577 705
578 $self->check_size (1); 706 $self->realloc;
579 $self->update;
580} 707}
581 708
582sub children { 709sub children {
583 @{ $_[0]{children} } 710 @{ $_[0]{children} }
584} 711}
… …
589 delete $child->{parent}; 716 delete $child->{parent};
590 $child->hide; 717 $child->hide;
591 718
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 720
594 $self->check_size; 721 $self->realloc;
595 $self->update;
596} 722}
597 723
598sub clear { 724sub clear {
599 my ($self) = @_; 725 my ($self) = @_;
600 726
… …
604 for (@$children) { 730 for (@$children) {
605 delete $_->{parent}; 731 delete $_->{parent};
606 $_->hide; 732 $_->hide;
607 } 733 }
608 734
609 $self->check_size; 735 $self->realloc;
610 $self->update;
611} 736}
612 737
613sub find_widget { 738sub find_widget {
614 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
615 740
616 $x -= $self->{x}; 741 $x -= $self->{x};
617 $y -= $self->{y}; 742 $y -= $self->{y};
618 743
619 my $res; 744 my $res;
620 745
621 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
623 and return $res; 748 and return $res;
624 } 749 }
625 750
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
675 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
676} 801}
677 802
678############################################################################# 803#############################################################################
679 804
805# back-buffered drawing area
806
680package CFClient::UI::Window; 807package CFClient::UI::Window;
681 808
682our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
683 810
684use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
702 $self->SUPER::size_allocate ($w, $h); 829 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 830 $self->update;
704} 831}
705 832
706sub _render { 833sub _render {
834 my ($self) = @_;
835
707 $_[0]{children}[0]->draw; 836 $self->{children}[0]->draw;
708} 837}
709 838
710sub render_child { 839sub render_child {
711 my ($self) = @_; 840 my ($self) = @_;
712 841
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 843 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 844 glClear GL_COLOR_BUFFER_BIT;
716 845
846 {
847 package CFClient::UI::Base;
848
849 ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h});
851 }
852
717 $self->_render; 853 $self->_render;
718 }; 854 };
719} 855}
720 856
721sub _draw { 857sub _draw {
722 my ($self) = @_; 858 my ($self) = @_;
723 859
724 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
725 861
726 my $tex = $self->{texture} 862 my $tex = $self->{texture}
727 or return; 863 or return;
728 864
729 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
732 868
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734 870
735 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
736} 872}
… …
739 875
740package CFClient::UI::ViewPort; 876package CFClient::UI::ViewPort;
741 877
742our @ISA = CFClient::UI::Window::; 878our @ISA = CFClient::UI::Window::;
743 879
880sub new {
881 my $class = shift;
882
883 $class->SUPER::new (
884 scroll_x => 0,
885 scroll_y => 1,
886 @_,
887 )
888}
889
744sub size_request { 890sub size_request {
745 my ($self) = @_; 891 my ($self) = @_;
746 892
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 893 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 894
749 @$self{qw(child_w child_h)} 895 $w = 10 if $self->{scroll_x};
896 $h = 10 if $self->{scroll_y};
897
898 ($w, $h)
750} 899}
751 900
752sub size_allocate { 901sub size_allocate {
753 my ($self, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
754 903
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 904 my $child = $self->child;
756# $w = $self->{w}; 905
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908
757 $self->child->configure (0, 0, $cw, $ch); 909 $self->child->configure (0, 0, $w, $h);
758 $self->update; 910 $self->update;
759} 911}
760 912
761sub set_offset { 913sub set_offset {
762 my ($self, $x, $y) = @_; 914 my ($self, $x, $y) = @_;
… …
796} 948}
797 949
798sub _render { 950sub _render {
799 my ($self) = @_; 951 my ($self) = @_;
800 952
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
955
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 957
803 $self->SUPER::_render; 958 $self->SUPER::_render;
804} 959}
805 960
… …
808package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
809 964
810our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
811 966
812sub new { 967sub new {
813 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
814 971
815 my $self; 972 my $self;
816 973
817 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
818 vertical => 1, 975 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 976 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 977 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 978 $self->{vp}->set_offset (0, $_[1]);
822 }, 979 },
823 ; 980 ;
824 981
825 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
827 slider => $slider, 984 slider => $slider,
828 @_, 985 %arg,
829 ); 986 );
830 987
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
834 990
835 $self 991 $self
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->{vp}->add ($self->{child} = $widget);
998}
999
1000sub update {
1001 my ($self) = @_;
1002
1003 $self->SUPER::update;
1004
1005 # todo: overwrite size_allocate of child
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1008}
1009
1010sub size_allocate {
1011 my ($self, $w, $h) = @_;
1012
1013 $self->SUPER::size_allocate ($w, $h);
1014
1015 my $child = $self->{vp}->child;
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 1017}
837 1018
838#TODO# update range on size_allocate depending on child 1019#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 1020# update viewport offset on scroll
840 1021
… …
860 1041
861 if ($self->{bg}) { 1042 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
863 1044
864 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
867 1048
868 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
869 glVertex 0 , 0; 1050 glVertex 0 , 0;
870 glVertex 0 , $h; 1051 glVertex 0 , $h;
871 glVertex $w, $h; 1052 glVertex $w, $h;
… …
884 1065
885our @ISA = CFClient::UI::Bin::; 1066our @ISA = CFClient::UI::Bin::;
886 1067
887use CFClient::OpenGL; 1068use CFClient::OpenGL;
888 1069
889my @tex = 1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1075 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); 1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892 1077
893sub new { 1078sub new {
894 my $class = shift; 1079 my ($class, %arg) = @_;
895 1080
896 # TODO: user_x, user_y, overwrite moveto? 1081 my $title = delete $arg{title};
897 1082
898 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1086 border => 0.6,
902 toplevel => 1,
903 can_events => 1, 1087 can_events => 1,
904 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
905 ); 1091 );
906 1092
907 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
908 align => 0, 1094 align => 0,
909 valign => 1, 1095 valign => 1,
910 text => $self->{title}, 1096 text => $title,
911 fontsize => $self->{border}; 1097 fontsize => $self->{border}
1098 if defined $title;
912 1099
913 $self 1100 $self
1101}
1102
1103sub add {
1104 my ($self, @widgets) = @_;
1105
1106 $self->SUPER::add (@widgets);
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
914} 1108}
915 1109
916sub border { 1110sub border {
917 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
918} 1112}
919 1113
920sub size_request { 1114sub size_request {
921 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
922 1119
923 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
924 1121
925 ( 1122 (
926 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
929} 1126}
930 1127
931sub size_allocate { 1128sub size_allocate {
932 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
933 1130
1131 if ($self->{title}) {
1132 $self->{title}{w} = $w;
1133 $self->{title}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h);
1135 }
1136
1137 my $border = $self->border;
1138
934 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
935 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
936 1141
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); 1142 $self->child->configure ($border, $border, $w, $h);
941} 1143}
942 1144
943sub button_down { 1145sub button_down {
944 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
945 1147
… …
961 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
962 1164
963 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
965 1167
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1170
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size; 1172 $self->realloc;
970 }; 1173 };
971 1174
972 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1179 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
978 1181
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
980 1183
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update; 1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
983 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
984 } 1192 1
985} 1193}
986 1194
987sub button_up { 1195sub button_up {
988 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
989 1197
990 delete $self->{motion}; 1198 !!delete $self->{motion}
991} 1199}
992 1200
993sub mouse_motion { 1201sub mouse_motion {
994 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
995 1203
996 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
997} 1207}
998 1208
999sub _draw { 1209sub _draw {
1000 my ($self) = @_; 1210 my ($self) = @_;
1001 1211
1212 my $child = $self->{children}[0];
1213
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1216
1005 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1219
1008 my $border = $self->border; 1220 my $border = $self->border;
1009 1221
1010 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015 1227
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1018 1230
1019 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1234 $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); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1236 }
1030 1237
1031 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1032 1239
1033 $self->{title}->draw if $self->{title};
1034
1035 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1036} 1246}
1037 1247
1038############################################################################# 1248#############################################################################
1039 1249
1040package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1048sub new { 1258sub new {
1049 my $class = shift; 1259 my $class = shift;
1050 1260
1051 $class->SUPER::new ( 1261 $class->SUPER::new (
1052 col_expand => [], 1262 col_expand => [],
1053 @_ 1263 @_,
1054 ) 1264 )
1265}
1266
1267sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1269}
1056 1270
1057sub add { 1271sub add {
1058 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
1059 1273
1060 $child->set_parent ($self); 1274 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
1062 1276
1063 $child->check_size; 1277 $self->realloc;
1064} 1278}
1065 1279
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1280# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1281sub clear {
1072 my ($self) = @_; 1282 my ($self) = @_;
1073 1283
1074 my @children = $self->children; 1284 my @children = $self->children;
1075 delete $self->{children}; 1285 delete $self->{children};
… …
1077 for (@children) { 1287 for (@children) {
1078 delete $_->{parent}; 1288 delete $_->{parent};
1079 $_->hide; 1289 $_->hide;
1080 } 1290 }
1081 1291
1082 $self->update; 1292 $self->realloc;
1083} 1293}
1084 1294
1085sub get_wh { 1295sub get_wh {
1086 my ($self) = @_; 1296 my ($self) = @_;
1087 1297
… …
1118sub size_allocate { 1328sub size_allocate {
1119 my ($self, $w, $h) = @_; 1329 my ($self, $w, $h) = @_;
1120 1330
1121 my ($ws, $hs) = $self->get_wh; 1331 my ($ws, $hs) = $self->get_wh;
1122 1332
1123 my $req_w = sum @$ws; 1333 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1334 my $req_h = (sum @$hs) || 1;
1125 1335
1126 # TODO: nicer code && do row_expand 1336 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1337 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1338 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1339 my $col_expand = (sum @col_expand) || 1;
… …
1183 } 1393 }
1184} 1394}
1185 1395
1186############################################################################# 1396#############################################################################
1187 1397
1188package CFClient::UI::HBox; 1398package CFClient::UI::Box;
1189
1190# TODO: wrap into common Box base class
1191 1399
1192our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Container::;
1193 1401
1194sub size_request { 1402sub size_request {
1195 my ($self) = @_; 1403 my ($self) = @_;
1196 1404
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $self->{vertical}
1198 1406 ? (
1199 ( 1407 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1200 (List::Util::sum map $_->[0], @alloc), 1408 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201 (List::Util::max map $_->[1], @alloc), 1409 )
1202 ) 1410 : (
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 )
1203} 1414}
1204 1415
1205sub size_allocate { 1416sub size_allocate {
1206 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1207 1418
1208 ($h, $w) = ($w, $h); 1419 my $space = $self->{vertical} ? $h : $w;
1209
1210 my $children = $self->{children}; 1420 my $children = $self->{children};
1211 1421
1212 my @h = map $_->{req_w}, @$children; 1422 my @req;
1213 1423
1214 my $req_h = List::Util::sum @h; 1424 if ($self->{homogeneous}) {
1215 1425 @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 { 1426 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1428 my $req = List::Util::sum @req;
1429
1430 if ($req > $space) {
1431 # ah well, not enough space
1432 $_ *= $space / $req for @req;
1433 } else {
1220 my $exp = List::Util::sum map $_->{expand}, @$children; 1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221 $exp ||= 1;
1222 1435
1436 $space = ($space - $req) / $expand; # remaining space to give away
1437
1438 $req[$_] += $space * $children->[$_]{expand}
1223 for (0 .. $#$children) { 1439 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 } 1440 }
1230 } 1441 }
1231 1442
1232 CFClient::UI::harmonize \@h; 1443 CFClient::UI::harmonize \@req;
1233 1444
1234 my $y = 0; 1445 my $pos = 0;
1235 for (0 .. $#$children) { 1446 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_]; 1447 my $alloc = $req[$_];
1238 $child->configure ($y, 0, $h, $w); 1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239 1449
1240 $y += $h; 1450 $pos += $alloc;
1241 } 1451 }
1242 1452
1243 1 1453 1
1244} 1454}
1245 1455
1246############################################################################# 1456#############################################################################
1247 1457
1458package CFClient::UI::HBox;
1459
1460our @ISA = CFClient::UI::Box::;
1461
1462sub new {
1463 my $class = shift;
1464
1465 $class->SUPER::new (
1466 vertical => 0,
1467 @_,
1468 )
1469}
1470
1471#############################################################################
1472
1248package CFClient::UI::VBox; 1473package CFClient::UI::VBox;
1249 1474
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1475our @ISA = CFClient::UI::Box::;
1253 1476
1254sub size_request { 1477sub new {
1255 my ($self) = @_; 1478 my $class = shift;
1256 1479
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1480 $class->SUPER::new (
1258 1481 vertical => 1,
1259 ( 1482 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1483 )
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} 1484}
1303 1485
1304############################################################################# 1486#############################################################################
1305 1487
1306package CFClient::UI::Label; 1488package CFClient::UI::Label;
… …
1323 ellipsise => 3, # end 1505 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1325 fontsize => 1, 1507 fontsize => 1,
1326 align => -1, 1508 align => -1,
1327 valign => -1, 1509 valign => -1,
1328 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1329 can_events => 0, 1512 can_events => 0,
1330 %arg 1513 %arg
1331 ); 1514 );
1332 1515
1333 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1360 1543
1361 delete $self->{texture}; 1544 delete $self->{texture};
1362 $self->SUPER::update; 1545 $self->SUPER::update;
1363} 1546}
1364 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1365sub set_text { 1555sub set_text {
1366 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1367 1557
1368 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1369 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1370 1560
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1373 1563
1564 delete $self->{req_h};
1565 $self->realloc;
1374 $self->update; 1566 $self->update;
1375 $self->check_size;
1376} 1567}
1377 1568
1378sub set_markup { 1569sub set_markup {
1379 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1380 1571
… …
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1576
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1388 1579
1580 delete $self->{req_h};
1581 $self->realloc;
1389 $self->update; 1582 $self->update;
1390 $self->check_size;
1391} 1583}
1392 1584
1393sub size_request { 1585sub size_request {
1394 my ($self) = @_; 1586 my ($self) = @_;
1395 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1396 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1397 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1596
1402 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1403 1598
1404 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1405 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1406 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1407 1602
1408 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1409 1604
1410 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1412 } 1607 }
1413 1608
1609 ($w, $h)
1414 ( 1610 }
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 1611}
1419 1612
1420sub size_allocate { 1613sub size_allocate {
1421 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1422 1615
1616 delete $self->{ox};
1617
1423 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1424} 1620}
1425 1621
1426sub set_fontsize { 1622sub set_fontsize {
1427 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1428 1624
1429 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1430 delete $self->{texture}; 1626 delete $self->{texture};
1431 1627
1432 $self->update; 1628 $self->realloc;
1433 $self->check_size;
1434} 1629}
1435 1630
1436sub _draw { 1631sub _draw {
1437 my ($self) = @_; 1632 my ($self) = @_;
1438 1633
… …
1444 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 1643
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1450 1646
1647 unless (exists $self->{ox}) {
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1454 1651
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1460 }; 1655 };
1461 1656
1462 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 1658
1465 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 } 1666 }
1471 1667
1472 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1473} 1669}
… …
1502 1698
1503 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1504 1700
1505 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1506 1702
1507 delete $self->{texture};
1508
1509 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1510 $self->{text} = $text; 1704 $self->{text} = $text;
1511 1705
1512 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1514 1709
1515 $self->emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1516} 1714}
1517 1715
1518sub set_text { 1716sub set_text {
1519 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1520 1718
1521 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 1720 $self->_set_text ($text);
1523 $self->update;
1524 $self->check_size;
1525} 1721}
1526 1722
1527sub get_text { 1723sub get_text {
1528 $_[0]{text} 1724 $_[0]{text}
1529} 1725}
… …
1532 my ($self) = @_; 1728 my ($self) = @_;
1533 1729
1534 my ($w, $h) = $self->SUPER::size_request; 1730 my ($w, $h) = $self->SUPER::size_request;
1535 1731
1536 ($w + 1, $h) # add 1 for cursor 1732 ($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} 1733}
1544 1734
1545sub key_down { 1735sub key_down {
1546 my ($self, $ev) = @_; 1736 my ($self, $ev) = @_;
1547 1737
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1752 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1753 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1754 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1757 $self->_emit ('escape');
1568 } elsif ($uni) { 1758 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1570 } 1762 }
1571 1763
1572 $self->_set_text ($text); 1764 $self->_set_text ($text);
1573 $self->update; 1765
1574 $self->check_size; 1766 $self->realloc;
1767
1768 1
1575} 1769}
1576 1770
1577sub focus_in { 1771sub focus_in {
1578 my ($self) = @_; 1772 my ($self) = @_;
1579 1773
… …
1594 utf8::encode $text; 1788 utf8::encode $text;
1595 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1596 1790
1597 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1598 $self->update; 1792 $self->update;
1793
1794 1
1599} 1795}
1600 1796
1601sub mouse_motion { 1797sub mouse_motion {
1602 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1603# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800
1801 0
1604} 1802}
1605 1803
1606sub _draw { 1804sub _draw {
1607 my ($self) = @_; 1805 my ($self) = @_;
1608 1806
1609 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1610 1808
1611 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1612 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1613 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1614 } else { 1812 } else {
1615 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1616 } 1814 }
1617 1815
1618 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1621 glVertex 0 , 0; 1819 glVertex 0 , 0;
1622 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1623 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1624 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1659 if ($sym == 13) { 1857 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1858 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1859 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1860 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1861 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1862 $self->_emit (activate => $txt);
1665 $self->update; 1863 $self->update;
1666 1864
1667 } elsif ($sym == CFClient::SDLK_UP) { 1865 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1866 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1867 $self->{history_saveback} = $self->get_text;
… …
1685 } else { 1883 } else {
1686 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1687 } 1885 }
1688 1886
1689 } else { 1887 } else {
1690 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1691 } 1891 1
1692
1693} 1892}
1694 1893
1695############################################################################# 1894#############################################################################
1696 1895
1697package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1706 1905
1707sub new { 1906sub new {
1708 my $class = shift; 1907 my $class = shift;
1709 1908
1710 $class->SUPER::new ( 1909 $class->SUPER::new (
1711 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1712 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1713 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1714 can_hover => 1, 1914 can_hover => 1,
1715 align => 0, 1915 align => 0,
1716 valign => 0, 1916 valign => 0,
1717 can_events => 1, 1917 can_events => 1,
1718 @_ 1918 @_
1719 ) 1919 )
1720} 1920}
1721 1921
1922sub activate { }
1923
1722sub button_up { 1924sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1724 1926
1927 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1929 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate"); 1930
1728 } 1931 1
1729} 1932}
1730 1933
1731sub _draw { 1934sub _draw {
1732 my ($self) = @_; 1935 my ($self) = @_;
1733 1936
1734 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1735
1736 if ($GRAB == $self) {
1737 $self->{fg} = $self->{active_fg};
1738 }
1739 1938
1740 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1743 1942
… …
1762 1961
1763sub new { 1962sub new {
1764 my $class = shift; 1963 my $class = shift;
1765 1964
1766 $class->SUPER::new ( 1965 $class->SUPER::new (
1767 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1768 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 1972 state => 0,
… …
1776} 1976}
1777 1977
1778sub size_request { 1978sub size_request {
1779 my ($self) = @_; 1979 my ($self) = @_;
1780 1980
1781 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1782} 1982}
1783 1983
1784sub button_down { 1984sub button_down {
1785 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1786 1986
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1791 } 1995 1
1792} 1996}
1793 1997
1794sub _draw { 1998sub _draw {
1795 my ($self) = @_; 1999 my ($self) = @_;
1796 2000
1797 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1798 2002
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 2004
1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2005 my ($w, $h) = @$self{qw(w h)};
2006
2007 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802 2008
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 2010
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 2012
… …
1961 2167
1962 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
1963 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
1964 2170
1965 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
1966 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1967 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969 2176
1970 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
1971 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2071 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10, 0], 2282 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2078 vertical => 0, 2285 vertical => 0,
2079 can_hover => 1, 2286 can_hover => 1,
2080 inner_pad => 0.02, 2287 inner_pad => 0.02,
2081 @_ 2288 @_
2082 ); 2289 );
… …
2085 $self->update; 2292 $self->update;
2086 2293
2087 $self 2294 $self
2088} 2295}
2089 2296
2297sub changed { }
2298
2090sub set_range { 2299sub set_range {
2091 my ($self, $range) = @_; 2300 my ($self, $range) = @_;
2092 2301
2093 $self->{range} = $range; 2302 ($range, $self->{range}) = ($self->{range}, $range);
2094 2303
2095 $self->update; 2304 $self->update
2305 if "@$range" ne "@{$self->{range}}";
2096} 2306}
2097 2307
2098sub set_value { 2308sub set_value {
2099 my ($self, $value) = @_; 2309 my ($self, $value) = @_;
2100 2310
… …
2111 if $unit; 2321 if $unit;
2112 2322
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2324
2115 if ($value != $old_value) { 2325 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2326 $self->_emit (changed => $value);
2117 $self->update; 2327 $self->update;
2118 } 2328 }
2119} 2329}
2120 2330
2121sub size_request { 2331sub size_request {
2122 my ($self) = @_; 2332 my ($self) = @_;
2123 2333
2124 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2335}
2129 2336
2130sub button_down { 2337sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2132 2339
2133 $self->SUPER::button_down ($ev, $x, $y); 2340 $self->SUPER::button_down ($ev, $x, $y);
2134 2341
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136 2343
2137 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2138} 2345}
2139 2346
2140sub mouse_motion { 2347sub mouse_motion {
2141 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2142 2349
… …
2146 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2147 2354
2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149 2356
2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2357 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2358 } else {
2359 return 0;
2360 }
2361
2151 } 2362 1
2152} 2363}
2153 2364
2154sub update { 2365sub update {
2155 my ($self) = @_; 2366 my ($self) = @_;
2156 2367
2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2368 delete $self->{knob_w};
2369 $self->SUPER::update;
2370}
2371
2372sub _draw {
2373 my ($self) = @_;
2374
2375 unless ($self->{knob_w}) {
2158 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2159 2377
2160 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100; 2379 my $range = ($hi - $page - $lo) || 1e-100;
2162 2380
… …
2168 $value = ($value - $lo) / $range; 2386 $value = ($value - $lo) / $range;
2169 $value = $value * $self->{scale} + $self->{offset}; 2387 $value = $value * $self->{scale} + $self->{offset};
2170 2388
2171 $self->{knob_x} = $value - $knob_w * 0.5; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $knob_w; 2390 $self->{knob_w} = $knob_w;
2173 }); 2391 }
2174
2175 $self->SUPER::update;
2176}
2177
2178sub _draw {
2179 my ($self) = @_;
2180 2392
2181 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2182 2394
2183 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2184 2396
… …
2378 2590
2379 delete $self->{texture}; 2591 delete $self->{texture};
2380 } 2592 }
2381 2593
2382 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2383 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2384 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2385 2597
2386 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2387 2599
2388 my $y0 = $top; 2600 my $y0 = $top;
… …
2423sub _draw { 2635sub _draw {
2424 my ($self) = @_; 2636 my ($self) = @_;
2425 2637
2426 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2428 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2429 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2430 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2431 2643
2432 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2433 2645
2434} 2646}
… …
2483 2695
2484sub new { 2696sub new {
2485 my $class = shift; 2697 my $class = shift;
2486 2698
2487 my $self = $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2488 state => 0, 2700 state => 0,
2489 connect_activate => \&toggle_flopper, 2701 on_activate => \&toggle_flopper,
2490 @_ 2702 @_
2491 ); 2703 );
2492 2704
2493 if ($self->{state}) {
2494 $self->{state} = 0;
2495 $self->toggle_flopper;
2496 }
2497
2498 $self 2705 $self
2499} 2706}
2500 2707
2501sub toggle_flopper { 2708sub toggle_flopper {
2502 my ($self) = @_; 2709 my ($self) = @_;
2503 2710
2504 # TODO: use animation 2711 $self->{other}->toggle_visibility;
2505 if ($self->{state} = !$self->{state}) {
2506 $CFClient::UI::ROOT->add ($self->{other});
2507 $self->{other}->move ($self->coord2global (0, $self->{h}));
2508 $self->emit ("open");
2509 } else {
2510 $CFClient::UI::ROOT->remove ($self->{other});
2511 $self->emit ("close");
2512 }
2513
2514 $self->emit (changed => $self->{state});
2515} 2712}
2516 2713
2517############################################################################# 2714#############################################################################
2518 2715
2519package CFClient::UI::Tooltip; 2716package CFClient::UI::Tooltip;
… …
2532} 2729}
2533 2730
2534sub set_tooltip_from { 2731sub set_tooltip_from {
2535 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2536 2733
2734 my $tooltip = $widget->{tooltip};
2735
2736 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}";
2741 }
2742
2537 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2538 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2539 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540 fontsize => 0.8, 2746 fontsize => 0.8,
2541 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2542 ellipsise => 0, 2748 ellipsise => 0,
2543 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2554 2760
2555sub size_allocate { 2761sub size_allocate {
2556 my ($self, $w, $h) = @_; 2762 my ($self, $w, $h) = @_;
2557 2763
2558 $self->SUPER::size_allocate ($w - 4, $h - 4); 2764 $self->SUPER::size_allocate ($w - 4, $h - 4);
2765}
2766
2767sub visibility_change {
2768 my ($self, $visible) = @_;
2769
2770 return unless $visible;
2771
2772 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner}
2774 or return;
2775
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH;
2780
2781 $self->move_abs ($x, $y);
2782 });
2559} 2783}
2560 2784
2561sub _draw { 2785sub _draw {
2562 my ($self) = @_; 2786 my ($self) = @_;
2563 2787
… …
2580 glVertex $w, $h; 2804 glVertex $w, $h;
2581 glVertex $w, 0; 2805 glVertex $w, 0;
2582 glEnd; 2806 glEnd;
2583 2807
2584 glTranslate 2 - 0.375, 2 - 0.375; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2809
2585 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2586} 2811}
2587 2812
2588############################################################################# 2813#############################################################################
2589 2814
… …
2595 2820
2596sub new { 2821sub new {
2597 my $class = shift; 2822 my $class = shift;
2598 2823
2599 my $self = $class->SUPER::new ( 2824 my $self = $class->SUPER::new (
2600 aspect => 1, 2825 aspect => 1,
2826 can_events => 0,
2601 @_, 2827 @_,
2602 ); 2828 );
2603 2829
2604 if ($self->{anim} && $self->{animspeed}) { 2830 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self); 2831 Scalar::Util::weaken (my $widget = $self);
… …
2647 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2648 2874
2649 if ($tex) { 2875 if ($tex) {
2650 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2652 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2654 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2655 } 2881 }
2656} 2882}
2657 2883
… …
2664 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2665} 2891}
2666 2892
2667############################################################################# 2893#############################################################################
2668 2894
2669package CFClient::UI::InventoryItem; 2895package CFClient::UI::Buttonbar;
2670 2896
2671our @ISA = CFClient::UI::HBox::; 2897our @ISA = CFClient::UI::HBox::;
2672 2898
2673sub _item_to_desc { 2899# TODO: should actualyl wrap buttons and other goodies.
2674 my ($item) = @_;
2675
2676 my $desc =
2677 $item->{nrof} < 2
2678 ? $item->{name}
2679 : "$item->{nrof} × $item->{name_pl}";
2680
2681 $item->{flags} & Crossfire::Protocol::F_OPEN
2682 and $desc .= " (open)";
2683 $item->{flags} & Crossfire::Protocol::F_APPLIED
2684 and $desc .= " (applied)";
2685 $item->{flags} & Crossfire::Protocol::F_UNPAID
2686 and $desc .= " (unpaid)";
2687 $item->{flags} & Crossfire::Protocol::F_MAGIC
2688 and $desc .= " (magic)";
2689 $item->{flags} & Crossfire::Protocol::F_CURSED
2690 and $desc .= " (cursed)";
2691 $item->{flags} & Crossfire::Protocol::F_DAMNED
2692 and $desc .= " (damned)";
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED
2694 and $desc .= " *";
2695
2696 $desc
2697}
2698
2699sub new {
2700 my $class = shift;
2701
2702 my %args = @_;
2703
2704 my $item = delete $args{item};
2705
2706 my $desc = _item_to_desc ($item);
2707
2708 my $self = $class->SUPER::new (
2709 can_hover => 1,
2710 can_events => 1,
2711 tooltip => ((CFClient::UI::Label::escape $desc)
2712 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713 connect_button_down => sub {
2714 my ($self, $ev, $x, $y) = @_;
2715
2716 # todo: maybe put examine on 1? but should just be a tooltip :(
2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718 my $targ = $::CONN->{player}{tag};
2719
2720 if ($item->{container} == $::CONN->{player}{tag}) {
2721 $targ = $main::OPENCONT;
2722 }
2723
2724 $::CONN->send ("move $targ $item->{tag} 0");
2725 } elsif ($ev->{button} == 1) {
2726 $::CONN->send ("examine $item->{tag}");
2727 } elsif ($ev->{button} == 2) {
2728 $::CONN->send ("apply $item->{tag}");
2729 } elsif ($ev->{button} == 3) {
2730 my @menu_items = (
2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734 (
2735 $item->{flags} & Crossfire::Protocol::F_LOCKED
2736 ? (
2737 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738 )
2739 : (
2740 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742 )
2743 ),
2744 );
2745
2746 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747 }
2748
2749 1
2750 },
2751 %args
2752 );
2753
2754
2755 $self->add (new CFClient::UI::Face
2756 can_events => 0,
2757 face => $item->{face},
2758 anim => $item->{anim},
2759 animspeed => $item->{animspeed},
2760 );
2761
2762 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764 $self->{item} = $item;
2765
2766 $self->update_item;
2767
2768 $self
2769}
2770
2771sub update_item {
2772 my ($self) = @_;
2773
2774 my $desc = _item_to_desc ($self->{item});
2775
2776 $self->{name_lbl}->set_text ($desc);
2777}
2778
2779#############################################################################
2780
2781package CFClient::UI::Inventory;
2782
2783our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785sub new {
2786 my $class = shift;
2787
2788 my $self = $class->SUPER::new (
2789 scrolled => (new CFClient::UI::Table),
2790 @_,
2791 );
2792
2793 $self
2794}
2795
2796sub set_items {
2797 my ($self, $items) = @_;
2798
2799 $self->{scrolled}->clear;
2800 return unless $items;
2801
2802 my @items = sort {
2803 ($a->{type} <=> $b->{type})
2804 or ($a->{name} cmp $b->{name})
2805 } @$items;
2806
2807 $self->{real_items} = \@items;
2808
2809 for my $item (@items) {
2810 $item->{item} = $item;
2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812 $item->update_item ();
2813 }
2814
2815 my $i = 0;
2816 for (@items) {
2817 $self->{scrolled}->add (0, $i, $_);
2818 my $nrof = $_->{item}->{nrof} || 1;
2819 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820 }
2821
2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2823}
2824
2825sub size_request {
2826 my ($self) = @_;
2827 ($self->{req_w}, $self->{req_h});
2828}
2829 2900
2830############################################################################# 2901#############################################################################
2831 2902
2832package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2833 2904
… …
2867 2938
2868# popup given the event (must be a mouse button down event currently) 2939# popup given the event (must be a mouse button down event currently)
2869sub popup { 2940sub popup {
2870 my ($self, $ev) = @_; 2941 my ($self, $ev) = @_;
2871 2942
2872 $self->emit ("popdown"); 2943 $self->_emit ("popdown");
2873 2944
2874 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 2946 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2877 2948
2878 $self->show; 2949 $self->show;
2879 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880} 2951}
2881 2952
2882sub mouse_motion { 2953sub mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2884 2955
2885 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2888} 2961}
2889 2962
2890sub button_up { 2963sub button_up {
2891 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2892 2965
2893 if ($ev->{button} == $self->{button}) { 2966 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 2967 undef $GRAB;
2895 $self->hide; 2968 $self->hide;
2896 2969
2897 $self->emit ("popdown"); 2970 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2899 } 2976 1
2900} 2977}
2901 2978
2902############################################################################# 2979#############################################################################
2903 2980
2904package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2905 2982
2906our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2907 2984
2908sub new { 2985sub new {
2909 my $class = shift; 2986 my $class = shift;
2910 2987
2911 $class->SUPER::new ( 2988 my $self = $class->SUPER::new (
2989 @_,
2990 );
2991
2992 $self->{current} = $self->{children}[0]
2993 if @{ $self->{children} };
2994
2995 $self
2996}
2997
2998sub add {
2999 my ($self, @widgets) = @_;
3000
3001 $self->SUPER::add (@widgets);
3002
3003 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} };
3005}
3006
3007sub set_current_page {
3008 my ($self, $page_or_widget) = @_;
3009
3010 my $widget = ref $page_or_widget
3011 ? $page_or_widget
3012 : $self->{children}[$page_or_widget];
3013
3014 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016
3017 $self->_emit (page_changed => $self->{current});
3018
3019 $self->realloc;
3020}
3021
3022sub visible_children {
3023 $_[0]{current}
3024}
3025
3026sub size_request {
3027 my ($self) = @_;
3028
3029 $self->{current}->size_request
3030}
3031
3032sub size_allocate {
3033 my ($self, $w, $h) = @_;
3034
3035 $self->{current}->configure (0, 0, $w, $h);
3036}
3037
3038sub _draw {
3039 my ($self) = @_;
3040
3041 $self->{current}->draw;
3042}
3043
3044#############################################################################
3045
3046package CFClient::UI::Notebook;
3047
3048our @ISA = CFClient::UI::VBox::;
3049
3050sub new {
3051 my $class = shift;
3052
3053 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self
3057 @_,
3058 );
3059
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3061 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3062
3063 $self
3064}
3065
3066sub add {
3067 my ($self, $title, $widget, $tooltip) = @_;
3068
3069 Scalar::Util::weaken $self;
3070
3071 $self->{buttonbar}->add (new CFClient::UI::Button
3072 markup => $title,
3073 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) },
3075 );
3076
3077 $self->{multiplexer}->add ($widget);
3078}
3079
3080sub set_current_page {
3081 my ($self, $page) = @_;
3082
3083 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current});
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::Statusbox;
3090
3091our @ISA = CFClient::UI::VBox::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3097 fontsize => 0.8,
2913 @_, 3098 @_,
2914 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
2915} 3106}
2916 3107
2917sub reorder { 3108sub reorder {
2918 my ($self) = @_; 3109 my ($self) = @_;
2919 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
2920 3116
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3119 }
2924 3120
… …
2927 my @items = sort { 3123 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2931 3127
3128 $self->{timer}->interval (1);
3129
2932 my $count = 10 + 1; 3130 my $count = 10 + 1;
2933 for my $item (@items) { 3131 for my $item (@items) {
2934 last unless --$count; 3132 last unless --$count;
2935 3133
2936 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3138 : $item->{text};
2941 3139
… …
2949 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3153 can_events => 1,
2956 can_hover => 1 3154 can_hover => 1
2957 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
2958 } 3168 }
2959 3169
2960 $self->clear; 3170 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2962} 3172}
… …
2965 my ($self, $text, %arg) = @_; 3175 my ($self, $text, %arg) = @_;
2966 3176
2967 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
2969 3179
3180 return unless $text;
3181
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2971 3183
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 3185
2974 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
2975 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
3005 3217
3006 $self->reorder; 3218 $self->reorder;
3007 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
3008} 3220}
3009 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
3010############################################################################# 3230#############################################################################
3011 3231
3012package CFClient::UI::Root; 3232package CFClient::UI::Inventory;
3013 3233
3014our @ISA = CFClient::UI::Container::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
3015
3016use CFClient::OpenGL;
3017 3235
3018sub new { 3236sub new {
3019 my $class = shift; 3237 my $class = shift;
3020 3238
3021 $class->SUPER::new ( 3239 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3241 @_,
3242 );
3243
3244 $self
3245}
3246
3247sub set_items {
3248 my ($self, $items) = @_;
3249
3250 $self->{child}->clear;
3251 return unless $items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 binding => [],
3480 commands => [],
3022 @_, 3481 @_,
3023 ) 3482 )
3024} 3483}
3025 3484
3026sub configure { 3485# XXX: Do sorting? Argl...
3027 my ($self, $x, $y, $w, $h) = @_; 3486sub add_spell {
3028
3029 $self->{w} = $w;
3030 $self->{h} = $h;
3031}
3032
3033sub check_size {
3034 my ($self) = @_; 3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
3035 3489
3036 $self->size_allocate ($self->{w}, $self->{h}) 3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3037 if $self->{w}; 3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517}
3518
3519sub remove_spell {
3520 my ($self, $spell) = @_;
3521 delete $self->{spells}->{$spell->{name}};
3522 $self->rebuild_spell_list;
3523}
3524
3525#############################################################################
3526
3527package CFClient::UI::Root;
3528
3529our @ISA = CFClient::UI::Container::;
3530
3531use List::Util qw(min max);
3532
3533use CFClient::OpenGL;
3534
3535sub new {
3536 my $class = shift;
3537
3538 my $self = $class->SUPER::new (
3539 visible => 1,
3540 @_,
3541 );
3542
3543 Scalar::Util::weaken ($self->{root} = $self);
3544
3545 $self
3038} 3546}
3039 3547
3040sub size_request { 3548sub size_request {
3041 my ($self) = @_; 3549 my ($self) = @_;
3042 3550
3043 ($self->{w}, $self->{h}) 3551 ($self->{w}, $self->{h})
3552}
3553
3554sub _to_pixel {
3555 my ($coord, $size, $max) = @_;
3556
3557 $coord =
3558 $coord eq "center" ? ($max - $size) * 0.5
3559 : $coord eq "max" ? $max
3560 : $coord;
3561
3562 $coord = 0 if $coord < 0;
3563 $coord = $max - $size if $coord > $max - $size;
3564
3565 int $coord + 0.5
3044} 3566}
3045 3567
3046sub size_allocate { 3568sub size_allocate {
3047 my ($self, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
3048 3570
3049 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054
3055 for my $child ($self->children) { 3571 for my $child ($self->children) {
3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057 3573
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
3059 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
3060 3576
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
3062 if exists $child->{req_y}; 3578 $Y = _to_pixel $Y, $H, $self->{h};
3063
3064 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3065 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066 3579
3067 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
3068 } 3581 }
3069} 3582}
3070 3583
… …
3081} 3594}
3082 3595
3083sub update { 3596sub update {
3084 my ($self) = @_; 3597 my ($self) = @_;
3085 3598
3086 $self->check_size;
3087 $::WANT_REFRESH++; 3599 $::WANT_REFRESH++;
3088} 3600}
3089 3601
3090sub add { 3602sub add {
3091 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
3092 3604
3093 for my $child (@children) {
3094 $child->{toplevel} = 1; 3605 $_->{is_toplevel} = 1
3095 3606 for @children;
3096 # integerise window positions
3097 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y};
3099 }
3100 3607
3101 $self->SUPER::add (@children); 3608 $self->SUPER::add (@children);
3609}
3610
3611sub remove {
3612 my ($self, @children) = @_;
3613
3614 $self->SUPER::remove (@children);
3615
3616 delete $self->{is_toplevel}
3617 for @children;
3102 3618
3103 while (@children) { 3619 while (@children) {
3104 my $w = pop @children; 3620 my $w = pop @children;
3105 push @children, $w->children; 3621 push @children, $w->children;
3106 $w->{visible} = 1; 3622 $w->set_invisible;
3107 }
3108}
3109
3110sub remove {
3111 my ($self, @children) = @_;
3112
3113 $self->SUPER::remove (@children);
3114
3115 while (@children) {
3116 my $w = pop @children;
3117 push @children, $w->children;
3118 delete $w->{visible};
3119 } 3623 }
3120} 3624}
3121 3625
3122sub on_refresh { 3626sub on_refresh {
3123 my ($self, $id, $cb) = @_; 3627 my ($self, $id, $cb) = @_;
… …
3137 while ($self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
3138 $_->() 3642 $_->()
3139 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3140 } 3644 }
3141 3645
3142 if ($self->{check_size}) { 3646 if ($self->{realloc}) {
3143 my @queue = ([], []); 3647 my %queue;
3648 my @queue;
3649 my $widget;
3144 3650
3145 for (;;) { 3651 outer:
3146 if ($self->{check_size}) { 3652 while () {
3147 # heuristic: check containers last 3653 if (my $realloc = delete $self->{realloc}) {
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3654 for $widget (values %$realloc) {
3149 for values %{delete $self->{check_size}} 3655 $widget->{visible} or next; # do not resize invisible widgets
3656
3657 $queue{$widget+0}++ and next; # duplicates are common
3658
3659 push @{ $queue[$widget->{visible}] }, $widget;
3660 }
3150 } 3661 }
3151 3662
3152 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3663 while () {
3664 @queue or last outer;
3153 3665
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3666 $widget = pop @{ $queue[-1] || [] }
3155 ? @$widget{qw(user_w user_h)} 3667 and last;
3156 : $widget->size_request;
3157
3158 if (delete $widget->{force_alloc}
3159 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3160 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3161 3668
3669 pop @queue;
3670 }
3671
3672 delete $queue{$widget+0};
3673
3674 my ($w, $h) = $widget->size_request;
3675
3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3681
3682 $w = $widget->{force_w} if exists $widget->{force_w};
3683 $h = $widget->{force_h} if exists $widget->{force_h};
3684
3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3686 || delete $widget->{force_realloc}) {
3162 $widget->{req_w} = $w; 3687 $widget->{req_w} = $w;
3163 $widget->{req_h} = $h; 3688 $widget->{req_h} = $h;
3164 3689
3165 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3690 $self->{size_alloc}{$widget+0} = $widget;
3166 3691
3167 $widget->{parent}->check_size
3168 if $widget->{parent}; 3692 if (my $parent = $widget->{parent}) {
3693 $self->{realloc}{$parent+0} = $parent
3694 unless $queue{$parent+0};
3695
3696 $parent->{force_size_alloc} = 1;
3697 $self->{size_alloc}{$parent+0} = $parent;
3698 }
3169 } 3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3170 } 3702 }
3171 } 3703 }
3172 3704
3173 while ($self->{size_alloc}) { 3705 while (my $size_alloc = delete $self->{size_alloc}) {
3174 for (values %{delete $self->{size_alloc}}) { 3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3175 my ($widget, $w, $h) = @$_; 3707 values %$size_alloc;
3708
3709 while () {
3710 my $widget = pop @queue || last;
3711
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 3713
3177 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3179 3716
3717 $w = int $w + 0.5;
3718 $h = int $h + 0.5;
3719
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w};
3722 $widget->{old_h} = $widget->{h};
3723
3180 $widget->{w} = $w; 3724 $widget->{w} = $w;
3181 $widget->{h} = $h; 3725 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h); 3726
3183 $widget->emit (size_allocate => $w, $h); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3184 } 3729 }
3185 } 3730 }
3186 3731
3187 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3188 $_->() 3733 $_->()
3189 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3190 } 3735 }
3736
3191 3737
3192 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3195 3741
… …
3197 glLoadIdentity; 3743 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 3746 glLoadIdentity;
3201 3747
3748 {
3749 package CFClient::UI::Base;
3750
3751 ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h});
3753 }
3754
3202 $self->_draw; 3755 $self->_draw;
3203} 3756}
3204 3757
3205############################################################################# 3758#############################################################################
3206 3759

Diff Legend

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