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

Diff Legend

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