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

Diff Legend

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