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.322 by root, Wed Jul 5 01:53:24 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->{visible};
278 delete $self->{root};
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->emit ("focus_out");
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
235 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
236 if $self->{parent}; 313 if $self->{parent};
237} 314}
238 315
239sub move { 316sub move_abs {
240 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
241 318
242 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
243 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
244 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
245 322
246 $self->update; 323 $self->update;
247} 324}
248 325
249sub set_size { 326sub set_size {
250 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
251 328
252 $self->{user_w} = $w; 329 $self->{force_w} = $w;
253 $self->{user_h} = $h; 330 $self->{force_h} = $h;
254 331
255 $self->check_size; 332 $self->realloc;
256} 333}
257 334
258sub size_request { 335sub size_request {
259 require Carp; 336 require Carp;
260 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
261} 338}
262 339
340sub baseline_shift {
341 0
342}
343
263sub configure { 344sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
265 346
266 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
269 352
270 # use alignment to adjust x, y 353 # use alignment to adjust x, y
271 354
272 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 357 }
277 358
278 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 360 $self->{x} = $x;
280 $self->{y} = $y; 361 $self->{y} = $y;
281 $self->update; 362 $self->update;
282 } 363 }
283 364
284 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
286 }
287}
288 367
289sub size_allocate { 368 $self->{alloc_w} = $w;
290 # nothing to be done 369 $self->{alloc_h} = $h;
291}
292 370
293sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
294 my ($self) = @_; 372 }
295
296 $self->check_size (1);
297 $self->update;
298} 373}
299 374
300sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
301} 381}
302 382
303sub set_max_size { 383sub set_max_size {
304 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
305 385
306 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
308} 390}
309 391
310sub set_tooltip { 392sub set_tooltip {
311 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
312 394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
399
313 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
314 401
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
318 } 405 }
319} 406}
320 407
321# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
322sub coord2local { 409sub coord2local {
… …
330 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
331 418
332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
333} 420}
334 421
335sub focus_in { 422sub invoke_focus_in {
336 my ($self) = @_; 423 my ($self) = @_;
337 424
338 return if $FOCUS == $self; 425 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
340 427
341 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
342 429
343 $self->emit (focus_in => $focus); 430 $self->update;
344 431
345 $focus->update if $focus; 432 0
346 $FOCUS->update;
347} 433}
348 434
349sub focus_out { 435sub invoke_focus_out {
350 my ($self) = @_; 436 my ($self) = @_;
351 437
352 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
353 439
354 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
355 441
356 $self->emit (focus_out => $focus); 442 $self->update;
357 443
358 $focus->update if $focus; #? 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
359} 445 unless $FOCUS;
360 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
361sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
362sub button_up { } 458sub invoke_button_up { 1 }
363sub key_down { } 459sub invoke_key_down { 1 }
364sub key_up { } 460sub invoke_key_up { 1 }
365 461
366sub button_down { 462sub invoke_button_down {
367 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
368 464
369 $self->focus_in; 465 $self->grab_focus;
370}
371 466
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
376sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
484
485sub find_widget {
486 my ($self, $x, $y) = @_;
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496
497sub set_parent {
498 my ($self, $parent) = @_;
499
500 Scalar::Util::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible};
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377 535
378sub draw { 536sub draw {
379 my ($self) = @_; 537 my ($self) = @_;
380 538
381 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382 548
383 glPushMatrix; 549 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 551
388 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 554 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 556 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; 557 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 558 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 559 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 560 glVertex 0 , $self->{h};
412 glEnd; 561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
413 glPopMatrix; 575 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
416} 581}
417 582
418sub _draw { 583sub _draw {
419 my ($self) = @_; 584 my ($self) = @_;
420 585
421 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
422} 587}
423 588
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}
473
474sub DESTROY { 589sub DESTROY {
475 my ($self) = @_; 590 my ($self) = @_;
476 591
477 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
478 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
479} 596}
480 597
481############################################################################# 598#############################################################################
482 599
483package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
508 625
509 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
511 628
512 glEnable GL_BLEND; 629 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 631 glColor_premultiply @$color;
515 632
516 glBegin GL_QUADS; 633 glBegin GL_QUADS;
517 glVertex 0 , 0; 634 glVertex 0 , 0;
518 glVertex 0 , $h; 635 glVertex 0 , $h;
519 glVertex $w, $h; 636 glVertex $w, $h;
… …
534 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
536} 653}
537 654
538sub size_request { 655sub size_request {
539 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
540} 659}
541 660
542sub draw { } 661sub draw { }
543 662
544############################################################################# 663#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
549 668
550sub new { 669sub new {
551 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
552 671
553 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
554 673
555 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
556 children => [], 675 children => [],
557 can_events => 0, 676 can_events => 0,
558 %arg, 677 %arg,
559 ); 678 );
679
560 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
561 682
562 $self 683 $self
563} 684}
564 685
565sub add { 686sub add {
… …
573 $self->{children} = [ 694 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
576 ]; 697 ];
577 698
578 $self->check_size (1); 699 $self->realloc;
579 $self->update;
580} 700}
581 701
582sub children { 702sub children {
583 @{ $_[0]{children} } 703 @{ $_[0]{children} }
584} 704}
… …
589 delete $child->{parent}; 709 delete $child->{parent};
590 $child->hide; 710 $child->hide;
591 711
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 713
594 $self->check_size; 714 $self->realloc;
595 $self->update;
596} 715}
597 716
598sub clear { 717sub clear {
599 my ($self) = @_; 718 my ($self) = @_;
600 719
… …
604 for (@$children) { 723 for (@$children) {
605 delete $_->{parent}; 724 delete $_->{parent};
606 $_->hide; 725 $_->hide;
607 } 726 }
608 727
609 $self->check_size; 728 $self->realloc;
610 $self->update;
611} 729}
612 730
613sub find_widget { 731sub find_widget {
614 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
615 733
616 $x -= $self->{x}; 734 $x -= $self->{x};
617 $y -= $self->{y}; 735 $y -= $self->{y};
618 736
619 my $res; 737 my $res;
620 738
621 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
623 and return $res; 741 and return $res;
624 } 742 }
625 743
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
647} 765}
648 766
649sub add { 767sub add {
650 my ($self, $child) = @_; 768 my ($self, $child) = @_;
651 769
652 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
653
654 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
655} 772}
656 773
657sub remove { 774sub remove {
658 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
667 784
668sub size_request { 785sub size_request {
669 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
670} 787}
671 788
672sub size_allocate { 789sub invoke_size_allocate {
673 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
674 791
675 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
676} 795}
677 796
678############################################################################# 797#############################################################################
798
799# back-buffered drawing area
679 800
680package CFClient::UI::Window; 801package CFClient::UI::Window;
681 802
682our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
683 804
… …
694 815
695 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
696 $self->SUPER::update; 817 $self->SUPER::update;
697} 818}
698 819
699sub size_allocate { 820sub invoke_size_allocate {
700 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
701 822
702 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
704} 826}
705 827
706sub _render { 828sub _render {
829 my ($self) = @_;
830
707 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
708} 832}
709 833
710sub render_child { 834sub render_child {
711 my ($self) = @_; 835 my ($self) = @_;
712 836
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
716 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
717 $self->_render; 848 $self->_render;
718 }; 849 };
719} 850}
720 851
721sub _draw { 852sub _draw {
722 my ($self) = @_; 853 my ($self) = @_;
723 854
724 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
725 856
726 my $tex = $self->{texture} 857 my $tex = $self->{texture}
727 or return; 858 or return;
728 859
729 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
732 863
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734 865
735 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
736} 867}
… …
739 870
740package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
741 872
742our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
743 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
744sub size_request { 885sub size_request {
745 my ($self) = @_; 886 my ($self) = @_;
746 887
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 889
749 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
750} 891 $h = 10 if $self->{scroll_y};
751 892
893 ($w, $h)
894}
895
752sub size_allocate { 896sub invoke_size_allocate {
753 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
754 898
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 899 my $child = $self->child;
756# $w = $self->{w}; 900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903
757 $self->child->configure (0, 0, $cw, $ch); 904 $self->child->configure (0, 0, $w, $h);
758 $self->update; 905 $self->update;
906
907 1
759} 908}
760 909
761sub set_offset { 910sub set_offset {
762 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
763 912
… …
796} 945}
797 946
798sub _render { 947sub _render {
799 my ($self) = @_; 948 my ($self) = @_;
800 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 954
803 $self->SUPER::_render; 955 $self->SUPER::_render;
804} 956}
805 957
… …
808package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
809 961
810our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
811 963
812sub new { 964sub new {
813 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
814 968
815 my $self; 969 my $self;
816 970
817 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
818 vertical => 1, 972 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 974 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 975 $self->{vp}->set_offset (0, $_[1]);
822 }, 976 },
823 ; 977 ;
824 978
825 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
827 slider => $slider, 981 slider => $slider,
828 @_, 982 %arg,
829 ); 983 );
830 984
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
834 987
835 $self 988 $self
836} 989}
837 990
838#TODO# update range on size_allocate depending on child 991#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
1005sub update {
1006 my ($self) = @_;
1007
1008 $self->SUPER::update;
1009
1010 $self->update_slider;
1011}
1012
1013sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_;
1015
1016 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h)
1019}
840 1020
841############################################################################# 1021#############################################################################
842 1022
843package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
844 1024
… …
860 1040
861 if ($self->{bg}) { 1041 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
863 1043
864 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
867 1047
868 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
869 glVertex 0 , 0; 1049 glVertex 0 , 0;
870 glVertex 0 , $h; 1050 glVertex 0 , $h;
871 glVertex $w, $h; 1051 glVertex $w, $h;
… …
884 1064
885our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
886 1066
887use CFClient::OpenGL; 1067use CFClient::OpenGL;
888 1068
889my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 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); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892 1076
893sub new { 1077sub new {
894 my $class = shift; 1078 my ($class, %arg) = @_;
895
896 # TODO: user_x, user_y, overwrite moveto?
897 1079
898 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1083 border => 0.6,
902 toplevel => 1,
903 can_events => 1, 1084 can_events => 1,
904 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
905 ); 1088 );
906 1089
907 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
908 align => 0, 1091 align => 0,
909 valign => 1, 1092 valign => 1,
910 text => $self->{title}, 1093 text => $self->{title},
911 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
912 1105
913 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
914} 1115}
915 1116
916sub border { 1117sub border {
917 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
918} 1119}
919 1120
920sub size_request { 1121sub size_request {
921 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
922 1129
923 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
924 1131
925 ( 1132 (
926 $w + $self->border * 2, 1133 $w + $self->border * 2,
927 $h + $self->border * 2, 1134 $h + $self->border * 2,
928 ) 1135 )
929} 1136}
930 1137
931sub size_allocate { 1138sub invoke_size_allocate {
932 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
933 1140
1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1146
1147 my $border = $self->border;
1148
934 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
935 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
936 1151
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); 1152 $self->child->configure ($border, $border, $w, $h);
941}
942 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
943sub button_down { 1168sub invoke_button_down {
944 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
945 1170
946 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
947 my $border = $self->border; 1172 my $border = $self->border;
948 1173
… …
961 my ($ev, $x, $y) = @_; 1186 my ($ev, $x, $y) = @_;
962 1187
963 my $dx = $ev->{x} - $ox; 1188 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
965 1190
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1193
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size; 1195 $self->realloc;
970 }; 1196 };
971 1197
972 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1202 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
978 1204
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
980 1206
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update; 1208 # HACK: the next line is required to enforce placement
1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
983 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
984 } 1215 1
985} 1216}
986 1217
987sub button_up { 1218sub invoke_button_up {
988 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
989 1220
990 delete $self->{motion}; 1221 ! ! delete $self->{motion}
991} 1222}
992 1223
993sub mouse_motion { 1224sub invoke_mouse_motion {
994 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
995 1226
996 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
997} 1230}
998 1231
999sub _draw { 1232sub _draw {
1000 my ($self) = @_; 1233 my ($self) = @_;
1001 1234
1235 my $child = $self->{children}[0];
1236
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1239
1005 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1242
1008 my $border = $self->border; 1243 my $border = $self->border;
1009 1244
1010 glColor @{ $self->{border_bg} }; 1245 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1246 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1247 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1248 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1249 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015 1250
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1251 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1252 glColor @{ $self->{bg} };
1018 1253
1019 # TODO: repeat texture not scale 1254 # TODO: repeat texture not scale
1255 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1256 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1257 $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); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1259 }
1030 1260
1031 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1032 1262
1033 $self->{title}->draw if $self->{title};
1034
1035 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1036} 1274}
1037 1275
1038############################################################################# 1276#############################################################################
1039 1277
1040package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1048sub new { 1286sub new {
1049 my $class = shift; 1287 my $class = shift;
1050 1288
1051 $class->SUPER::new ( 1289 $class->SUPER::new (
1052 col_expand => [], 1290 col_expand => [],
1053 @_ 1291 @_,
1054 ) 1292 )
1293}
1294
1295sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1297}
1056 1298
1057sub add { 1299sub add {
1058 my ($self, $x, $y, $child) = @_; 1300 my ($self, $x, $y, $child) = @_;
1059 1301
1060 $child->set_parent ($self); 1302 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1062 1304
1063 $child->check_size; 1305 $self->realloc;
1064} 1306}
1065 1307
1066sub children { 1308sub remove {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1309 my ($self, $child) = @_;
1068}
1069 1310
1311 # TODO: not yet implemented
1312}
1313
1070# TODO: move to container class maybe? send childs a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1315sub clear {
1072 my ($self) = @_; 1316 my ($self) = @_;
1073 1317
1074 my @children = $self->children; 1318 my @children = $self->children;
1075 delete $self->{children}; 1319 delete $self->{children};
… …
1077 for (@children) { 1321 for (@children) {
1078 delete $_->{parent}; 1322 delete $_->{parent};
1079 $_->hide; 1323 $_->hide;
1080 } 1324 }
1081 1325
1082 $self->update; 1326 $self->realloc;
1083} 1327}
1084 1328
1085sub get_wh { 1329sub get_wh {
1086 my ($self) = @_; 1330 my ($self) = @_;
1087 1331
… …
1113 (sum @$ws), 1357 (sum @$ws),
1114 (sum @$hs), 1358 (sum @$hs),
1115 ) 1359 )
1116} 1360}
1117 1361
1118sub size_allocate { 1362sub invoke_size_allocate {
1119 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1120 1364
1121 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1122 1366
1123 my $req_w = sum @$ws; 1367 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1368 my $req_h = (sum @$hs) || 1;
1125 1369
1126 # TODO: nicer code && do row_expand 1370 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1371 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1372 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1373 my $col_expand = (sum @col_expand) || 1;
… …
1155 } 1399 }
1156 1400
1157 $y += $row_h; 1401 $y += $row_h;
1158 } 1402 }
1159 1403
1404 1
1160} 1405}
1161 1406
1162sub find_widget { 1407sub find_widget {
1163 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1164 1409
… …
1183 } 1428 }
1184} 1429}
1185 1430
1186############################################################################# 1431#############################################################################
1187 1432
1433package CFClient::UI::Box;
1434
1435our @ISA = CFClient::UI::Container::;
1436
1437sub size_request {
1438 my ($self) = @_;
1439
1440 $self->{vertical}
1441 ? (
1442 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1443 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1444 )
1445 : (
1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1448 )
1449}
1450
1451sub invoke_size_allocate {
1452 my ($self, $w, $h) = @_;
1453
1454 my $space = $self->{vertical} ? $h : $w;
1455 my @children = $self->visible_children;
1456
1457 my @req;
1458
1459 if ($self->{homogeneous}) {
1460 @req = ($space / (@children || 1)) x @children;
1461 } else {
1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1463 my $req = List::Util::sum @req;
1464
1465 if ($req > $space) {
1466 # ah well, not enough space
1467 $_ *= $space / $req for @req;
1468 } else {
1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1470
1471 $space = ($space - $req) / $expand; # remaining space to give away
1472
1473 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children;
1475 }
1476 }
1477
1478 CFClient::UI::harmonize \@req;
1479
1480 my $pos = 0;
1481 for (0 .. $#children) {
1482 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1484
1485 $pos += $alloc;
1486 }
1487
1488 1
1489}
1490
1491#############################################################################
1492
1188package CFClient::UI::HBox; 1493package CFClient::UI::HBox;
1189 1494
1190# TODO: wrap into common Box base class
1191
1192our @ISA = CFClient::UI::Container::; 1495our @ISA = CFClient::UI::Box::;
1193 1496
1194sub size_request { 1497sub new {
1195 my ($self) = @_; 1498 my $class = shift;
1196 1499
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1500 $class->SUPER::new (
1198 1501 vertical => 0,
1199 ( 1502 @_,
1200 (List::Util::sum map $_->[0], @alloc),
1201 (List::Util::max map $_->[1], @alloc),
1202 ) 1503 )
1203} 1504}
1204 1505
1205sub size_allocate {
1206 my ($self, $w, $h) = @_;
1207
1208 ($h, $w) = ($w, $h);
1209
1210 my $children = $self->{children};
1211
1212 my @h = map $_->{req_w}, @$children;
1213
1214 my $req_h = List::Util::sum @h;
1215
1216 if ($req_h > $h) {
1217 # ah well, not enough space
1218 $_ *= $h / $req_h for @h;
1219 } else {
1220 my $exp = List::Util::sum map $_->{expand}, @$children;
1221 $exp ||= 1;
1222
1223 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 }
1230 }
1231
1232 CFClient::UI::harmonize \@h;
1233
1234 my $y = 0;
1235 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_];
1238 $child->configure ($y, 0, $h, $w);
1239
1240 $y += $h;
1241 }
1242
1243 1
1244}
1245
1246############################################################################# 1506#############################################################################
1247 1507
1248package CFClient::UI::VBox; 1508package CFClient::UI::VBox;
1249 1509
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1510our @ISA = CFClient::UI::Box::;
1253 1511
1254sub size_request { 1512sub new {
1255 my ($self) = @_; 1513 my $class = shift;
1256 1514
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1515 $class->SUPER::new (
1258 1516 vertical => 1,
1259 ( 1517 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1518 )
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} 1519}
1303 1520
1304############################################################################# 1521#############################################################################
1305 1522
1306package CFClient::UI::Label; 1523package CFClient::UI::Label;
… …
1319 #font => default_font 1536 #font => default_font
1320 #text => initial text 1537 #text => initial text
1321 #markup => initial narkup 1538 #markup => initial narkup
1322 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1323 ellipsise => 3, # end 1540 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1325 fontsize => 1, 1542 fontsize => 1,
1326 align => -1, 1543 align => -1,
1327 valign => -1, 1544 valign => -1,
1328 padding => 2, 1545 padding_x => 2,
1546 padding_y => 2,
1329 can_events => 0, 1547 can_events => 0,
1330 %arg 1548 %arg
1331 ); 1549 );
1332 1550
1333 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1334 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1335 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1336 $self->{template} = $layout; 1554 $self->{template} = $layout;
1337 } 1555 }
1338 1556
1339 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
1360 1578
1361 delete $self->{texture}; 1579 delete $self->{texture};
1362 $self->SUPER::update; 1580 $self->SUPER::update;
1363} 1581}
1364 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1365sub set_text { 1590sub set_text {
1366 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1367 1592
1368 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1369 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1370 1595
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1373 1597
1598 delete $self->{size_req};
1599 $self->realloc;
1374 $self->update; 1600 $self->update;
1375 $self->check_size;
1376} 1601}
1377 1602
1378sub set_markup { 1603sub set_markup {
1379 my ($self, $markup) = @_; 1604 my ($self, $markup) = @_;
1380 1605
1381 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1382 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1383 1608
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1610
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1388 1612
1613 delete $self->{size_req};
1614 $self->realloc;
1389 $self->update; 1615 $self->update;
1390 $self->check_size;
1391} 1616}
1392 1617
1393sub size_request { 1618sub size_request {
1394 my ($self) = @_; 1619 my ($self) = @_;
1395 1620
1621 $self->{size_req} ||= do {
1396 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1622 $self->{layout}->set_font ($self->{font}) if $self->{font};
1397 $self->{layout}->set_width ($self->{max_w} || -1); 1623 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1624 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1625 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1627
1402 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1403 1629
1404 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1405 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1406 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1632 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1407 1633
1408 my ($w2, $h2) = $self->{template}->size; 1634 my ($w2, $h2) = $self->{template}->size;
1409 1635
1410 $w = List::Util::max $w, $w2; 1636 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 1637 $h = List::Util::max $h, $h2;
1638 }
1639
1640 [$w, $h]
1412 } 1641 };
1413 1642
1414 ( 1643 @{ $self->{size_req} }
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 1644}
1419 1645
1646sub baseline_shift {
1647 $_[0]{layout}->descent
1648}
1649
1420sub size_allocate { 1650sub invoke_size_allocate {
1421 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1422 1652
1653 delete $self->{ox};
1654
1423 delete $self->{texture}; 1655 delete $self->{texture}
1656 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1657
1658 1
1424} 1659}
1425 1660
1426sub set_fontsize { 1661sub set_fontsize {
1427 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1428 1663
1429 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1430 delete $self->{texture}; 1666 delete $self->{texture};
1431 1667
1432 $self->update; 1668 $self->realloc;
1433 $self->check_size; 1669}
1670
1671sub reconfigure {
1672 my ($self) = @_;
1673
1674 delete $self->{size_req};
1675 delete $self->{texture};
1676
1677 $self->SUPER::reconfigure;
1434} 1678}
1435 1679
1436sub _draw { 1680sub _draw {
1437 my ($self) = @_; 1681 my ($self) = @_;
1438 1682
1439 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1440 1684
1441 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1442 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1443 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1444 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 1692
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1693 $self->{size_req}
1450
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1453 : ($self->{w} - $tex->{w}) * 0.5);
1454
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1460 }; 1694 };
1461 1695
1462 glEnable GL_TEXTURE_2D; 1696 unless (exists $self->{ox}) {
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1699 : ($self->{w} - $size->[0]) * 0.5);
1464 1700
1465 if ($tex->{format} == GL_ALPHA) { 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1466 glColor @{$self->{fg}}; 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1703 : ($self->{h} - $size->[1]) * 0.5);
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 } 1704 };
1471 1705
1472 glDisable GL_TEXTURE_2D; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1708
1709 $self->{layout}->render ($self->{ox}, $self->{oy});
1473} 1710}
1474 1711
1475############################################################################# 1712#############################################################################
1476 1713
1477package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
1491 can_hover => 1, 1728 can_hover => 1,
1492 can_focus => 1, 1729 can_focus => 1,
1493 valign => 0, 1730 valign => 0,
1494 can_events => 1, 1731 can_events => 1,
1495 #text => ... 1732 #text => ...
1733 #hidden => "*",
1496 @_ 1734 @_
1497 ) 1735 )
1498} 1736}
1499 1737
1500sub _set_text { 1738sub _set_text {
… …
1502 1740
1503 delete $self->{cur_h}; 1741 delete $self->{cur_h};
1504 1742
1505 return if $self->{text} eq $text; 1743 return if $self->{text} eq $text;
1506 1744
1507 delete $self->{texture};
1508
1509 $self->{last_activity} = $::NOW; 1745 $self->{last_activity} = $::NOW;
1510 $self->{text} = $text; 1746 $self->{text} = $text;
1511 1747
1512 $text =~ s/./*/g if $self->{hidden}; 1748 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1749 $self->{layout}->set_text ("$text ");
1750 delete $self->{size_req};
1514 1751
1515 $self->emit (changed => $self->{text}); 1752 $self->emit (changed => $self->{text});
1753
1754 $self->realloc;
1755 $self->update;
1516} 1756}
1517 1757
1518sub set_text { 1758sub set_text {
1519 my ($self, $text) = @_; 1759 my ($self, $text) = @_;
1520 1760
1521 $self->{cursor} = length $text; 1761 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 1762 $self->_set_text ($text);
1523 $self->update;
1524 $self->check_size;
1525} 1763}
1526 1764
1527sub get_text { 1765sub get_text {
1528 $_[0]{text} 1766 $_[0]{text}
1529} 1767}
… …
1534 my ($w, $h) = $self->SUPER::size_request; 1772 my ($w, $h) = $self->SUPER::size_request;
1535 1773
1536 ($w + 1, $h) # add 1 for cursor 1774 ($w + 1, $h) # add 1 for cursor
1537} 1775}
1538 1776
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}
1544
1545sub key_down { 1777sub invoke_key_down {
1546 my ($self, $ev) = @_; 1778 my ($self, $ev) = @_;
1547 1779
1548 my $mod = $ev->{mod}; 1780 my $mod = $ev->{mod};
1549 my $sym = $ev->{sym}; 1781 my $sym = $ev->{sym};
1550 my $uni = $ev->{unicode}; 1782 my $uni = $ev->{unicode};
… …
1565 $self->{cursor} = length $text; 1797 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1798 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1799 $self->emit ('escape');
1568 } elsif ($uni) { 1800 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1801 substr $text, $self->{cursor}++, 0, chr $uni;
1802 } else {
1803 return 0;
1570 } 1804 }
1571 1805
1572 $self->_set_text ($text); 1806 $self->_set_text ($text);
1573 $self->update;
1574 $self->check_size;
1575}
1576 1807
1808 $self->realloc;
1809
1810 1
1811}
1812
1577sub focus_in { 1813sub invoke_focus_in {
1578 my ($self) = @_; 1814 my ($self) = @_;
1579 1815
1580 $self->{last_activity} = $::NOW; 1816 $self->{last_activity} = $::NOW;
1581 1817
1582 $self->SUPER::focus_in; 1818 $self->SUPER::invoke_focus_in
1583} 1819}
1584 1820
1585sub button_down { 1821sub invoke_button_down {
1586 my ($self, $ev, $x, $y) = @_; 1822 my ($self, $ev, $x, $y) = @_;
1587 1823
1588 $self->SUPER::button_down ($ev, $x, $y); 1824 $self->SUPER::invoke_button_down ($ev, $x, $y);
1589 1825
1590 my $idx = $self->{layout}->xy_to_index ($x, $y); 1826 my $idx = $self->{layout}->xy_to_index ($x, $y);
1591 1827
1592 # byte-index to char-index 1828 # byte-index to char-index
1593 my $text = $self->{text}; 1829 my $text = $self->{text};
1594 utf8::encode $text; 1830 utf8::encode $text;
1595 $self->{cursor} = length substr $text, 0, $idx; 1831 $self->{cursor} = length substr $text, 0, $idx;
1596 1832
1597 $self->_set_text ($self->{text}); 1833 $self->_set_text ($self->{text});
1598 $self->update; 1834 $self->update;
1835
1836 1
1599} 1837}
1600 1838
1601sub mouse_motion { 1839sub invoke_mouse_motion {
1602 my ($self, $ev, $x, $y) = @_; 1840 my ($self, $ev, $x, $y) = @_;
1603# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1841# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1842
1843 1
1604} 1844}
1605 1845
1606sub _draw { 1846sub _draw {
1607 my ($self) = @_; 1847 my ($self) = @_;
1608 1848
1609 local $self->{fg} = $self->{fg}; 1849 local $self->{fg} = $self->{fg};
1610 1850
1611 if ($FOCUS == $self) { 1851 if ($FOCUS == $self) {
1612 glColor @{$self->{active_bg}}; 1852 glColor_premultiply @{$self->{active_bg}};
1613 $self->{fg} = $self->{active_fg}; 1853 $self->{fg} = $self->{active_fg};
1614 } else { 1854 } else {
1615 glColor @{$self->{bg}}; 1855 glColor_premultiply @{$self->{bg}};
1616 } 1856 }
1617 1857
1618 glEnable GL_BLEND; 1858 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620 glBegin GL_QUADS; 1860 glBegin GL_QUADS;
1621 glVertex 0 , 0; 1861 glVertex 0 , 0;
1622 glVertex 0 , $self->{h}; 1862 glVertex 0 , $self->{h};
1623 glVertex $self->{w}, $self->{h}; 1863 glVertex $self->{w}, $self->{h};
1624 glVertex $self->{w}, 0; 1864 glVertex $self->{w}, 0;
… …
1649 1889
1650our @ISA = CFClient::UI::EntryBase::; 1890our @ISA = CFClient::UI::EntryBase::;
1651 1891
1652use CFClient::OpenGL; 1892use CFClient::OpenGL;
1653 1893
1654sub key_down { 1894sub invoke_key_down {
1655 my ($self, $ev) = @_; 1895 my ($self, $ev) = @_;
1656 1896
1657 my $sym = $ev->{sym}; 1897 my $sym = $ev->{sym};
1658 1898
1659 if ($sym == 13) { 1899 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1900 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1901 my $txt = $self->get_text;
1902
1662 $self->{history_pointer} = -1; 1903 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1904 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1905 $self->emit (activate => $txt);
1665 $self->update; 1906 $self->update;
1666 1907
… …
1685 } else { 1926 } else {
1686 $self->set_text ($self->{history_saveback}); 1927 $self->set_text ($self->{history_saveback});
1687 } 1928 }
1688 1929
1689 } else { 1930 } else {
1690 $self->SUPER::key_down ($ev); 1931 return $self->SUPER::invoke_key_down ($ev)
1932 }
1933
1691 } 1934 1
1692
1693} 1935}
1694 1936
1695############################################################################# 1937#############################################################################
1696 1938
1697package CFClient::UI::Button; 1939package CFClient::UI::Button;
… …
1706 1948
1707sub new { 1949sub new {
1708 my $class = shift; 1950 my $class = shift;
1709 1951
1710 $class->SUPER::new ( 1952 $class->SUPER::new (
1711 padding => 4, 1953 padding_x => 4,
1954 padding_y => 4,
1712 fg => [1, 1, 1], 1955 fg => [1, 1, 1],
1713 active_fg => [0, 0, 1], 1956 active_fg => [0, 0, 1],
1714 can_hover => 1, 1957 can_hover => 1,
1715 align => 0, 1958 align => 0,
1716 valign => 0, 1959 valign => 0,
1717 can_events => 1, 1960 can_events => 1,
1718 @_ 1961 @_
1719 ) 1962 )
1720} 1963}
1721 1964
1722sub button_up { 1965sub invoke_button_up {
1723 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1724 1967
1968 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1969 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1970 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate"); 1971
1728 } 1972 1
1729} 1973}
1730 1974
1731sub _draw { 1975sub _draw {
1732 my ($self) = @_; 1976 my ($self) = @_;
1733 1977
1734 local $self->{fg} = $self->{fg}; 1978 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1735
1736 if ($GRAB == $self) {
1737 $self->{fg} = $self->{active_fg};
1738 }
1739 1979
1740 glEnable GL_TEXTURE_2D; 1980 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1981 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 glColor 0, 0, 0, 1; 1982 glColor 0, 0, 0, 1;
1743 1983
… …
1748 $self->SUPER::_draw; 1988 $self->SUPER::_draw;
1749} 1989}
1750 1990
1751############################################################################# 1991#############################################################################
1752 1992
1993package CFClient::UI::ImageButton;
1994
1995our @ISA = CFClient::UI::Image::;
1996
1997use CFClient::OpenGL;
1998
1999my %textures;
2000
2001sub new {
2002 my $class = shift;
2003
2004 my $self = $class->SUPER::new (
2005 padding_x => 4,
2006 padding_y => 4,
2007 fg => [1, 1, 1],
2008 active_fg => [0, 0, 1],
2009 can_hover => 1,
2010 align => 0,
2011 valign => 0,
2012 can_events => 1,
2013 @_
2014 );
2015}
2016
2017sub invoke_button_up {
2018 my ($self, $ev, $x, $y) = @_;
2019
2020 $self->emit ("activate")
2021 if $x >= 0 && $x < $self->{w}
2022 && $y >= 0 && $y < $self->{h};
2023
2024 1
2025}
2026
2027#############################################################################
2028
1753package CFClient::UI::CheckBox; 2029package CFClient::UI::CheckBox;
1754 2030
1755our @ISA = CFClient::UI::DrawBG::; 2031our @ISA = CFClient::UI::DrawBG::;
1756 2032
1757my @tex = 2033my @tex =
… …
1762 2038
1763sub new { 2039sub new {
1764 my $class = shift; 2040 my $class = shift;
1765 2041
1766 $class->SUPER::new ( 2042 $class->SUPER::new (
1767 padding => 2, 2043 padding_x => 2,
2044 padding_y => 2,
1768 fg => [1, 1, 1], 2045 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 2046 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 2047 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 2048 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 2049 state => 0,
… …
1776} 2053}
1777 2054
1778sub size_request { 2055sub size_request {
1779 my ($self) = @_; 2056 my ($self) = @_;
1780 2057
1781 ($self->{padding} * 2 + 6) x 2 2058 (6) x 2
1782} 2059}
1783 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
1784sub button_down { 2069sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
1786 2071
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 2074 $self->toggle;
1790 $self->emit (changed => $self->{state}); 2075 } else {
2076 return 0
2077 }
2078
1791 } 2079 1
1792} 2080}
1793 2081
1794sub _draw { 2082sub _draw {
1795 my ($self) = @_; 2083 my ($self) = @_;
1796 2084
1797 $self->SUPER::_draw; 2085 $self->SUPER::_draw;
1798 2086
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2087 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 2088
1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2089 my ($w, $h) = @$self{qw(w h)};
2090
2091 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802 2092
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2093 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 2094
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2095 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 2096
… …
1814package CFClient::UI::Image; 2104package CFClient::UI::Image;
1815 2105
1816our @ISA = CFClient::UI::Base::; 2106our @ISA = CFClient::UI::Base::;
1817 2107
1818use CFClient::OpenGL; 2108use CFClient::OpenGL;
1819use Carp qw/confess/;
1820 2109
1821our %loaded_images; 2110our %texture_cache;
1822 2111
1823sub new { 2112sub new {
1824 my $class = shift; 2113 my $class = shift;
1825 2114
1826 my $self = $class->SUPER::new (can_events => 0, @_); 2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
1827 2119
1828 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2120 $self->{path}
2121 or Carp::croak "required attribute 'path' not set";
1829 2122
1830 $loaded_images{$self->{image}} ||= 2123 $self->{tex} = $texture_cache{$self->{path}} ||=
1831 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1832 2125
1833 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2126 Scalar::Util::weaken $texture_cache{$self->{path}};
1834 2127
1835 Scalar::Util::weaken $loaded_images{$self->{image}}; 2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1836
1837 $self->{aspect} = $tex->{w} / $tex->{h};
1838 2129
1839 $self 2130 $self
1840} 2131}
1841 2132
1842sub size_request { 2133sub size_request {
1843 my ($self) = @_; 2134 my ($self) = @_;
1844 2135
1845 ($self->{tex}->{w}, $self->{tex}->{h}) 2136 ($self->{tex}{w}, $self->{tex}{h})
1846} 2137}
1847 2138
1848sub _draw { 2139sub _draw {
1849 my ($self) = @_; 2140 my ($self) = @_;
1850 2141
… …
1959 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
1960 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
1961 2252
1962 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
1963 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1964 2258
1965 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
1966 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1967 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969 2264
1970 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2265 glBindTexture GL_TEXTURE_2D, $t1->{name};
1971 glBegin GL_QUADS; 2266 glBegin GL_QUADS;
… …
1986 2281
1987 if ($t3) { 2282 if ($t3) {
1988 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
1989 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
1990 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1991 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1992 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1993 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1994 glEnd; 2289 glEnd;
1995 } 2290 }
1996 2291
1997 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2071 fg => [1, 1, 1], 2366 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2367 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2368 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2369 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10, 0], 2370 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2371 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2372 min_h => $::WIDTH / 80,
2078 vertical => 0, 2373 vertical => 0,
2079 can_hover => 1, 2374 can_hover => 1,
2080 inner_pad => 0.02, 2375 inner_pad => 0.02,
2081 @_ 2376 @_
2082 ); 2377 );
… …
2088} 2383}
2089 2384
2090sub set_range { 2385sub set_range {
2091 my ($self, $range) = @_; 2386 my ($self, $range) = @_;
2092 2387
2093 $self->{range} = $range; 2388 ($range, $self->{range}) = ($self->{range}, $range);
2094 2389
2390 if ("@$range" ne "@{$self->{range}}") {
2095 $self->update; 2391 $self->update;
2392 $self->set_value ($self->{range}[0]);
2393 }
2096} 2394}
2097 2395
2098sub set_value { 2396sub set_value {
2099 my ($self, $value) = @_; 2397 my ($self, $value) = @_;
2100 2398
… …
2119} 2417}
2120 2418
2121sub size_request { 2419sub size_request {
2122 my ($self) = @_; 2420 my ($self) = @_;
2123 2421
2124 my $w = $self->{req_w}; 2422 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2423}
2129 2424
2130sub button_down { 2425sub invoke_button_down {
2131 my ($self, $ev, $x, $y) = @_; 2426 my ($self, $ev, $x, $y) = @_;
2132 2427
2133 $self->SUPER::button_down ($ev, $x, $y); 2428 $self->SUPER::invoke_button_down ($ev, $x, $y);
2134 2429
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2430 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136 2431
2137 $self->mouse_motion ($ev, $x, $y); 2432 $self->invoke_mouse_motion ($ev, $x, $y)
2138} 2433}
2139 2434
2140sub mouse_motion { 2435sub invoke_mouse_motion {
2141 my ($self, $ev, $x, $y) = @_; 2436 my ($self, $ev, $x, $y) = @_;
2142 2437
2143 if ($GRAB == $self) { 2438 if ($GRAB == $self) {
2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2439 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2145 2440
2146 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2441 my (undef, $lo, $hi, $page) = @{$self->{range}};
2147 2442
2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2443 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149 2444
2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2445 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2446 } else {
2447 return 0;
2448 }
2449
2151 } 2450 1
2152} 2451}
2153 2452
2154sub update { 2453sub update {
2155 my ($self) = @_; 2454 my ($self) = @_;
2156 2455
2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2456 delete $self->{knob_w};
2457 $self->SUPER::update;
2458}
2459
2460sub _draw {
2461 my ($self) = @_;
2462
2463 unless ($self->{knob_w}) {
2158 $self->set_value ($self->{range}[0]); 2464 $self->set_value ($self->{range}[0]);
2159 2465
2160 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2466 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100; 2467 my $range = ($hi - $page - $lo) || 1e-100;
2162 2468
… …
2168 $value = ($value - $lo) / $range; 2474 $value = ($value - $lo) / $range;
2169 $value = $value * $self->{scale} + $self->{offset}; 2475 $value = $value * $self->{scale} + $self->{offset};
2170 2476
2171 $self->{knob_x} = $value - $knob_w * 0.5; 2477 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $knob_w; 2478 $self->{knob_w} = $knob_w;
2173 }); 2479 }
2174
2175 $self->SUPER::update;
2176}
2177
2178sub _draw {
2179 my ($self) = @_;
2180 2480
2181 $self->SUPER::_draw (); 2481 $self->SUPER::_draw ();
2182 2482
2183 glScale $self->{w}, $self->{h}; 2483 glScale $self->{w}, $self->{h};
2184 2484
… …
2245sub set_range { shift->{slider}->set_range (@_) } 2545sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) } 2546sub set_value { shift->{slider}->set_value (@_) }
2247 2547
2248############################################################################# 2548#############################################################################
2249 2549
2250package CFClient::UI::TextView; 2550package CFClient::UI::TextScroller;
2251 2551
2252our @ISA = CFClient::UI::HBox::; 2552our @ISA = CFClient::UI::HBox::;
2253 2553
2254use CFClient::OpenGL; 2554use CFClient::OpenGL;
2255 2555
… …
2257 my $class = shift; 2557 my $class = shift;
2258 2558
2259 my $self = $class->SUPER::new ( 2559 my $self = $class->SUPER::new (
2260 fontsize => 1, 2560 fontsize => 1,
2261 can_events => 0, 2561 can_events => 0,
2562 indent => 0,
2262 #font => default_font 2563 #font => default_font
2263 @_, 2564 @_,
2264 2565
2265 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2266 par => [], 2567 par => [],
2267 height => 0, 2568 height => 0,
2268 children => [ 2569 children => [
2269 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2270 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2281 2582
2282 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2283 $self->reflow; 2584 $self->reflow;
2284} 2585}
2285 2586
2587sub size_request {
2588 my ($self) = @_;
2589
2590 my ($empty, $slider) = @{ $self->{children} };
2591
2592 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request
2594}
2595
2286sub size_allocate { 2596sub invoke_size_allocate {
2287 my ($self, $w, $h) = @_; 2597 my ($self, $w, $h) = @_;
2288 2598
2289 $self->SUPER::size_allocate ($w, $h); 2599 my ($empty, $slider, @other) = @{ $self->{children} };
2600 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2290 2601
2291 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2602 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2603 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2604 $self->{layout}->set_width ($empty->{w});
2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2294 2606
2295 $self->reflow; 2607 $self->reflow;
2296}
2297 2608
2298sub text_size { 2609 local $self->{children} = [$empty, $slider];
2299 my ($self, $text, $indent) = @_; 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2611}
2612
2613sub get_layout {
2614 my ($self, $para) = @_;
2300 2615
2301 my $layout = $self->{layout}; 2616 my $layout = $self->{layout};
2302 2617
2618 $layout->set_font ($self->{font}) if $self->{font};
2619 $layout->set_foreground (@{$para->{fg}});
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2620 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2621 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2622 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2305 $layout->set_markup ($text); 2623 $layout->set_markup ($para->{markup});
2624
2625 $layout->set_shapes (
2626 map
2627 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2628 @{$para->{widget}}
2306 2629 );
2630
2307 $layout->size 2631 $layout
2308} 2632}
2309 2633
2310sub reflow { 2634sub reflow {
2311 my ($self) = @_; 2635 my ($self) = @_;
2312 2636
… …
2321 $self->{children}[1]->set_value ($offset); 2645 $self->{children}[1]->set_value ($offset);
2322} 2646}
2323 2647
2324sub clear { 2648sub clear {
2325 my ($self) = @_; 2649 my ($self) = @_;
2650
2651 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other;
2326 2653
2327 $self->{par} = []; 2654 $self->{par} = [];
2328 $self->{height} = 0; 2655 $self->{height} = 0;
2329 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2330} 2657}
2331 2658
2332sub add_paragraph { 2659sub add_paragraph {
2333 my ($self, $color, $text, $indent) = @_; 2660 my ($self, $color, $para, $indent) = @_;
2334 2661
2335 for my $line (split /\n/, $text) { 2662 my ($text, @w) = ref $para ? @$para : $para;
2336 my ($w, $h) = $self->text_size ($line); 2663
2337 $self->{height} += $h; 2664 $para = {
2338 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2665 w => 1e10,
2666 wrapped => 1,
2667 fg => $color,
2668 indent => $indent,
2669 markup => $text,
2670 widget => \@w,
2339 } 2671 };
2340 2672
2341 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2673 $self->add (@w) if @w;
2674 push @{$self->{par}}, $para;
2675
2676 $self->{need_reflow}++;
2677 $self->update;
2678}
2679
2680sub scroll_to_bottom {
2681 my ($self) = @_;
2682
2683 $self->{scroll_to_bottom} = 1;
2684 $self->update;
2342} 2685}
2343 2686
2344sub update { 2687sub update {
2345 my ($self) = @_; 2688 my ($self) = @_;
2346 2689
… …
2348 2691
2349 return unless $self->{h} > 0; 2692 return unless $self->{h} > 0;
2350 2693
2351 delete $self->{texture}; 2694 delete $self->{texture};
2352 2695
2353 $ROOT->on_post_alloc ($self, sub { 2696 $ROOT->on_post_alloc ($self => sub {
2354 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2355 2698
2356 if (delete $self->{need_reflow}) { 2699 if (delete $self->{need_reflow}) {
2357 my $height = 0; 2700 my $height = 0;
2358 2701
2359 my $layout = $self->{layout};
2360
2361 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2362
2363 for (@{$self->{par}}) { 2702 for my $para (@{$self->{par}}) {
2364 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2365 $layout->set_width ($W - $_->[3]); 2704 my $layout = $self->get_layout ($para);
2366 $layout->set_markup ($_->[4]);
2367 my ($w, $h) = $layout->size; 2705 my ($w, $h) = $layout->size;
2368 $_->[0] = $w + $_->[3]; 2706
2369 $_->[1] = $h; 2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2370 } 2710 }
2371 2711
2372 $height += $_->[1]; 2712 $height += $para->{h};
2373 } 2713 }
2374 2714
2375 $self->{height} = $height; 2715 $self->{height} = $height;
2376 2716
2377 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2717 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2378 2718
2379 delete $self->{texture}; 2719 delete $self->{texture};
2380 } 2720 }
2381 2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2724 }
2725
2382 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2383 glClearColor 0.5, 0.5, 0.5, 0; 2727 glClearColor 0, 0, 0, 0;
2384 glClear GL_COLOR_BUFFER_BIT; 2728 glClear GL_COLOR_BUFFER_BIT;
2385 2729
2386 my $top = int $self->{children}[1]{range}[0]; 2730 my $top = int $self->{children}[1]{range}[0];
2387 2731
2388 my $y0 = $top; 2732 my $y0 = $top;
2389 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2390 2734
2391 my $y = 0; 2735 my $y = 0;
2392 2736
2393 my $layout = $self->{layout};
2394
2395 $layout->set_font ($self->{font}) if $self->{font};
2396
2397 glEnable GL_BLEND;
2398 #TODO# not correct in windows where rgba is forced off
2399 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2400
2401 for my $par (@{$self->{par}}) { 2737 for my $para (@{$self->{par}}) {
2402 my $h = $par->[1]; 2738 my $h = $para->{h};
2403 2739
2404 if ($y0 < $y + $h && $y < $y1) { 2740 if ($y0 < $y + $h && $y < $y1) {
2405 $layout->set_foreground (@{ $par->[2] });
2406 $layout->set_width ($W - $par->[3]);
2407 $layout->set_markup ($par->[4]);
2408 2741
2409 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my $layout = $self->get_layout ($para);
2410 2743
2411 glRasterPos $par->[3], $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2412 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 for (@w) {
2750 my ($dx, $dy) = splice @s, 0, 2, ();
2751
2752 $_->{x} = $dx + $para->{indent};
2753 $_->{y} = $dy + $y - $y0;
2754
2755 $_->draw;
2756 }
2757 }
2413 } 2758 }
2414 2759
2415 $y += $h; 2760 $y += $h;
2416 } 2761 }
2417
2418 glDisable GL_BLEND;
2419 }; 2762 };
2420 }); 2763 });
2421} 2764}
2422 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2423sub _draw { 2775sub _draw {
2424 my ($self) = @_; 2776 my ($self) = @_;
2425 2777
2426 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2428 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2429 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2430 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2431 2783
2432 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2433
2434} 2785}
2435 2786
2436############################################################################# 2787#############################################################################
2437 2788
2438package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2483 2834
2484sub new { 2835sub new {
2485 my $class = shift; 2836 my $class = shift;
2486 2837
2487 my $self = $class->SUPER::new ( 2838 my $self = $class->SUPER::new (
2488 state => 0, 2839 state => 0,
2489 connect_activate => \&toggle_flopper, 2840 on_activate => \&toggle_flopper,
2490 @_ 2841 @_
2491 ); 2842 );
2492 2843
2493 if ($self->{state}) {
2494 $self->{state} = 0;
2495 $self->toggle_flopper;
2496 }
2497
2498 $self 2844 $self
2499} 2845}
2500 2846
2501sub toggle_flopper { 2847sub toggle_flopper {
2502 my ($self) = @_; 2848 my ($self) = @_;
2503 2849
2504 # TODO: use animation 2850 $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} 2851}
2516 2852
2517############################################################################# 2853#############################################################################
2518 2854
2519package CFClient::UI::Tooltip; 2855package CFClient::UI::Tooltip;
… …
2532} 2868}
2533 2869
2534sub set_tooltip_from { 2870sub set_tooltip_from {
2535 my ($self, $widget) = @_; 2871 my ($self, $widget) = @_;
2536 2872
2873 my $tooltip = $widget->{tooltip};
2874
2875 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2878 . "req $widget->{req_w} $widget->{req_h}\n"
2879 . "visible $widget->{visible}";
2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2884
2537 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2538 markup => $widget->{tooltip}, 2886 markup => $tooltip,
2539 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540 fontsize => 0.8, 2888 fontsize => 0.8,
2541 fg => [0, 0, 0, 1], 2889 fg => [0, 0, 0, 1],
2542 ellipsise => 0, 2890 ellipsise => 0,
2543 font => ($widget->{tooltip_font} || $::FONT_PROP), 2891 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2550 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2551 2899
2552 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2553} 2901}
2554 2902
2555sub size_allocate { 2903sub invoke_size_allocate {
2556 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2557 2905
2558 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2907}
2908
2909sub invoke_visibility_change {
2910 my ($self, $visible) = @_;
2911
2912 return unless $visible;
2913
2914 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner}
2916 or return;
2917
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w};
2922
2923 $self->move_abs ($x, $y);
2924 });
2559} 2925}
2560 2926
2561sub _draw { 2927sub _draw {
2562 my ($self) = @_; 2928 my ($self) = @_;
2563 2929
… …
2580 glVertex $w, $h; 2946 glVertex $w, $h;
2581 glVertex $w, 0; 2947 glVertex $w, 0;
2582 glEnd; 2948 glEnd;
2583 2949
2584 glTranslate 2 - 0.375, 2 - 0.375; 2950 glTranslate 2 - 0.375, 2 - 0.375;
2951
2585 $self->SUPER::_draw; 2952 $self->SUPER::_draw;
2586} 2953}
2587 2954
2588############################################################################# 2955#############################################################################
2589 2956
… …
2595 2962
2596sub new { 2963sub new {
2597 my $class = shift; 2964 my $class = shift;
2598 2965
2599 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2600 aspect => 1, 2967 aspect => 1,
2968 can_events => 0,
2601 @_, 2969 @_,
2602 ); 2970 );
2603 2971
2604 if ($self->{anim} && $self->{animspeed}) { 2972 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self); 2973 Scalar::Util::weaken (my $widget = $self);
… …
2647 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2648 3016
2649 if ($tex) { 3017 if ($tex) {
2650 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2652 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2654 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2655 } 3023 }
2656} 3024}
2657 3025
2658sub DESTROY { 3026sub destroy {
2659 my ($self) = @_; 3027 my ($self) = @_;
2660 3028
2661 $self->{timer}->cancel 3029 $self->{timer}->cancel
2662 if $self->{timer}; 3030 if $self->{timer};
2663 3031
2664 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2665} 3033}
2666 3034
2667############################################################################# 3035#############################################################################
2668 3036
2669package CFClient::UI::InventoryItem; 3037package CFClient::UI::Buttonbar;
2670 3038
2671our @ISA = CFClient::UI::HBox::; 3039our @ISA = CFClient::UI::HBox::;
2672 3040
2673sub _item_to_desc { 3041# 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 3042
2830############################################################################# 3043#############################################################################
2831 3044
2832package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2833 3046
… …
2845 ); 3058 );
2846 3059
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2848 3061
2849 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2851 3064
2852 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2853 if (!ref $widget) { 3066 if (!ref $widget) {
3067 if ($widget =~ /\t/) {
3068 my ($left, $right) = split /\t/, $widget, 2;
3069
3070 $widget = new CFClient::UI::HBox
3071 can_hover => 1,
3072 can_events => 1,
3073 tooltip => $tooltip,
3074 children => [
3075 (new CFClient::UI::Label markup => $left, expand => 1),
3076 (new CFClient::UI::Label markup => $right, align => +1),
3077 ],
3078 ;
3079
3080 } else {
2854 $widget = new CFClient::UI::Label 3081 $widget = new CFClient::UI::Label
2855 can_hover => 1, 3082 can_hover => 1,
2856 can_events => 1, 3083 can_events => 1,
2857 text => $widget; 3084 markup => $widget,
3085 tooltip => $tooltip;
3086 }
2858 } 3087 }
2859 3088
2860 $self->{item}{$widget} = $item; 3089 $self->{item}{$widget} = $item;
2861 3090
2862 $self->{vbox}->add ($widget); 3091 $self->{vbox}->add ($widget);
… …
2874 # maybe save $GRAB? must be careful about events... 3103 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3104 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3105 $self->{button} = $ev->{button};
2877 3106
2878 $self->show; 3107 $self->show;
2879 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3108 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880} 3109}
2881 3110
2882sub mouse_motion { 3111sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2884 3113
2885 # TODO: should use vbox->find_widget or so 3114 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3115 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3116 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3117
3118 0
3119}
3120
2890sub button_up { 3121sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3122 my ($self, $ev, $x, $y) = @_;
2892 3123
2893 if ($ev->{button} == $self->{button}) { 3124 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3125 undef $GRAB;
2895 $self->hide; 3126 $self->hide;
2896 3127
2897 $self->emit ("popdown"); 3128 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3129 $self->{hover}[1]->() if $self->{hover};
3130 } else {
3131 return 0
3132 }
3133
2899 } 3134 1
2900} 3135}
2901 3136
2902############################################################################# 3137#############################################################################
2903 3138
2904package CFClient::UI::Statusbox; 3139package CFClient::UI::Multiplexer;
2905 3140
2906our @ISA = CFClient::UI::VBox::; 3141our @ISA = CFClient::UI::Container::;
2907 3142
2908sub new { 3143sub new {
2909 my $class = shift; 3144 my $class = shift;
2910 3145
2911 $class->SUPER::new ( 3146 my $self = $class->SUPER::new (
3147 @_,
3148 );
3149
3150 $self->{current} = $self->{children}[0]
3151 if @{ $self->{children} };
3152
3153 $self
3154}
3155
3156sub add {
3157 my ($self, @widgets) = @_;
3158
3159 $self->SUPER::add (@widgets);
3160
3161 $self->{current} = $self->{children}[0]
3162 if @{ $self->{children} };
3163}
3164
3165sub get_current_page {
3166 my ($self) = @_;
3167
3168 $self->{current}
3169}
3170
3171sub set_current_page {
3172 my ($self, $page_or_widget) = @_;
3173
3174 my $widget = ref $page_or_widget
3175 ? $page_or_widget
3176 : $self->{children}[$page_or_widget];
3177
3178 $self->{current} = $widget;
3179 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3180
3181 $self->emit (page_changed => $self->{current});
3182
3183 $self->realloc;
3184}
3185
3186sub visible_children {
3187 $_[0]{current}
3188}
3189
3190sub size_request {
3191 my ($self) = @_;
3192
3193 $self->{current}->size_request
3194}
3195
3196sub invoke_size_allocate {
3197 my ($self, $w, $h) = @_;
3198
3199 $self->{current}->configure (0, 0, $w, $h);
3200
3201 1
3202}
3203
3204sub _draw {
3205 my ($self) = @_;
3206
3207 $self->{current}->draw;
3208}
3209
3210#############################################################################
3211
3212package CFClient::UI::Notebook;
3213
3214our @ISA = CFClient::UI::VBox::;
3215
3216sub new {
3217 my $class = shift;
3218
3219 my $self = $class->SUPER::new (
3220 buttonbar => (new CFClient::UI::Buttonbar),
3221 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3222 # filter => # will be put between multiplexer and $self
3223 @_,
3224 );
3225
3226 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3227 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3228
3229 $self
3230}
3231
3232sub add {
3233 my ($self, $title, $widget, $tooltip) = @_;
3234
3235 Scalar::Util::weaken $self;
3236
3237 $self->{buttonbar}->add (new CFClient::UI::Button
3238 markup => $title,
3239 tooltip => $tooltip,
3240 on_activate => sub { $self->set_current_page ($widget) },
3241 );
3242
3243 $self->{multiplexer}->add ($widget);
3244}
3245
3246sub get_current_page {
3247 my ($self) = @_;
3248
3249 $self->{multiplexer}->get_current_page
3250}
3251
3252sub set_current_page {
3253 my ($self, $page) = @_;
3254
3255 $self->{multiplexer}->set_current_page ($page);
3256 $self->emit (page_changed => $self->{multiplexer}{current});
3257}
3258
3259#############################################################################
3260
3261package CFClient::UI::Combobox;
3262
3263use utf8;
3264
3265our @ISA = CFClient::UI::Button::;
3266
3267sub new {
3268 my $class = shift;
3269
3270 my $self = $class->SUPER::new (
3271 options => [], # [value, title, longdesc], ...
3272 value => undef,
3273 @_,
3274 );
3275
3276 $self->_set_value ($self->{value});
3277
3278 $self
3279}
3280
3281sub invoke_button_down {
3282 my ($self, $ev) = @_;
3283
3284 my @menu_items;
3285
3286 for (@{ $self->{options} }) {
3287 my ($value, $title, $tooltip) = @$_;
3288
3289 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3290 }
3291
3292 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3293}
3294
3295sub _set_value {
3296 my ($self, $value) = @_;
3297
3298 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3299 or return;
3300
3301 $self->{value} = $item->[0];
3302 $self->set_markup ("$item->[1] ⇓");
3303 $self->set_tooltip ($item->[2]);
3304}
3305
3306sub set_value {
3307 my ($self, $value) = @_;
3308
3309 return unless $self->{value} ne $value;
3310
3311 $self->_set_value ($value);
3312 $self->emit (changed => $value);
3313}
3314
3315#############################################################################
3316
3317package CFClient::UI::Statusbox;
3318
3319our @ISA = CFClient::UI::VBox::;
3320
3321sub new {
3322 my $class = shift;
3323
3324 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3325 fontsize => 0.8,
2913 @_, 3326 @_,
2914 ) 3327 );
3328
3329 Scalar::Util::weaken (my $this = $self);
3330
3331 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3332
3333 $self
2915} 3334}
2916 3335
2917sub reorder { 3336sub reorder {
2918 my ($self) = @_; 3337 my ($self) = @_;
2919 my $NOW = time; 3338 my $NOW = Time::HiRes::time;
3339
3340 # freeze display when hovering over any label
3341 return if $CFClient::UI::TOOLTIP->{owner}
3342 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3343 values %{ $self->{item} };
2920 3344
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3345 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3346 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3347 }
2924 3348
… …
2927 my @items = sort { 3351 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3352 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3353 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3354 } values %{ $self->{item} };
2931 3355
3356 $self->{timer}->interval (1);
3357
2932 my $count = 10 + 1; 3358 my $count = 10 + 1;
2933 for my $item (@items) { 3359 for my $item (@items) {
2934 last unless --$count; 3360 last unless --$count;
2935 3361
2936 push @widgets, $item->{label} ||= do { 3362 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3363 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3364 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3365 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3366 : $item->{text};
2941 3367
… …
2949 tooltip => $item->{tooltip}, 3375 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3376 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3377 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3378 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3379 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3380 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3381 can_events => 1,
2956 can_hover => 1 3382 can_hover => 1
2957 }; 3383 };
3384
3385 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3386 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3387 $label->update;
3388 $label->set_max_size (undef, $label->{req_h} * $diff)
3389 if $diff < 1;
3390 $self->{timer}->interval (1/30);
3391 } else {
3392 $label->{fg}[3] = $item->{fg}[3] || 1;
3393 }
3394
3395 push @widgets, $label;
2958 } 3396 }
2959 3397
2960 $self->clear; 3398 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3399 $self->SUPER::add (reverse @widgets);
2962} 3400}
… …
2965 my ($self, $text, %arg) = @_; 3403 my ($self, $text, %arg) = @_;
2966 3404
2967 $text =~ s/^\s+//; 3405 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3406 $text =~ s/\s+$//;
2969 3407
3408 return unless $text;
3409
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 3410 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2971 3411
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3412 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 3413
2974 if (my $item = $self->{item}{$group}) { 3414 if (my $item = $self->{item}{$group}) {
2975 if ($item->{text} eq $text) { 3415 if ($item->{text} eq $text) {
2976 $item->{count}++; 3416 $item->{count}++;
2977 } else { 3417 } else {
2978 $item->{count} = 1; 3418 $item->{count} = 1;
2979 $item->{text} = $item->{tooltip} = $text; 3419 $item->{text} = $item->{tooltip} = $text;
2980 } 3420 }
2981 $item->{id} = ++$self->{id}; 3421 $item->{id} += 0.2;#d#
2982 $item->{timeout} = $timeout; 3422 $item->{timeout} = $timeout;
2983 delete $item->{label}; 3423 delete $item->{label};
2984 } else { 3424 } else {
2985 $self->{item}{$group} = { 3425 $self->{item}{$group} = {
2986 id => ++$self->{id}, 3426 id => ++$self->{id},
… …
2992 count => 1, 3432 count => 1,
2993 %arg, 3433 %arg,
2994 }; 3434 };
2995 } 3435 }
2996 3436
3437 $ROOT->on_refresh (reorder => sub {
2997 $self->reorder; 3438 $self->reorder;
3439 });
2998} 3440}
2999 3441
3000sub reconfigure { 3442sub reconfigure {
3001 my ($self) = @_; 3443 my ($self) = @_;
3002 3444
… …
3005 3447
3006 $self->reorder; 3448 $self->reorder;
3007 $self->SUPER::reconfigure; 3449 $self->SUPER::reconfigure;
3008} 3450}
3009 3451
3452sub destroy {
3453 my ($self) = @_;
3454
3455 $self->{timer}->cancel;
3456
3457 $self->SUPER::destroy;
3458}
3459
3010############################################################################# 3460#############################################################################
3011 3461
3012package CFClient::UI::Root; 3462package CFClient::UI::Inventory;
3013 3463
3014our @ISA = CFClient::UI::Container::; 3464our @ISA = CFClient::UI::Table::;
3015
3016use CFClient::OpenGL;
3017 3465
3018sub new { 3466sub new {
3019 my $class = shift; 3467 my $class = shift;
3020 3468
3021 $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
3470 col_expand => [0, 1, 0],
3471 @_,
3472 );
3473
3474 $self
3475}
3476
3477sub set_items {
3478 my ($self, $items) = @_;
3479
3480 $self->clear;
3481 return unless $items;
3482
3483 my @items = sort {
3484 ($a->{type} <=> $b->{type})
3485 or ($a->{name} cmp $b->{name})
3486 } values %$items;
3487
3488 $self->{real_items} = \@items;
3489
3490 my $row = 0;
3491 for my $item (@items) {
3492 CFClient::Item::update_widgets $item;
3493
3494 $self->add (0, $row, $item->{face_widget});
3495 $self->add (1, $row, $item->{desc_widget});
3496 $self->add (2, $row, $item->{weight_widget});
3497
3498 $row++;
3499 }
3500}
3501
3502#############################################################################
3503
3504package CFClient::UI::SpellList;
3505
3506our @ISA = CFClient::UI::Table::;
3507
3508sub new {
3509 my $class = shift;
3510
3511 my $self = $class->SUPER::new (
3512 binding => [],
3513 commands => [],
3022 @_, 3514 @_,
3023 ) 3515 )
3024} 3516}
3025 3517
3026sub configure { 3518my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3027 my ($self, $x, $y, $w, $h) = @_;
3028 3519
3029 $self->{w} = $w; 3520my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3030 $self->{h} = $h; 3521 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3031} 3522my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3523 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3524my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3525 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3526my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3527 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3528my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3529 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3032 3530
3033sub check_size { 3531sub rebuild_spell_list {
3532 my ($self) = @_;
3533
3534 $CFClient::UI::ROOT->on_refresh ($self => sub {
3535 $self->clear;
3536
3537 return unless $::CONN;
3538
3539 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3540 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3541 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3542 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3543 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3544
3545 my $row = 0;
3546
3547 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3548 my $spell = $self->{spell}{$_};
3549
3550 $row++;
3551
3552 my $spell_cb = sub {
3553 my ($widget, $ev) = @_;
3554
3555 if ($ev->{button} == 1) {
3556 $::CONN->user_send ("cast $spell->{name}");
3557 } elsif ($ev->{button} == 2) {
3558 $::CONN->user_send ("invoke $spell->{name}");
3559 } elsif ($ev->{button} == 3) {
3560 (new CFClient::UI::Menu
3561 items => [
3562 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3563 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3564 ],
3565 )->popup ($ev);
3566 } else {
3567 return 0;
3568 }
3569
3570 1
3571 };
3572
3573 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3574
3575 #TODO: add path info to tooltip
3576 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3577
3578 $self->add (0, $row, new CFClient::UI::Face
3579 face => $spell->{face},
3580 can_hover => 1,
3581 can_events => 1,
3582 tooltip => $tooltip,
3583 on_button_down => $spell_cb,
3584 );
3585
3586 $self->add (1, $row, new CFClient::UI::Label
3587 expand => 1,
3588 text => $spell->{name},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3598 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3599 }
3600 });
3601}
3602
3603sub add_spell {
3034 my ($self) = @_; 3604 my ($self, $spell) = @_;
3035 3605
3036 $self->size_allocate ($self->{w}, $self->{h}) 3606 $self->{spell}->{$spell->{name}} = $spell;
3037 if $self->{w}; 3607 $self->rebuild_spell_list;
3608}
3609
3610sub remove_spell {
3611 my ($self, $spell) = @_;
3612
3613 delete $self->{spell}->{$spell->{name}};
3614 $self->rebuild_spell_list;
3615}
3616
3617sub clear_spells {
3618 my ($self) = @_;
3619
3620 $self->{spell} = {};
3621 $self->rebuild_spell_list;
3622}
3623
3624#############################################################################
3625
3626package CFClient::UI::Root;
3627
3628our @ISA = CFClient::UI::Container::;
3629
3630use List::Util qw(min max);
3631
3632use CFClient::OpenGL;
3633
3634sub new {
3635 my $class = shift;
3636
3637 my $self = $class->SUPER::new (
3638 visible => 1,
3639 @_,
3640 );
3641
3642 Scalar::Util::weaken ($self->{root} = $self);
3643
3644 $self
3038} 3645}
3039 3646
3040sub size_request { 3647sub size_request {
3041 my ($self) = @_; 3648 my ($self) = @_;
3042 3649
3043 ($self->{w}, $self->{h}) 3650 ($self->{w}, $self->{h})
3044} 3651}
3045 3652
3653sub _to_pixel {
3654 my ($coord, $size, $max) = @_;
3655
3656 $coord =
3657 $coord eq "center" ? ($max - $size) * 0.5
3658 : $coord eq "max" ? $max
3659 : $coord;
3660
3661 $coord = 0 if $coord < 0;
3662 $coord = $max - $size if $coord > $max - $size;
3663
3664 int $coord + 0.5
3665}
3666
3046sub size_allocate { 3667sub invoke_size_allocate {
3047 my ($self, $w, $h) = @_; 3668 my ($self, $w, $h) = @_;
3048
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 3669
3055 for my $child ($self->children) { 3670 for my $child ($self->children) {
3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3671 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057 3672
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3673 $X = $child->{force_x} if exists $child->{force_x};
3059 if exists $child->{req_x}; 3674 $Y = $child->{force_y} if exists $child->{force_y};
3060 3675
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3676 $X = _to_pixel $X, $W, $self->{w};
3062 if exists $child->{req_y}; 3677 $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 3678
3067 $child->configure ($X, $Y, $W, $H); 3679 $child->configure ($X, $Y, $W, $H);
3068 } 3680 }
3681
3682 1
3069} 3683}
3070 3684
3071sub coord2local { 3685sub coord2local {
3072 my ($self, $x, $y) = @_; 3686 my ($self, $x, $y) = @_;
3073 3687
… …
3081} 3695}
3082 3696
3083sub update { 3697sub update {
3084 my ($self) = @_; 3698 my ($self) = @_;
3085 3699
3086 $self->check_size;
3087 $::WANT_REFRESH++; 3700 $::WANT_REFRESH++;
3088} 3701}
3089 3702
3090sub add { 3703sub add {
3091 my ($self, @children) = @_; 3704 my ($self, @children) = @_;
3092 3705
3093 for my $child (@children) {
3094 $child->{toplevel} = 1; 3706 $_->{is_toplevel} = 1
3095 3707 for @children;
3096 # integerise window positions
3097 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y};
3099 }
3100 3708
3101 $self->SUPER::add (@children); 3709 $self->SUPER::add (@children);
3710}
3711
3712sub remove {
3713 my ($self, @children) = @_;
3714
3715 $self->SUPER::remove (@children);
3716
3717 delete $self->{is_toplevel}
3718 for @children;
3102 3719
3103 while (@children) { 3720 while (@children) {
3104 my $w = pop @children; 3721 my $w = pop @children;
3105 push @children, $w->children; 3722 push @children, $w->children;
3106 $w->{visible} = 1; 3723 $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 } 3724 }
3120} 3725}
3121 3726
3122sub on_refresh { 3727sub on_refresh {
3123 my ($self, $id, $cb) = @_; 3728 my ($self, $id, $cb) = @_;
… …
3137 while ($self->{refresh_hook}) { 3742 while ($self->{refresh_hook}) {
3138 $_->() 3743 $_->()
3139 for values %{delete $self->{refresh_hook}}; 3744 for values %{delete $self->{refresh_hook}};
3140 } 3745 }
3141 3746
3142 if ($self->{check_size}) { 3747 if ($self->{realloc}) {
3143 my @queue = ([], []); 3748 my %queue;
3749 my @queue;
3750 my $widget;
3144 3751
3145 for (;;) { 3752 outer:
3146 if ($self->{check_size}) { 3753 while () {
3147 # heuristic: check containers last 3754 if (my $realloc = delete $self->{realloc}) {
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3755 for $widget (values %$realloc) {
3149 for values %{delete $self->{check_size}} 3756 $widget->{visible} or next; # do not resize invisible widgets
3757
3758 $queue{$widget+0}++ and next; # duplicates are common
3759
3760 push @{ $queue[$widget->{visible}] }, $widget;
3761 }
3150 } 3762 }
3151 3763
3152 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3764 while () {
3765 @queue or last outer;
3153 3766
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3767 $widget = pop @{ $queue[-1] || [] }
3155 ? @$widget{qw(user_w user_h)} 3768 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 3769
3770 pop @queue;
3771 }
3772
3773 delete $queue{$widget+0};
3774
3775 my ($w, $h) = $widget->size_request;
3776
3777 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3778 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3779
3780 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3781 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3782
3783 $w = $widget->{force_w} if exists $widget->{force_w};
3784 $h = $widget->{force_h} if exists $widget->{force_h};
3785
3786 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3787 || delete $widget->{force_realloc}) {
3162 $widget->{req_w} = $w; 3788 $widget->{req_w} = $w;
3163 $widget->{req_h} = $h; 3789 $widget->{req_h} = $h;
3164 3790
3165 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3791 $self->{size_alloc}{$widget+0} = $widget;
3166 3792
3167 $widget->{parent}->check_size
3168 if $widget->{parent}; 3793 if (my $parent = $widget->{parent}) {
3794 $self->{realloc}{$parent+0} = $parent
3795 unless $queue{$parent+0};
3796
3797 $parent->{force_size_alloc} = 1;
3798 $self->{size_alloc}{$parent+0} = $parent;
3799 }
3169 } 3800 }
3801
3802 delete $self->{realloc}{$widget+0};
3170 } 3803 }
3171 } 3804 }
3172 3805
3173 while ($self->{size_alloc}) { 3806 while (my $size_alloc = delete $self->{size_alloc}) {
3174 for (values %{delete $self->{size_alloc}}) { 3807 my @queue = sort { $b->{visible} <=> $a->{visible} }
3175 my ($widget, $w, $h) = @$_; 3808 values %$size_alloc;
3809
3810 while () {
3811 my $widget = pop @queue || last;
3812
3813 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 3814
3177 $w = 0 if $w < 0; 3815 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 3816 $h = 0 if $h < 0;
3179 3817
3818 $w = int $w + 0.5;
3819 $h = int $h + 0.5;
3820
3821 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3822 $widget->{old_w} = $widget->{w};
3823 $widget->{old_h} = $widget->{h};
3824
3180 $widget->{w} = $w; 3825 $widget->{w} = $w;
3181 $widget->{h} = $h; 3826 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h); 3827
3183 $widget->emit (size_allocate => $w, $h); 3828 $widget->emit (size_allocate => $w, $h);
3829 }
3184 } 3830 }
3185 } 3831 }
3186 3832
3187 while ($self->{post_alloc_hook}) { 3833 while ($self->{post_alloc_hook}) {
3188 $_->() 3834 $_->()
3189 for values %{delete $self->{post_alloc_hook}}; 3835 for values %{delete $self->{post_alloc_hook}};
3190 } 3836 }
3837
3191 3838
3192 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3839 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3840 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194 glClear GL_COLOR_BUFFER_BIT; 3841 glClear GL_COLOR_BUFFER_BIT;
3195 3842
… …
3197 glLoadIdentity; 3844 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3845 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 3846 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 3847 glLoadIdentity;
3201 3848
3849 {
3850 package CFClient::UI::Base;
3851
3852 ($draw_x, $draw_y, $draw_w, $draw_h) =
3853 (0, 0, $self->{w}, $self->{h});
3854 }
3855
3202 $self->_draw; 3856 $self->_draw;
3203} 3857}
3204 3858
3205############################################################################# 3859#############################################################################
3206 3860

Diff Legend

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