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.287 by root, Mon Jun 5 05:31:13 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 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377 538
378sub draw { 539sub draw {
379 my ($self) = @_; 540 my ($self) = @_;
380 541
381 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382 553
383 glPushMatrix; 554 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 556
388 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 559 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 561 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; 562 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
412 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
413 glPopMatrix; 580 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
416} 586}
417 587
418sub _draw { 588sub _draw {
419 my ($self) = @_; 589 my ($self) = @_;
420 590
421 warn "no draw defined for $self\n"; 591 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} 592}
473 593
474sub DESTROY { 594sub DESTROY {
475 my ($self) = @_; 595 my ($self) = @_;
476 596
… …
508 628
509 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
511 631
512 glEnable GL_BLEND; 632 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 634 glColor_premultiply @$color;
515 635
516 glBegin GL_QUADS; 636 glBegin GL_QUADS;
517 glVertex 0 , 0; 637 glVertex 0 , 0;
518 glVertex 0 , $h; 638 glVertex 0 , $h;
519 glVertex $w, $h; 639 glVertex $w, $h;
… …
534 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
536} 656}
537 657
538sub size_request { 658sub size_request {
539 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
540} 662}
541 663
542sub draw { } 664sub draw { }
543 665
544############################################################################# 666#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
549 671
550sub new { 672sub new {
551 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
552 674
553 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
554 676
555 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
556 children => [], 678 children => [],
557 can_events => 0, 679 can_events => 0,
558 %arg, 680 %arg,
559 ); 681 );
682
560 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
561 685
562 $self 686 $self
563} 687}
564 688
565sub add { 689sub add {
… …
573 $self->{children} = [ 697 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
576 ]; 700 ];
577 701
578 $self->check_size (1); 702 $self->realloc;
579 $self->update;
580} 703}
581 704
582sub children { 705sub children {
583 @{ $_[0]{children} } 706 @{ $_[0]{children} }
584} 707}
… …
589 delete $child->{parent}; 712 delete $child->{parent};
590 $child->hide; 713 $child->hide;
591 714
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 716
594 $self->check_size; 717 $self->realloc;
595 $self->update;
596} 718}
597 719
598sub clear { 720sub clear {
599 my ($self) = @_; 721 my ($self) = @_;
600 722
… …
604 for (@$children) { 726 for (@$children) {
605 delete $_->{parent}; 727 delete $_->{parent};
606 $_->hide; 728 $_->hide;
607 } 729 }
608 730
609 $self->check_size; 731 $self->realloc;
610 $self->update;
611} 732}
612 733
613sub find_widget { 734sub find_widget {
614 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
615 736
616 $x -= $self->{x}; 737 $x -= $self->{x};
617 $y -= $self->{y}; 738 $y -= $self->{y};
618 739
619 my $res; 740 my $res;
620 741
621 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
623 and return $res; 744 and return $res;
624 } 745 }
625 746
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
675 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
676} 797}
677 798
678############################################################################# 799#############################################################################
679 800
801# back-buffered drawing area
802
680package CFClient::UI::Window; 803package CFClient::UI::Window;
681 804
682our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
683 806
684use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
702 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 826 $self->update;
704} 827}
705 828
706sub _render { 829sub _render {
830 my ($self) = @_;
831
707 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
708} 833}
709 834
710sub render_child { 835sub render_child {
711 my ($self) = @_; 836 my ($self) = @_;
712 837
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
716 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
717 $self->_render; 849 $self->_render;
718 }; 850 };
719} 851}
720 852
721sub _draw { 853sub _draw {
722 my ($self) = @_; 854 my ($self) = @_;
723 855
724 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
725 857
726 my $tex = $self->{texture} 858 my $tex = $self->{texture}
727 or return; 859 or return;
728 860
729 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
732 864
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734 866
735 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
736} 868}
… …
739 871
740package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
741 873
742our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
743 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
744sub size_request { 886sub size_request {
745 my ($self) = @_; 887 my ($self) = @_;
746 888
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 890
749 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
750} 895}
751 896
752sub size_allocate { 897sub size_allocate {
753 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
754 899
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 900 my $child = $self->child;
756# $w = $self->{w}; 901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
757 $self->child->configure (0, 0, $cw, $ch); 905 $self->child->configure (0, 0, $w, $h);
758 $self->update; 906 $self->update;
759} 907}
760 908
761sub set_offset { 909sub set_offset {
762 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
796} 944}
797 945
798sub _render { 946sub _render {
799 my ($self) = @_; 947 my ($self) = @_;
800 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 953
803 $self->SUPER::_render; 954 $self->SUPER::_render;
804} 955}
805 956
… …
808package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
809 960
810our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
811 962
812sub new { 963sub new {
813 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
814 967
815 my $self; 968 my $self;
816 969
817 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
818 vertical => 1, 971 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 973 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 974 $self->{vp}->set_offset (0, $_[1]);
822 }, 975 },
823 ; 976 ;
824 977
825 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
827 slider => $slider, 980 slider => $slider,
828 @_, 981 %arg,
829 ); 982 );
830 983
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
834 986
835 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004}
1005
1006sub size_allocate {
1007 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 1013}
837 1014
838#TODO# update range on size_allocate depending on child 1015#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 1016# update viewport offset on scroll
840 1017
… …
860 1037
861 if ($self->{bg}) { 1038 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
863 1040
864 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
867 1044
868 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
869 glVertex 0 , 0; 1046 glVertex 0 , 0;
870 glVertex 0 , $h; 1047 glVertex 0 , $h;
871 glVertex $w, $h; 1048 glVertex $w, $h;
… …
884 1061
885our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
886 1063
887use CFClient::OpenGL; 1064use CFClient::OpenGL;
888 1065
889my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892 1073
893sub new { 1074sub new {
894 my $class = shift; 1075 my ($class, %arg) = @_;
895 1076
896 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
897 1078
898 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1082 border => 0.6,
902 toplevel => 1,
903 can_events => 1, 1083 can_events => 1,
904 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
905 ); 1087 );
906 1088
907 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
908 align => 0, 1090 align => 0,
909 valign => 1, 1091 valign => 1,
910 text => $self->{title}, 1092 text => $title,
911 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
912 1095
913 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
914} 1104}
915 1105
916sub border { 1106sub border {
917 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
918} 1108}
919 1109
920sub size_request { 1110sub size_request {
921 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
922 1115
923 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
924 1117
925 ( 1118 (
926 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
929} 1122}
930 1123
931sub size_allocate { 1124sub size_allocate {
932 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
933 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
934 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
935 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
936 1137
937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
938 if $self->{title};
939
940 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
941} 1139}
942 1140
943sub button_down { 1141sub button_down {
944 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
945 1143
… …
961 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
962 1160
963 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
965 1163
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size; 1168 $self->realloc;
970 }; 1169 };
971 1170
972 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1175 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
978 1177
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
980 1179
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
983 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
984 } 1188 1
985} 1189}
986 1190
987sub button_up { 1191sub button_up {
988 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
989 1193
990 delete $self->{motion}; 1194 !!delete $self->{motion}
991} 1195}
992 1196
993sub mouse_motion { 1197sub mouse_motion {
994 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
995 1199
996 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
997} 1203}
998 1204
999sub _draw { 1205sub _draw {
1000 my ($self) = @_; 1206 my ($self) = @_;
1001 1207
1208 my $child = $self->{children}[0];
1209
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1212
1005 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1215
1008 my $border = $self->border; 1216 my $border = $self->border;
1009 1217
1010 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015 1223
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1018 1226
1019 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1022
1023 glColor @{ $self->{bg} };
1024
1025 $bg->{s} = $rep_x;
1026 $bg->{t} = $rep_y;
1027 $bg->{wrap_mode} = 1;
1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1232 }
1030 1233
1031 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1032 1235
1033 $self->{title}->draw if $self->{title};
1034
1035 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1036} 1242}
1037 1243
1038############################################################################# 1244#############################################################################
1039 1245
1040package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1048sub new { 1254sub new {
1049 my $class = shift; 1255 my $class = shift;
1050 1256
1051 $class->SUPER::new ( 1257 $class->SUPER::new (
1052 col_expand => [], 1258 col_expand => [],
1053 @_ 1259 @_,
1054 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1265}
1056 1266
1057sub add { 1267sub add {
1058 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1059 1269
1060 $child->set_parent ($self); 1270 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1062 1272
1063 $child->check_size; 1273 $self->realloc;
1064} 1274}
1065 1275
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1277sub clear {
1072 my ($self) = @_; 1278 my ($self) = @_;
1073 1279
1074 my @children = $self->children; 1280 my @children = $self->children;
1075 delete $self->{children}; 1281 delete $self->{children};
… …
1077 for (@children) { 1283 for (@children) {
1078 delete $_->{parent}; 1284 delete $_->{parent};
1079 $_->hide; 1285 $_->hide;
1080 } 1286 }
1081 1287
1082 $self->update; 1288 $self->realloc;
1083} 1289}
1084 1290
1085sub get_wh { 1291sub get_wh {
1086 my ($self) = @_; 1292 my ($self) = @_;
1087 1293
… …
1118sub size_allocate { 1324sub size_allocate {
1119 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1120 1326
1121 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1122 1328
1123 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1125 1331
1126 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1183 } 1389 }
1184} 1390}
1185 1391
1186############################################################################# 1392#############################################################################
1187 1393
1188package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1189
1190# TODO: wrap into common Box base class
1191 1395
1192our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1193 1397
1194sub size_request { 1398sub size_request {
1195 my ($self) = @_; 1399 my ($self) = @_;
1196 1400
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1198 1402 ? (
1199 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1200 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201 (List::Util::max map $_->[1], @alloc), 1405 )
1202 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1203} 1410}
1204 1411
1205sub size_allocate { 1412sub size_allocate {
1206 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1207 1414
1208 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1209
1210 my $children = $self->{children}; 1416 my $children = $self->{children};
1211 1417
1212 my @h = map $_->{req_w}, @$children; 1418 my @req;
1213 1419
1214 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1215 1421 @req = ($space / (@$children || 1)) x @$children;
1216 if ($req_h > $h) {
1217 # ah well, not enough space
1218 $_ *= $h / $req_h for @h;
1219 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1220 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221 $exp ||= 1;
1222 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1223 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1224 my $child = $children->[$_];
1225
1226 my $alloc_h = $h[$_];
1227 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228 $h[$_] = $alloc_h;
1229 } 1436 }
1230 } 1437 }
1231 1438
1232 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1233 1440
1234 my $y = 0; 1441 my $pos = 0;
1235 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1238 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239 1445
1240 $y += $h; 1446 $pos += $alloc;
1241 } 1447 }
1242 1448
1243 1 1449 1
1244} 1450}
1245 1451
1246############################################################################# 1452#############################################################################
1247 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1248package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1249 1470
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1253 1472
1254sub size_request { 1473sub new {
1255 my ($self) = @_; 1474 my $class = shift;
1256 1475
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1258 1477 vertical => 1,
1259 ( 1478 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1479 )
1263}
1264
1265sub size_allocate {
1266 my ($self, $w, $h) = @_;
1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270 my $children = $self->{children};
1271
1272 my @h = map $_->{req_h}, @$children;
1273
1274 my $req_h = List::Util::sum @h;
1275
1276 if ($req_h > $h) {
1277 # ah well, not enough space
1278 $_ *= $h / $req_h for @h;
1279 } else {
1280 my $exp = List::Util::sum map $_->{expand}, @$children;
1281 $exp ||= 1;
1282
1283 for (0 .. $#$children) {
1284 my $child = $children->[$_];
1285
1286 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287 }
1288 }
1289
1290 CFClient::UI::harmonize \@h;
1291
1292 my $y = 0;
1293 for (0 .. $#$children) {
1294 my $child = $children->[$_];
1295 my $h = $h[$_];
1296 $child->configure (0, $y, $w, $h);
1297
1298 $y += $h;
1299 }
1300
1301 1
1302} 1480}
1303 1481
1304############################################################################# 1482#############################################################################
1305 1483
1306package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1323 ellipsise => 3, # end 1501 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1325 fontsize => 1, 1503 fontsize => 1,
1326 align => -1, 1504 align => -1,
1327 valign => -1, 1505 valign => -1,
1328 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1329 can_events => 0, 1508 can_events => 0,
1330 %arg 1509 %arg
1331 ); 1510 );
1332 1511
1333 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1360 1539
1361 delete $self->{texture}; 1540 delete $self->{texture};
1362 $self->SUPER::update; 1541 $self->SUPER::update;
1363} 1542}
1364 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1365sub set_text { 1551sub set_text {
1366 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1367 1553
1368 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1369 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1370 1556
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1559 delete $self->{req_h};
1373 1560
1561 $self->realloc;
1374 $self->update; 1562 $self->update;
1375 $self->check_size;
1376} 1563}
1377 1564
1378sub set_markup { 1565sub set_markup {
1379 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1380 1567
… …
1383 1570
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1572
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1575 delete $self->{req_h};
1388 1576
1577 $self->realloc;
1389 $self->update; 1578 $self->update;
1390 $self->check_size;
1391} 1579}
1392 1580
1393sub size_request { 1581sub size_request {
1394 my ($self) = @_; 1582 my ($self) = @_;
1395 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1396 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1397 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1592
1402 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1403 1594
1404 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1405 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1406 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1407 1598
1408 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1409 1600
1410 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1412 } 1603 }
1413 1604
1605 ($w, $h)
1414 ( 1606 }
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 1607}
1419 1608
1420sub size_allocate { 1609sub size_allocate {
1421 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1422 1611
1612 delete $self->{ox};
1613
1423 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1424} 1616}
1425 1617
1426sub set_fontsize { 1618sub set_fontsize {
1427 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1428 1620
1429 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1430 delete $self->{texture}; 1622 delete $self->{texture};
1431 1623
1432 $self->update; 1624 $self->realloc;
1433 $self->check_size;
1434} 1625}
1435 1626
1436sub _draw { 1627sub _draw {
1437 my ($self) = @_; 1628 my ($self) = @_;
1438 1629
… …
1444 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 1639
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1640 new_from_layout CFClient::Texture $self->{layout}
1641 };
1450 1642
1643 unless (exists $self->{ox}) {
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453 : ($self->{w} - $tex->{w}) * 0.5); 1646 : ($self->{w} - $tex->{w}) * 0.5);
1454 1647
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457 : ($self->{h} - $tex->{h}) * 0.5); 1650 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1460 }; 1651 };
1461 1652
1462 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 1654
1465 if ($tex->{format} == GL_ALPHA) { 1655 if ($tex->{format} == GL_ALPHA) {
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466 glColor @{$self->{fg}}; 1657 glColor @{$self->{fg}};
1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468 } else { 1659 } else {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 } 1662 }
1471 1663
1472 glDisable GL_TEXTURE_2D; 1664 glDisable GL_TEXTURE_2D;
1473} 1665}
… …
1502 1694
1503 delete $self->{cur_h}; 1695 delete $self->{cur_h};
1504 1696
1505 return if $self->{text} eq $text; 1697 return if $self->{text} eq $text;
1506 1698
1507 delete $self->{texture};
1508
1509 $self->{last_activity} = $::NOW; 1699 $self->{last_activity} = $::NOW;
1510 $self->{text} = $text; 1700 $self->{text} = $text;
1511 1701
1512 $text =~ s/./*/g if $self->{hidden}; 1702 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1703 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h};
1514 1705
1515 $self->emit (changed => $self->{text}); 1706 $self->_emit (changed => $self->{text});
1707
1708 $self->realloc;
1709 $self->update;
1516} 1710}
1517 1711
1518sub set_text { 1712sub set_text {
1519 my ($self, $text) = @_; 1713 my ($self, $text) = @_;
1520 1714
1521 $self->{cursor} = length $text; 1715 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 1716 $self->_set_text ($text);
1523 $self->update;
1524 $self->check_size;
1525} 1717}
1526 1718
1527sub get_text { 1719sub get_text {
1528 $_[0]{text} 1720 $_[0]{text}
1529} 1721}
… …
1532 my ($self) = @_; 1724 my ($self) = @_;
1533 1725
1534 my ($w, $h) = $self->SUPER::size_request; 1726 my ($w, $h) = $self->SUPER::size_request;
1535 1727
1536 ($w + 1, $h) # add 1 for cursor 1728 ($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} 1729}
1544 1730
1545sub key_down { 1731sub key_down {
1546 my ($self, $ev) = @_; 1732 my ($self, $ev) = @_;
1547 1733
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1748 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1749 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1750 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1751 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1752 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1753 $self->_emit ('escape');
1568 } elsif ($uni) { 1754 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1755 substr $text, $self->{cursor}++, 0, chr $uni;
1756 } else {
1757 return 0;
1570 } 1758 }
1571 1759
1572 $self->_set_text ($text); 1760 $self->_set_text ($text);
1573 $self->update; 1761
1574 $self->check_size; 1762 $self->realloc;
1763
1764 1
1575} 1765}
1576 1766
1577sub focus_in { 1767sub focus_in {
1578 my ($self) = @_; 1768 my ($self) = @_;
1579 1769
… …
1594 utf8::encode $text; 1784 utf8::encode $text;
1595 $self->{cursor} = length substr $text, 0, $idx; 1785 $self->{cursor} = length substr $text, 0, $idx;
1596 1786
1597 $self->_set_text ($self->{text}); 1787 $self->_set_text ($self->{text});
1598 $self->update; 1788 $self->update;
1789
1790 1
1599} 1791}
1600 1792
1601sub mouse_motion { 1793sub mouse_motion {
1602 my ($self, $ev, $x, $y) = @_; 1794 my ($self, $ev, $x, $y) = @_;
1603# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1795# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1796
1797 0
1604} 1798}
1605 1799
1606sub _draw { 1800sub _draw {
1607 my ($self) = @_; 1801 my ($self) = @_;
1608 1802
1609 local $self->{fg} = $self->{fg}; 1803 local $self->{fg} = $self->{fg};
1610 1804
1611 if ($FOCUS == $self) { 1805 if ($FOCUS == $self) {
1612 glColor @{$self->{active_bg}}; 1806 glColor_premultiply @{$self->{active_bg}};
1613 $self->{fg} = $self->{active_fg}; 1807 $self->{fg} = $self->{active_fg};
1614 } else { 1808 } else {
1615 glColor @{$self->{bg}}; 1809 glColor_premultiply @{$self->{bg}};
1616 } 1810 }
1617 1811
1618 glEnable GL_BLEND; 1812 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1813 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620 glBegin GL_QUADS; 1814 glBegin GL_QUADS;
1621 glVertex 0 , 0; 1815 glVertex 0 , 0;
1622 glVertex 0 , $self->{h}; 1816 glVertex 0 , $self->{h};
1623 glVertex $self->{w}, $self->{h}; 1817 glVertex $self->{w}, $self->{h};
1624 glVertex $self->{w}, 0; 1818 glVertex $self->{w}, 0;
… …
1659 if ($sym == 13) { 1853 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1854 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1855 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1856 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1857 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1858 $self->_emit (activate => $txt);
1665 $self->update; 1859 $self->update;
1666 1860
1667 } elsif ($sym == CFClient::SDLK_UP) { 1861 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1862 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1863 $self->{history_saveback} = $self->get_text;
… …
1685 } else { 1879 } else {
1686 $self->set_text ($self->{history_saveback}); 1880 $self->set_text ($self->{history_saveback});
1687 } 1881 }
1688 1882
1689 } else { 1883 } else {
1690 $self->SUPER::key_down ($ev); 1884 return $self->SUPER::key_down ($ev)
1885 }
1886
1691 } 1887 1
1692
1693} 1888}
1694 1889
1695############################################################################# 1890#############################################################################
1696 1891
1697package CFClient::UI::Button; 1892package CFClient::UI::Button;
… …
1706 1901
1707sub new { 1902sub new {
1708 my $class = shift; 1903 my $class = shift;
1709 1904
1710 $class->SUPER::new ( 1905 $class->SUPER::new (
1711 padding => 4, 1906 padding_x => 4,
1907 padding_y => 4,
1712 fg => [1, 1, 1], 1908 fg => [1, 1, 1],
1713 active_fg => [0, 0, 1], 1909 active_fg => [0, 0, 1],
1714 can_hover => 1, 1910 can_hover => 1,
1715 align => 0, 1911 align => 0,
1716 valign => 0, 1912 valign => 0,
1717 can_events => 1, 1913 can_events => 1,
1718 @_ 1914 @_
1719 ) 1915 )
1720} 1916}
1721 1917
1918sub activate { }
1919
1722sub button_up { 1920sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1921 my ($self, $ev, $x, $y) = @_;
1724 1922
1923 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1924 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1925 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate"); 1926
1728 } 1927 1
1729} 1928}
1730 1929
1731sub _draw { 1930sub _draw {
1732 my ($self) = @_; 1931 my ($self) = @_;
1733 1932
1734 local $self->{fg} = $self->{fg}; 1933 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1735
1736 if ($GRAB == $self) {
1737 $self->{fg} = $self->{active_fg};
1738 }
1739 1934
1740 glEnable GL_TEXTURE_2D; 1935 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1936 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 glColor 0, 0, 0, 1; 1937 glColor 0, 0, 0, 1;
1743 1938
… …
1762 1957
1763sub new { 1958sub new {
1764 my $class = shift; 1959 my $class = shift;
1765 1960
1766 $class->SUPER::new ( 1961 $class->SUPER::new (
1767 padding => 2, 1962 padding_x => 2,
1963 padding_y => 2,
1768 fg => [1, 1, 1], 1964 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 1965 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 1966 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 1967 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 1968 state => 0,
… …
1776} 1972}
1777 1973
1778sub size_request { 1974sub size_request {
1779 my ($self) = @_; 1975 my ($self) = @_;
1780 1976
1781 ($self->{padding} * 2 + 6) x 2 1977 (6) x 2
1782} 1978}
1783 1979
1784sub button_down { 1980sub button_down {
1785 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1786 1982
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1983 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1984 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 1985 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1986 $self->_emit (changed => $self->{state});
1987 } else {
1988 return 0
1989 }
1990
1791 } 1991 1
1792} 1992}
1793 1993
1794sub _draw { 1994sub _draw {
1795 my ($self) = @_; 1995 my ($self) = @_;
1796 1996
1797 $self->SUPER::_draw; 1997 $self->SUPER::_draw;
1798 1998
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1999 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 2000
1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2001 my ($w, $h) = @$self{qw(w h)};
2002
2003 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802 2004
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2005 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 2006
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2007 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 2008
… …
1961 2163
1962 my $h1 = $self->{h} * (1 - $ycut1); 2164 my $h1 = $self->{h} * (1 - $ycut1);
1963 my $h2 = $self->{h} * (1 - $ycut2); 2165 my $h2 = $self->{h} * (1 - $ycut2);
1964 2166
1965 glEnable GL_BLEND; 2167 glEnable GL_BLEND;
1966 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2168 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2169 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1967 glEnable GL_TEXTURE_2D; 2170 glEnable GL_TEXTURE_2D;
1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969 2172
1970 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2173 glBindTexture GL_TEXTURE_2D, $t1->{name};
1971 glBegin GL_QUADS; 2174 glBegin GL_QUADS;
… …
2071 fg => [1, 1, 1], 2274 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2275 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2276 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2277 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10, 0], 2278 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2279 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2280 min_h => $::WIDTH / 80,
2078 vertical => 0, 2281 vertical => 0,
2079 can_hover => 1, 2282 can_hover => 1,
2080 inner_pad => 0.02, 2283 inner_pad => 0.02,
2081 @_ 2284 @_
2082 ); 2285 );
… …
2085 $self->update; 2288 $self->update;
2086 2289
2087 $self 2290 $self
2088} 2291}
2089 2292
2293sub changed { }
2294
2090sub set_range { 2295sub set_range {
2091 my ($self, $range) = @_; 2296 my ($self, $range) = @_;
2092 2297
2093 $self->{range} = $range; 2298 ($range, $self->{range}) = ($self->{range}, $range);
2094 2299
2095 $self->update; 2300 $self->update
2301 if "@$range" ne "@{$self->{range}}";
2096} 2302}
2097 2303
2098sub set_value { 2304sub set_value {
2099 my ($self, $value) = @_; 2305 my ($self, $value) = @_;
2100 2306
… …
2111 if $unit; 2317 if $unit;
2112 2318
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2319 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2320
2115 if ($value != $old_value) { 2321 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2322 $self->_emit (changed => $value);
2117 $self->update; 2323 $self->update;
2118 } 2324 }
2119} 2325}
2120 2326
2121sub size_request { 2327sub size_request {
2122 my ($self) = @_; 2328 my ($self) = @_;
2123 2329
2124 my $w = $self->{req_w}; 2330 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2331}
2129 2332
2130sub button_down { 2333sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2334 my ($self, $ev, $x, $y) = @_;
2132 2335
2133 $self->SUPER::button_down ($ev, $x, $y); 2336 $self->SUPER::button_down ($ev, $x, $y);
2134 2337
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2338 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136 2339
2137 $self->mouse_motion ($ev, $x, $y); 2340 $self->mouse_motion ($ev, $x, $y)
2138} 2341}
2139 2342
2140sub mouse_motion { 2343sub mouse_motion {
2141 my ($self, $ev, $x, $y) = @_; 2344 my ($self, $ev, $x, $y) = @_;
2142 2345
… …
2146 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2349 my (undef, $lo, $hi, $page) = @{$self->{range}};
2147 2350
2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2351 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149 2352
2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2353 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2354 } else {
2355 return 0;
2356 }
2357
2151 } 2358 1
2152} 2359}
2153 2360
2154sub update { 2361sub update {
2155 my ($self) = @_; 2362 my ($self) = @_;
2156 2363
2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2364 delete $self->{knob_w};
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370
2371 unless ($self->{knob_w}) {
2158 $self->set_value ($self->{range}[0]); 2372 $self->set_value ($self->{range}[0]);
2159 2373
2160 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2374 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100; 2375 my $range = ($hi - $page - $lo) || 1e-100;
2162 2376
… …
2168 $value = ($value - $lo) / $range; 2382 $value = ($value - $lo) / $range;
2169 $value = $value * $self->{scale} + $self->{offset}; 2383 $value = $value * $self->{scale} + $self->{offset};
2170 2384
2171 $self->{knob_x} = $value - $knob_w * 0.5; 2385 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $knob_w; 2386 $self->{knob_w} = $knob_w;
2173 }); 2387 }
2174
2175 $self->SUPER::update;
2176}
2177
2178sub _draw {
2179 my ($self) = @_;
2180 2388
2181 $self->SUPER::_draw (); 2389 $self->SUPER::_draw ();
2182 2390
2183 glScale $self->{w}, $self->{h}; 2391 glScale $self->{w}, $self->{h};
2184 2392
… …
2378 2586
2379 delete $self->{texture}; 2587 delete $self->{texture};
2380 } 2588 }
2381 2589
2382 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2590 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2383 glClearColor 0.5, 0.5, 0.5, 0; 2591 glClearColor 0, 0, 0, 0;
2384 glClear GL_COLOR_BUFFER_BIT; 2592 glClear GL_COLOR_BUFFER_BIT;
2385 2593
2386 my $top = int $self->{children}[1]{range}[0]; 2594 my $top = int $self->{children}[1]{range}[0];
2387 2595
2388 my $y0 = $top; 2596 my $y0 = $top;
… …
2423sub _draw { 2631sub _draw {
2424 my ($self) = @_; 2632 my ($self) = @_;
2425 2633
2426 glEnable GL_TEXTURE_2D; 2634 glEnable GL_TEXTURE_2D;
2427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2428 glColor 1, 1, 1, 1; 2636 glColor 0, 0, 0, 1;
2429 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2637 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2430 glDisable GL_TEXTURE_2D; 2638 glDisable GL_TEXTURE_2D;
2431 2639
2432 $self->{children}[1]->draw; 2640 $self->{children}[1]->draw;
2433 2641
2434} 2642}
… …
2483 2691
2484sub new { 2692sub new {
2485 my $class = shift; 2693 my $class = shift;
2486 2694
2487 my $self = $class->SUPER::new ( 2695 my $self = $class->SUPER::new (
2488 state => 0, 2696 state => 0,
2489 connect_activate => \&toggle_flopper, 2697 on_activate => \&toggle_flopper,
2490 @_ 2698 @_
2491 ); 2699 );
2492 2700
2493 if ($self->{state}) {
2494 $self->{state} = 0;
2495 $self->toggle_flopper;
2496 }
2497
2498 $self 2701 $self
2499} 2702}
2500 2703
2501sub toggle_flopper { 2704sub toggle_flopper {
2502 my ($self) = @_; 2705 my ($self) = @_;
2503 2706
2504 # TODO: use animation 2707 $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} 2708}
2516 2709
2517############################################################################# 2710#############################################################################
2518 2711
2519package CFClient::UI::Tooltip; 2712package CFClient::UI::Tooltip;
… …
2532} 2725}
2533 2726
2534sub set_tooltip_from { 2727sub set_tooltip_from {
2535 my ($self, $widget) = @_; 2728 my ($self, $widget) = @_;
2536 2729
2730 my $tooltip = $widget->{tooltip};
2731
2732 if ($ENV{CFPLUS_DEBUG} & 2) {
2733 $tooltip .= "\n\n" . (ref $widget) . "\n"
2734 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2735 . "req $widget->{req_w} $widget->{req_h}\n"
2736 . "visible $widget->{visible}";
2737 }
2738
2537 $self->add (new CFClient::UI::Label 2739 $self->add (new CFClient::UI::Label
2538 markup => $widget->{tooltip}, 2740 markup => $tooltip,
2539 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2741 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540 fontsize => 0.8, 2742 fontsize => 0.8,
2541 fg => [0, 0, 0, 1], 2743 fg => [0, 0, 0, 1],
2542 ellipsise => 0, 2744 ellipsise => 0,
2543 font => ($widget->{tooltip_font} || $::FONT_PROP), 2745 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2554 2756
2555sub size_allocate { 2757sub size_allocate {
2556 my ($self, $w, $h) = @_; 2758 my ($self, $w, $h) = @_;
2557 2759
2558 $self->SUPER::size_allocate ($w - 4, $h - 4); 2760 $self->SUPER::size_allocate ($w - 4, $h - 4);
2761}
2762
2763sub visibility_change {
2764 my ($self, $visible) = @_;
2765
2766 return unless $visible;
2767
2768 $self->{root}->on_post_alloc ("move_$self" => sub {
2769 my $widget = $self->{owner}
2770 or return;
2771
2772 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2773
2774 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2775 if $x + $self->{w} > $::WIDTH;
2776
2777 $self->move_abs ($x, $y);
2778 });
2559} 2779}
2560 2780
2561sub _draw { 2781sub _draw {
2562 my ($self) = @_; 2782 my ($self) = @_;
2563 2783
… …
2580 glVertex $w, $h; 2800 glVertex $w, $h;
2581 glVertex $w, 0; 2801 glVertex $w, 0;
2582 glEnd; 2802 glEnd;
2583 2803
2584 glTranslate 2 - 0.375, 2 - 0.375; 2804 glTranslate 2 - 0.375, 2 - 0.375;
2805
2585 $self->SUPER::_draw; 2806 $self->SUPER::_draw;
2586} 2807}
2587 2808
2588############################################################################# 2809#############################################################################
2589 2810
… …
2595 2816
2596sub new { 2817sub new {
2597 my $class = shift; 2818 my $class = shift;
2598 2819
2599 my $self = $class->SUPER::new ( 2820 my $self = $class->SUPER::new (
2600 aspect => 1, 2821 aspect => 1,
2822 can_events => 0,
2601 @_, 2823 @_,
2602 ); 2824 );
2603 2825
2604 if ($self->{anim} && $self->{animspeed}) { 2826 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self); 2827 Scalar::Util::weaken (my $widget = $self);
… …
2647 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2869 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2648 2870
2649 if ($tex) { 2871 if ($tex) {
2650 glEnable GL_TEXTURE_2D; 2872 glEnable GL_TEXTURE_2D;
2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2652 glColor 1, 1, 1, 1; 2874 glColor 0, 0, 0, 1;
2653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2654 glDisable GL_TEXTURE_2D; 2876 glDisable GL_TEXTURE_2D;
2655 } 2877 }
2656} 2878}
2657 2879
… …
2664 $self->SUPER::DESTROY; 2886 $self->SUPER::DESTROY;
2665} 2887}
2666 2888
2667############################################################################# 2889#############################################################################
2668 2890
2669package CFClient::UI::InventoryItem; 2891package CFClient::UI::Buttonbar;
2670 2892
2671our @ISA = CFClient::UI::HBox::; 2893our @ISA = CFClient::UI::HBox::;
2672 2894
2673sub _item_to_desc { 2895# 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 2896
2830############################################################################# 2897#############################################################################
2831 2898
2832package CFClient::UI::Menu; 2899package CFClient::UI::Menu;
2833 2900
… …
2867 2934
2868# popup given the event (must be a mouse button down event currently) 2935# popup given the event (must be a mouse button down event currently)
2869sub popup { 2936sub popup {
2870 my ($self, $ev) = @_; 2937 my ($self, $ev) = @_;
2871 2938
2872 $self->emit ("popdown"); 2939 $self->_emit ("popdown");
2873 2940
2874 # maybe save $GRAB? must be careful about events... 2941 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 2942 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 2943 $self->{button} = $ev->{button};
2877 2944
2878 $self->show; 2945 $self->show;
2879 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2946 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880} 2947}
2881 2948
2882sub mouse_motion { 2949sub mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 2950 my ($self, $ev, $x, $y) = @_;
2884 2951
2885 # TODO: should use vbox->find_widget or so 2952 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2953 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 2954 $self->{hover} = $self->{item}{$HOVER};
2955
2956 0
2888} 2957}
2889 2958
2890sub button_up { 2959sub button_up {
2891 my ($self, $ev, $x, $y) = @_; 2960 my ($self, $ev, $x, $y) = @_;
2892 2961
2893 if ($ev->{button} == $self->{button}) { 2962 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 2963 undef $GRAB;
2895 $self->hide; 2964 $self->hide;
2896 2965
2897 $self->emit ("popdown"); 2966 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2967 $self->{hover}[1]->() if $self->{hover};
2968 } else {
2969 return 0
2970 }
2971
2899 } 2972 1
2900} 2973}
2901 2974
2902############################################################################# 2975#############################################################################
2903 2976
2904package CFClient::UI::Statusbox; 2977package CFClient::UI::Multiplexer;
2905 2978
2906our @ISA = CFClient::UI::VBox::; 2979our @ISA = CFClient::UI::Container::;
2907 2980
2908sub new { 2981sub new {
2909 my $class = shift; 2982 my $class = shift;
2910 2983
2911 $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2985 @_,
2986 );
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990
2991 $self
2992}
2993
2994sub add {
2995 my ($self, @widgets) = @_;
2996
2997 $self->SUPER::add (@widgets);
2998
2999 $self->{current} = $self->{children}[0]
3000 if @{ $self->{children} };
3001}
3002
3003sub set_current_page {
3004 my ($self, $page_or_widget) = @_;
3005
3006 my $widget = ref $page_or_widget
3007 ? $page_or_widget
3008 : $self->{children}[$page_or_widget];
3009
3010 $self->{current} = $widget;
3011 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3012
3013 $self->_emit (page_changed => $self->{current});
3014
3015 $self->realloc;
3016}
3017
3018sub visible_children {
3019 $_[0]{current}
3020}
3021
3022sub size_request {
3023 my ($self) = @_;
3024
3025 $self->{current}->size_request
3026}
3027
3028sub size_allocate {
3029 my ($self, $w, $h) = @_;
3030
3031 $self->{current}->configure (0, 0, $w, $h);
3032}
3033
3034sub _draw {
3035 my ($self) = @_;
3036
3037 $self->{current}->draw;
3038}
3039
3040#############################################################################
3041
3042package CFClient::UI::Notebook;
3043
3044our @ISA = CFClient::UI::VBox::;
3045
3046sub new {
3047 my $class = shift;
3048
3049 my $self = $class->SUPER::new (
3050 buttonbar => (new CFClient::UI::Buttonbar),
3051 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3052 # filter => # will be put between multiplexer and $self
3053 @_,
3054 );
3055
3056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3057 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3058
3059 $self
3060}
3061
3062sub add {
3063 my ($self, $title, $widget, $tooltip) = @_;
3064
3065 Scalar::Util::weaken $self;
3066
3067 $self->{buttonbar}->add (new CFClient::UI::Button
3068 markup => $title,
3069 tooltip => $tooltip,
3070 on_activate => sub { $self->set_current_page ($widget) },
3071 );
3072
3073 $self->{multiplexer}->add ($widget);
3074}
3075
3076sub set_current_page {
3077 my ($self, $page) = @_;
3078
3079 $self->{multiplexer}->set_current_page ($page);
3080 $self->_emit (page_changed => $self->{multiplexer}{current});
3081}
3082
3083#############################################################################
3084
3085package CFClient::UI::Statusbox;
3086
3087our @ISA = CFClient::UI::VBox::;
3088
3089sub new {
3090 my $class = shift;
3091
3092 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3093 fontsize => 0.8,
2913 @_, 3094 @_,
2914 ) 3095 );
3096
3097 Scalar::Util::weaken (my $this = $self);
3098
3099 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3100
3101 $self
2915} 3102}
2916 3103
2917sub reorder { 3104sub reorder {
2918 my ($self) = @_; 3105 my ($self) = @_;
2919 my $NOW = time; 3106 my $NOW = Time::HiRes::time;
3107
3108 # freeze display when hovering over any label
3109 return if $CFClient::UI::TOOLTIP->{owner}
3110 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3111 values %{ $self->{item} };
2920 3112
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3113 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3114 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3115 }
2924 3116
… …
2927 my @items = sort { 3119 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3120 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3121 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3122 } values %{ $self->{item} };
2931 3123
3124 $self->{timer}->interval (1);
3125
2932 my $count = 10 + 1; 3126 my $count = 10 + 1;
2933 for my $item (@items) { 3127 for my $item (@items) {
2934 last unless --$count; 3128 last unless --$count;
2935 3129
2936 push @widgets, $item->{label} ||= do { 3130 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3131 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3132 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3133 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3134 : $item->{text};
2941 3135
… …
2949 tooltip => $item->{tooltip}, 3143 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3144 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3145 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3146 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3147 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3148 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3149 can_events => 1,
2956 can_hover => 1 3150 can_hover => 1
2957 }; 3151 };
3152
3153 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3154 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3155 $label->update;
3156 $label->set_max_size (undef, $label->{req_h} * $diff)
3157 if $diff < 1;
3158 $self->{timer}->interval (1/30);
3159 } else {
3160 $label->{fg}[3] = $item->{fg}[3] || 1;
3161 }
3162
3163 push @widgets, $label;
2958 } 3164 }
2959 3165
2960 $self->clear; 3166 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3167 $self->SUPER::add (reverse @widgets);
2962} 3168}
… …
2965 my ($self, $text, %arg) = @_; 3171 my ($self, $text, %arg) = @_;
2966 3172
2967 $text =~ s/^\s+//; 3173 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3174 $text =~ s/\s+$//;
2969 3175
3176 return unless $text;
3177
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 3178 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2971 3179
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3180 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 3181
2974 if (my $item = $self->{item}{$group}) { 3182 if (my $item = $self->{item}{$group}) {
2975 if ($item->{text} eq $text) { 3183 if ($item->{text} eq $text) {
… …
3005 3213
3006 $self->reorder; 3214 $self->reorder;
3007 $self->SUPER::reconfigure; 3215 $self->SUPER::reconfigure;
3008} 3216}
3009 3217
3218sub DESTROY {
3219 my ($self) = @_;
3220
3221 $self->{timer}->cancel;
3222
3223 $self->SUPER::DESTROY;
3224}
3225
3010############################################################################# 3226#############################################################################
3011 3227
3012package CFClient::UI::Root; 3228package CFClient::UI::Inventory;
3013 3229
3014our @ISA = CFClient::UI::Container::; 3230our @ISA = CFClient::UI::ScrolledWindow::;
3015
3016use CFClient::OpenGL;
3017 3231
3018sub new { 3232sub new {
3019 my $class = shift; 3233 my $class = shift;
3020 3234
3021 $class->SUPER::new ( 3235 my $self = $class->SUPER::new (
3236 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3237 @_,
3238 );
3239
3240 $self
3241}
3242
3243sub set_items {
3244 my ($self, $items) = @_;
3245
3246 $self->{child}->clear;
3247 return unless $items;
3248
3249 my @items = sort {
3250 ($a->{type} <=> $b->{type})
3251 or ($a->{name} cmp $b->{name})
3252 } @$items;
3253
3254 $self->{real_items} = \@items;
3255
3256 my $row = 0;
3257 for my $item (@items) {
3258 CFClient::Item::update_widgets $item;
3259
3260 $self->{child}->add (0, $row, $item->{face_widget});
3261 $self->{child}->add (1, $row, $item->{desc_widget});
3262 $self->{child}->add (2, $row, $item->{weight_widget});
3263
3264 $row++;
3265 }
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::BindEditor;
3271
3272our @ISA = CFClient::UI::FancyFrame::;
3273
3274sub new {
3275 my $class = shift;
3276
3277 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3278
3279 $self->add (my $vb = new CFClient::UI::VBox);
3280
3281
3282 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3283 text => "start recording",
3284 tooltip => "Start/Stops recording of actions."
3285 ."All subsequent actions after the recording started will be captured."
3286 ."The actions are displayed after the record was stopped."
3287 ."To bind the action you have to click on the 'Bind' button",
3288 on_activate => sub {
3289 unless ($self->{recording}) {
3290 $self->start;
3291 } else {
3292 $self->stop;
3293 }
3294 });
3295
3296 $vb->add (new CFClient::UI::Label text => "Actions:");
3297 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3298
3299 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3300 $vb->add (my $hb = new CFClient::UI::HBox);
3301 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3302 $hb->add (new CFClient::UI::Button
3303 text => "bind",
3304 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3305 on_activate => sub {
3306 $self->ask_for_bind;
3307 });
3308
3309 $vb->add (my $hb = new CFClient::UI::HBox);
3310 $hb->add (new CFClient::UI::Button
3311 text => "ok",
3312 expand => 1,
3313 tooltip => "This closes the binding editor and saves the binding",
3314 on_activate => sub {
3315 $self->hide;
3316 $self->commit;
3317 });
3318
3319 $hb->add (new CFClient::UI::Button
3320 text => "cancel",
3321 expand => 1,
3322 tooltip => "This closes the binding editor without saving",
3323 on_activate => sub {
3324 $self->hide;
3325 $self->{binding_cancel}->()
3326 if $self->{binding_cancel};
3327 });
3328
3329 $self->update_binding_widgets;
3330
3331 $self
3332}
3333
3334sub commit {
3335 my ($self) = @_;
3336 my ($mod, $sym, $cmds) = $self->get_binding;
3337 if ($sym != 0 && @$cmds > 0) {
3338 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3339 ."'. Don't forget 'Save Config'!");
3340 $self->{binding_change}->($mod, $sym, $cmds)
3341 if $self->{binding_change};
3342 } else {
3343 $::STATUSBOX->add ("No action bound, no key or action specified!");
3344 $self->{binding_cancel}->()
3345 if $self->{binding_cancel};
3346 }
3347}
3348
3349sub start {
3350 my ($self) = @_;
3351
3352 $self->{rec_btn}->set_text ("stop recording");
3353 $self->{recording} = 1;
3354 $self->clear_command_list;
3355 $::CONN->start_record if $::CONN;
3356}
3357
3358sub stop {
3359 my ($self) = @_;
3360
3361 $self->{rec_btn}->set_text ("start recording");
3362 $self->{recording} = 0;
3363
3364 my $rec;
3365 $rec = $::CONN->stop_record if $::CONN;
3366 return unless ref $rec eq 'ARRAY';
3367 $self->set_command_list ($rec);
3368}
3369
3370
3371sub ask_for_bind_and_commit {
3372 my ($self) = @_;
3373 $self->ask_for_bind (1);
3374}
3375
3376sub ask_for_bind {
3377 my ($self, $commit) = @_;
3378
3379 CFClient::Binder::open_binding_dialog (sub {
3380 my ($mod, $sym) = @_;
3381 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3382 $self->update_binding_widgets;
3383 $self->commit if $commit;
3384 });
3385}
3386
3387# $mod and $sym are the modifiers and key symbol
3388# $cmds is a array ref of strings (the commands)
3389# $cb is the callback that is executed on OK
3390# $ccb is the callback that is executed on CANCEL and
3391# when the binding was unsuccessful on OK
3392sub set_binding {
3393 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3394
3395 $self->clear_command_list;
3396 $self->{recording} = 0;
3397 $self->{rec_btn}->set_text ("start recording");
3398
3399 $self->{binding} = [$mod, $sym];
3400 $self->{commands} = $cmds;
3401
3402 $self->{binding_change} = $cb;
3403 $self->{binding_cancel} = $ccb;
3404
3405 $self->update_binding_widgets;
3406}
3407
3408# this is a shortcut method that asks for a binding
3409# and then just binds it.
3410sub do_quick_binding {
3411 my ($self, $cmds) = @_;
3412 $self->set_binding (undef, undef, $cmds, sub {
3413 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3414 });
3415 $self->ask_for_bind (1);
3416}
3417
3418sub update_binding_widgets {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3422 $self->set_command_list ($cmds);
3423}
3424
3425sub get_binding {
3426 my ($self) = @_;
3427 return (
3428 $self->{binding}->[0],
3429 $self->{binding}->[1],
3430 [ grep { defined $_ } @{$self->{commands}} ]
3431 );
3432}
3433
3434sub clear_command_list {
3435 my ($self) = @_;
3436 $self->{cmdbox}->clear ();
3437}
3438
3439sub set_command_list {
3440 my ($self, $cmds) = @_;
3441
3442 $self->{cmdbox}->clear ();
3443 $self->{commands} = $cmds;
3444
3445 my $idx = 0;
3446
3447 for (@$cmds) {
3448 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3449
3450 my $i = $idx;
3451 $hb->add (new CFClient::UI::Label text => $_);
3452 $hb->add (new CFClient::UI::Button
3453 text => "delete",
3454 tooltip => "Deletes the action from the record",
3455 on_activate => sub {
3456 $self->{cmdbox}->remove ($hb);
3457 $cmds->[$i] = undef;
3458 });
3459
3460
3461 $idx++
3462 }
3463}
3464
3465#############################################################################
3466
3467package CFClient::UI::SpellList;
3468
3469our @ISA = CFClient::UI::Table::;
3470
3471sub new {
3472 my $class = shift;
3473
3474 my $self = $class->SUPER::new (
3475 binding => [],
3476 commands => [],
3022 @_, 3477 @_,
3023 ) 3478 )
3024} 3479}
3025 3480
3026sub configure { 3481# XXX: Do sorting? Argl...
3027 my ($self, $x, $y, $w, $h) = @_; 3482sub add_spell {
3028
3029 $self->{w} = $w;
3030 $self->{h} = $h;
3031}
3032
3033sub check_size {
3034 my ($self) = @_; 3483 my ($self, $spell) = @_;
3484 $self->{spells}->{$spell->{name}} = $spell;
3035 3485
3036 $self->size_allocate ($self->{w}, $self->{h}) 3486 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3037 if $self->{w}; 3487 face => $spell->{face},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message});
3491
3492 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3493 text => $spell->{name},
3494 can_hover => 1,
3495 can_events => 1,
3496 tooltip => $spell->{message},
3497 expand => 1);
3498
3499 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3500 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3501 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3502 expand => 1);
3503
3504 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3505 text => "bind to key",
3506 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3507}
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511 $self->{tbl_idx} = 0;
3512 $self->add_spell ($_) for values %{$self->{spells}};
3513}
3514
3515sub remove_spell {
3516 my ($self, $spell) = @_;
3517 delete $self->{spells}->{$spell->{name}};
3518 $self->rebuild_spell_list;
3519}
3520
3521#############################################################################
3522
3523package CFClient::UI::Root;
3524
3525our @ISA = CFClient::UI::Container::;
3526
3527use List::Util qw(min max);
3528
3529use CFClient::OpenGL;
3530
3531sub new {
3532 my $class = shift;
3533
3534 my $self = $class->SUPER::new (
3535 visible => 1,
3536 @_,
3537 );
3538
3539 Scalar::Util::weaken ($self->{root} = $self);
3540
3541 $self
3038} 3542}
3039 3543
3040sub size_request { 3544sub size_request {
3041 my ($self) = @_; 3545 my ($self) = @_;
3042 3546
3043 ($self->{w}, $self->{h}) 3547 ($self->{w}, $self->{h})
3548}
3549
3550sub _to_pixel {
3551 my ($coord, $size, $max) = @_;
3552
3553 $coord =
3554 $coord eq "center" ? ($max - $size) * 0.5
3555 : $coord eq "max" ? $max
3556 : $coord;
3557
3558 $coord = 0 if $coord < 0;
3559 $coord = $max - $size if $coord > $max - $size;
3560
3561 int $coord + 0.5
3044} 3562}
3045 3563
3046sub size_allocate { 3564sub size_allocate {
3047 my ($self, $w, $h) = @_; 3565 my ($self, $w, $h) = @_;
3048 3566
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) { 3567 for my $child ($self->children) {
3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3568 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057 3569
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3570 $X = $child->{force_x} if exists $child->{force_x};
3059 if exists $child->{req_x}; 3571 $Y = $child->{force_y} if exists $child->{force_y};
3060 3572
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3573 $X = _to_pixel $X, $W, $self->{w};
3062 if exists $child->{req_y}; 3574 $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 3575
3067 $child->configure ($X, $Y, $W, $H); 3576 $child->configure ($X, $Y, $W, $H);
3068 } 3577 }
3069} 3578}
3070 3579
… …
3081} 3590}
3082 3591
3083sub update { 3592sub update {
3084 my ($self) = @_; 3593 my ($self) = @_;
3085 3594
3086 $self->check_size;
3087 $::WANT_REFRESH++; 3595 $::WANT_REFRESH++;
3088} 3596}
3089 3597
3090sub add { 3598sub add {
3091 my ($self, @children) = @_; 3599 my ($self, @children) = @_;
3092 3600
3093 for my $child (@children) {
3094 $child->{toplevel} = 1; 3601 $_->{is_toplevel} = 1
3095 3602 for @children;
3096 # integerise window positions
3097 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y};
3099 }
3100 3603
3101 $self->SUPER::add (@children); 3604 $self->SUPER::add (@children);
3605}
3606
3607sub remove {
3608 my ($self, @children) = @_;
3609
3610 $self->SUPER::remove (@children);
3611
3612 delete $self->{is_toplevel}
3613 for @children;
3102 3614
3103 while (@children) { 3615 while (@children) {
3104 my $w = pop @children; 3616 my $w = pop @children;
3105 push @children, $w->children; 3617 push @children, $w->children;
3106 $w->{visible} = 1; 3618 $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 } 3619 }
3120} 3620}
3121 3621
3122sub on_refresh { 3622sub on_refresh {
3123 my ($self, $id, $cb) = @_; 3623 my ($self, $id, $cb) = @_;
… …
3137 while ($self->{refresh_hook}) { 3637 while ($self->{refresh_hook}) {
3138 $_->() 3638 $_->()
3139 for values %{delete $self->{refresh_hook}}; 3639 for values %{delete $self->{refresh_hook}};
3140 } 3640 }
3141 3641
3142 if ($self->{check_size}) { 3642 if ($self->{realloc}) {
3143 my @queue = ([], []); 3643 my %queue;
3644 my @queue;
3645 my $widget;
3144 3646
3145 for (;;) { 3647 outer:
3146 if ($self->{check_size}) { 3648 while () {
3147 # heuristic: check containers last 3649 if (my $realloc = delete $self->{realloc}) {
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3650 for $widget (values %$realloc) {
3149 for values %{delete $self->{check_size}} 3651 $widget->{visible} or next; # do not resize invisible widgets
3652
3653 $queue{$widget+0}++ and next; # duplicates are common
3654
3655 push @{ $queue[$widget->{visible}] }, $widget;
3656 }
3150 } 3657 }
3151 3658
3152 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3659 while () {
3660 @queue or last outer;
3153 3661
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3662 $widget = pop @{ $queue[-1] || [] }
3155 ? @$widget{qw(user_w user_h)} 3663 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 3664
3665 pop @queue;
3666 }
3667
3668 delete $queue{$widget+0};
3669
3670 my ($w, $h) = $widget->size_request;
3671
3672 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3673 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3674
3675 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3676 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3677
3678 $w = $widget->{force_w} if exists $widget->{force_w};
3679 $h = $widget->{force_h} if exists $widget->{force_h};
3680
3681 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3682 || delete $widget->{force_realloc}) {
3162 $widget->{req_w} = $w; 3683 $widget->{req_w} = $w;
3163 $widget->{req_h} = $h; 3684 $widget->{req_h} = $h;
3164 3685
3165 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3686 $self->{size_alloc}{$widget+0} = $widget;
3166 3687
3167 $widget->{parent}->check_size
3168 if $widget->{parent}; 3688 if (my $parent = $widget->{parent}) {
3689 $self->{realloc}{$parent+0} = $parent
3690 unless $queue{$parent+0};
3691
3692 $parent->{force_size_alloc} = 1;
3693 $self->{size_alloc}{$parent+0} = $parent;
3694 }
3169 } 3695 }
3696
3697 delete $self->{realloc}{$widget+0};
3170 } 3698 }
3171 } 3699 }
3172 3700
3173 while ($self->{size_alloc}) { 3701 while (my $size_alloc = delete $self->{size_alloc}) {
3174 for (values %{delete $self->{size_alloc}}) { 3702 my @queue = sort { $b->{visible} <=> $a->{visible} }
3175 my ($widget, $w, $h) = @$_; 3703 values %$size_alloc;
3704
3705 while () {
3706 my $widget = pop @queue || last;
3707
3708 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 3709
3177 $w = 0 if $w < 0; 3710 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 3711 $h = 0 if $h < 0;
3179 3712
3713 $w = int $w + 0.5;
3714 $h = int $h + 0.5;
3715
3716 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3717 $widget->{old_w} = $widget->{w};
3718 $widget->{old_h} = $widget->{h};
3719
3180 $widget->{w} = $w; 3720 $widget->{w} = $w;
3181 $widget->{h} = $h; 3721 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h); 3722
3183 $widget->emit (size_allocate => $w, $h); 3723 $widget->emit (size_allocate => $w, $h);
3724 }
3184 } 3725 }
3185 } 3726 }
3186 3727
3187 while ($self->{post_alloc_hook}) { 3728 while ($self->{post_alloc_hook}) {
3188 $_->() 3729 $_->()
3189 for values %{delete $self->{post_alloc_hook}}; 3730 for values %{delete $self->{post_alloc_hook}};
3190 } 3731 }
3732
3191 3733
3192 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3734 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3735 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194 glClear GL_COLOR_BUFFER_BIT; 3736 glClear GL_COLOR_BUFFER_BIT;
3195 3737
… …
3197 glLoadIdentity; 3739 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3740 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 3741 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 3742 glLoadIdentity;
3201 3743
3744 {
3745 package CFClient::UI::Base;
3746
3747 ($draw_x, $draw_y, $draw_w, $draw_h) =
3748 (0, 0, $self->{w}, $self->{h});
3749 }
3750
3202 $self->_draw; 3751 $self->_draw;
3203} 3752}
3204 3753
3205############################################################################# 3754#############################################################################
3206 3755

Diff Legend

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