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.235 by root, Thu May 25 16:35:42 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 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub DESTROY { 619sub DESTROY {
504 my ($self) = @_; 620 my ($self) = @_;
505 621
622 return if CFClient::in_destruct;
623
506 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
507 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
508} 628}
509 629
510############################################################################# 630#############################################################################
511 631
512package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
537 657
538 if ($color && (@$color < 4 || $color->[3])) { 658 if ($color && (@$color < 4 || $color->[3])) {
539 my ($w, $h) = @$self{qw(w h)}; 659 my ($w, $h) = @$self{qw(w h)};
540 660
541 glEnable GL_BLEND; 661 glEnable GL_BLEND;
542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 662 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
543 glColor @$color; 663 glColor_premultiply @$color;
544 664
545 glBegin GL_QUADS; 665 glBegin GL_QUADS;
546 glVertex 0 , 0; 666 glVertex 0 , 0;
547 glVertex 0 , $h; 667 glVertex 0 , $h;
548 glVertex $w, $h; 668 glVertex $w, $h;
… …
563 my ($class, %arg) = @_; 683 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 684 $class->SUPER::new (can_events => 0, %arg);
565} 685}
566 686
567sub size_request { 687sub size_request {
568 (0, 0) 688 my ($self) = @_;
689
690 ($self->{w} + 0, $self->{h} + 0)
569} 691}
570 692
571sub draw { } 693sub draw { }
572 694
573############################################################################# 695#############################################################################
… …
577our @ISA = CFClient::UI::Base::; 699our @ISA = CFClient::UI::Base::;
578 700
579sub new { 701sub new {
580 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
581 703
582 my $children = delete $arg{children} || []; 704 my $children = delete $arg{children};
583 705
584 my $self = $class->SUPER::new ( 706 my $self = $class->SUPER::new (
585 children => [], 707 children => [],
586 can_events => 0, 708 can_events => 0,
587 %arg, 709 %arg,
588 ); 710 );
711
589 $self->add ($_) for @$children; 712 $self->add (@$children)
713 if $children;
590 714
591 $self 715 $self
592} 716}
593 717
594sub add { 718sub add {
… …
602 $self->{children} = [ 726 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 727 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 728 @{$self->{children}}, @widgets
605 ]; 729 ];
606 730
607 $self->check_size (1); 731 $self->realloc;
608 $self->update;
609} 732}
610 733
611sub children { 734sub children {
612 @{ $_[0]{children} } 735 @{ $_[0]{children} }
613} 736}
… …
618 delete $child->{parent}; 741 delete $child->{parent};
619 $child->hide; 742 $child->hide;
620 743
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 744 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 745
623 $self->check_size; 746 $self->realloc;
624 $self->update;
625} 747}
626 748
627sub clear { 749sub clear {
628 my ($self) = @_; 750 my ($self) = @_;
629 751
… …
633 for (@$children) { 755 for (@$children) {
634 delete $_->{parent}; 756 delete $_->{parent};
635 $_->hide; 757 $_->hide;
636 } 758 }
637 759
638 $self->check_size; 760 $self->realloc;
639 $self->update;
640} 761}
641 762
642sub find_widget { 763sub find_widget {
643 my ($self, $x, $y) = @_; 764 my ($self, $x, $y) = @_;
644 765
645 $x -= $self->{x}; 766 $x -= $self->{x};
646 $y -= $self->{y}; 767 $y -= $self->{y};
647 768
648 my $res; 769 my $res;
649 770
650 for (reverse @{ $self->{children} }) { 771 for (reverse $self->visible_children) {
651 $res = $_->find_widget ($x, $y) 772 $res = $_->find_widget ($x, $y)
652 and return $res; 773 and return $res;
653 } 774 }
654 775
655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 776 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
676} 797}
677 798
678sub add { 799sub add {
679 my ($self, $child) = @_; 800 my ($self, $child) = @_;
680 801
681 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
682
683 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
684} 804}
685 805
686sub remove { 806sub remove {
687 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
696 816
697sub size_request { 817sub size_request {
698 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
699} 819}
700 820
701sub size_allocate { 821sub invoke_size_allocate {
702 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
703 823
704 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
705} 827}
706 828
707############################################################################# 829#############################################################################
830
831# back-buffered drawing area
708 832
709package CFClient::UI::Window; 833package CFClient::UI::Window;
710 834
711our @ISA = CFClient::UI::Bin::; 835our @ISA = CFClient::UI::Bin::;
712 836
… …
723 847
724 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
725 $self->SUPER::update; 849 $self->SUPER::update;
726} 850}
727 851
728sub size_allocate { 852sub invoke_size_allocate {
729 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
730 854
731 $self->SUPER::size_allocate ($w, $h);
732 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
733} 858}
734 859
735sub _render { 860sub _render {
861 my ($self) = @_;
862
736 $_[0]{children}[0]->draw; 863 $self->{children}[0]->draw;
737} 864}
738 865
739sub render_child { 866sub render_child {
740 my ($self) = @_; 867 my ($self) = @_;
741 868
742 $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 {
743 glClearColor 0, 0, 0, 0; 870 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT; 871 glClear GL_COLOR_BUFFER_BIT;
745 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
746 $self->_render; 880 $self->_render;
747 }; 881 };
748} 882}
749 883
750sub _draw { 884sub _draw {
751 my ($self) = @_; 885 my ($self) = @_;
752 886
753 my ($w, $h) = ($self->w, $self->h); 887 my ($w, $h) = @$self{qw(w h)};
754 888
755 my $tex = $self->{texture} 889 my $tex = $self->{texture}
756 or return; 890 or return;
757 891
758 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 glColor 1, 1, 1, 1; 894 glColor 0, 0, 0, 1;
761 895
762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
763 897
764 glDisable GL_TEXTURE_2D; 898 glDisable GL_TEXTURE_2D;
765} 899}
… …
781} 915}
782 916
783sub size_request { 917sub size_request {
784 my ($self) = @_; 918 my ($self) = @_;
785 919
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 920 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 921
788 @$self{qw(child_w child_h)} 922 $w = 10 if $self->{scroll_x};
789} 923 $h = 10 if $self->{scroll_y};
790 924
925 ($w, $h)
926}
927
791sub size_allocate { 928sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
793 930
931 my $child = $self->child;
932
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 935
797 $self->child->configure (0, 0, $w, $h); 936 $self->child->configure (0, 0, $w, $h);
798 $self->update; 937 $self->update;
938
939 1
799} 940}
800 941
801sub set_offset { 942sub set_offset {
802 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
803 944
… …
836} 977}
837 978
838sub _render { 979sub _render {
839 my ($self) = @_; 980 my ($self) = @_;
840 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
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842 986
843 $self->SUPER::_render; 987 $self->SUPER::_render;
844} 988}
845 989
… …
848package CFClient::UI::ScrolledWindow; 992package CFClient::UI::ScrolledWindow;
849 993
850our @ISA = CFClient::UI::HBox::; 994our @ISA = CFClient::UI::HBox::;
851 995
852sub new { 996sub new {
853 my $class = shift; 997 my ($class, %arg) = @_;
998
999 my $child = delete $arg{child};
854 1000
855 my $self; 1001 my $self;
856 1002
857 my $slider = new CFClient::UI::Slider 1003 my $slider = new CFClient::UI::Slider
858 vertical => 1, 1004 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 1005 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 1006 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
862 }, 1008 },
863 ; 1009 ;
864 1010
865 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
866 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
867 slider => $slider, 1014 slider => $slider,
868 @_, 1015 %arg,
869 ); 1016 );
870 1017
871 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
1019 $self->add ($child) if $child;
874 1020
875 $self 1021 $self
876} 1022}
877 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
878sub size_allocate { 1056sub invoke_size_allocate {
879 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
880 1058
1059 $self->update_slider;
1060
881 $self->SUPER::size_allocate ($w, $h); 1061 $self->SUPER::invoke_size_allocate ($w, $h)
882
883 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
885} 1062}
886
887#TODO# update range on size_allocate depending on child
888# update viewport offset on scroll
889 1063
890############################################################################# 1064#############################################################################
891 1065
892package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
893 1067
… …
909 1083
910 if ($self->{bg}) { 1084 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)}; 1085 my ($w, $h) = @$self{qw(w h)};
912 1086
913 glEnable GL_BLEND; 1087 glEnable GL_BLEND;
914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1088 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
915 glColor @{ $self->{bg} }; 1089 glColor_premultiply @{ $self->{bg} };
916 1090
917 glBegin GL_QUADS; 1091 glBegin GL_QUADS;
918 glVertex 0 , 0; 1092 glVertex 0 , 0;
919 glVertex 0 , $h; 1093 glVertex 0 , $h;
920 glVertex $w, $h; 1094 glVertex $w, $h;
… …
933 1107
934our @ISA = CFClient::UI::Bin::; 1108our @ISA = CFClient::UI::Bin::;
935 1109
936use CFClient::OpenGL; 1110use CFClient::OpenGL;
937 1111
938my @tex = 1112my $bg =
1113 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1114 mipmap => 1, wrap => 1;
1115
1116my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1117 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 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);
941 1119
942sub new { 1120sub new {
943 my $class = shift; 1121 my ($class, %arg) = @_;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1122
947 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1126 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1127 can_events => 1,
953 @_ 1128 min_w => 64,
1129 min_h => 32,
1130 %arg,
954 ); 1131 );
955 1132
956 $self->{title} &&= new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
957 align => 0, 1134 align => 0,
958 valign => 1, 1135 valign => 1,
959 text => $self->{title}, 1136 text => $self->{title},
960 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 }
961 1148
962 $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};
963} 1158}
964 1159
965sub border { 1160sub border {
966 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
967} 1162}
968 1163
969sub size_request { 1164sub size_request {
970 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};
971 1172
972 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
973 1174
974 ( 1175 (
975 $w + $self->border * 2, 1176 $w + $self->border * 2,
976 $h + $self->border * 2, 1177 $h + $self->border * 2,
977 ) 1178 )
978} 1179}
979 1180
980sub size_allocate { 1181sub invoke_size_allocate {
981 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
982 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
983 $h -= List::Util::max 0, $self->border * 2; 1192 $h -= List::Util::max 0, $border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1193 $w -= List::Util::max 0, $border * 2;
985 1194
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987 if $self->{title};
988
989 $self->child->configure ($self->border, $self->border, $w, $h); 1195 $self->child->configure ($border, $border, $w, $h);
990}
991 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
992sub button_down { 1211sub invoke_button_down {
993 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
994 1213
995 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
996 my $border = $self->border; 1215 my $border = $self->border;
997 1216
… …
1010 my ($ev, $x, $y) = @_; 1229 my ($ev, $x, $y) = @_;
1011 1230
1012 my $dx = $ev->{x} - $ox; 1231 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1232 my $dy = $ev->{y} - $oy;
1014 1233
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1234 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1235 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1236
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1237 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size; 1238 $self->realloc;
1019 }; 1239 };
1020 1240
1021 } elsif ($lr ^ $td) { 1241 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1242 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1243 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1245 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1246 my ($ev, $x, $y) = @_;
1027 1247
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1249
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update; 1251 # HACK: the next line is required to enforce placement
1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1032 }; 1253 };
1254 } else {
1255 return 0;
1256 }
1257
1033 } 1258 1
1034} 1259}
1035 1260
1036sub button_up { 1261sub invoke_button_up {
1037 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1038 1263
1039 delete $self->{motion}; 1264 ! ! delete $self->{motion}
1040} 1265}
1041 1266
1042sub mouse_motion { 1267sub invoke_mouse_motion {
1043 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1044 1269
1045 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271
1272 ! ! $self->{motion}
1046} 1273}
1047 1274
1048sub _draw { 1275sub _draw {
1049 my ($self) = @_; 1276 my ($self) = @_;
1050 1277
1278 my $child = $self->{children}[0];
1279
1051 my ($w, $h ) = ($self->{w}, $self->{h}); 1280 my ($w, $h ) = ($self->{w}, $self->{h});
1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1281 my ($cw, $ch) = ($child->{w}, $child->{h});
1053 1282
1054 glEnable GL_TEXTURE_2D; 1283 glEnable GL_TEXTURE_2D;
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1285
1057 my $border = $self->border; 1286 my $border = $self->border;
1058 1287
1059 glColor @{ $self->{border_bg} }; 1288 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1289 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1290 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1291 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1292 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1293
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1294 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1295 glColor @{ $self->{bg} };
1067 1296
1068 # TODO: repeat texture not scale 1297 # TODO: repeat texture not scale
1298 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1299 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1300 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1301 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1302 }
1079 1303
1080 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1081 1305
1082 $self->{title}->draw if $self->{title};
1083
1084 $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};
1085} 1317}
1086 1318
1087############################################################################# 1319#############################################################################
1088 1320
1089package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1101 col_expand => [], 1333 col_expand => [],
1102 @_, 1334 @_,
1103 ) 1335 )
1104} 1336}
1105 1337
1338sub children {
1339 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340}
1341
1106sub add { 1342sub add {
1107 my ($self, $x, $y, $child) = @_; 1343 my ($self, $x, $y, $child) = @_;
1108 1344
1109 $child->set_parent ($self); 1345 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1111 1347
1112 $child->check_size; 1348 $self->realloc;
1113} 1349}
1114 1350
1115sub children { 1351sub remove {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1352 my ($self, $child) = @_;
1117}
1118 1353
1354 # TODO: not yet implemented
1355}
1356
1119# TODO: move to container class maybe? send childs a signal on removal? 1357# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1358sub clear {
1121 my ($self) = @_; 1359 my ($self) = @_;
1122 1360
1123 my @children = $self->children; 1361 my @children = $self->children;
1124 delete $self->{children}; 1362 delete $self->{children};
… …
1126 for (@children) { 1364 for (@children) {
1127 delete $_->{parent}; 1365 delete $_->{parent};
1128 $_->hide; 1366 $_->hide;
1129 } 1367 }
1130 1368
1131 $self->update; 1369 $self->realloc;
1132} 1370}
1133 1371
1134sub get_wh { 1372sub get_wh {
1135 my ($self) = @_; 1373 my ($self) = @_;
1136 1374
… …
1162 (sum @$ws), 1400 (sum @$ws),
1163 (sum @$hs), 1401 (sum @$hs),
1164 ) 1402 )
1165} 1403}
1166 1404
1167sub size_allocate { 1405sub invoke_size_allocate {
1168 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1169 1407
1170 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1171 1409
1172 my $req_w = sum @$ws; 1410 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1411 my $req_h = (sum @$hs) || 1;
1174 1412
1175 # TODO: nicer code && do row_expand 1413 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1414 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1415 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1416 my $col_expand = (sum @col_expand) || 1;
… …
1204 } 1442 }
1205 1443
1206 $y += $row_h; 1444 $y += $row_h;
1207 } 1445 }
1208 1446
1447 1
1209} 1448}
1210 1449
1211sub find_widget { 1450sub find_widget {
1212 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1213 1452
… …
1232 } 1471 }
1233} 1472}
1234 1473
1235############################################################################# 1474#############################################################################
1236 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
1237package CFClient::UI::HBox; 1536package CFClient::UI::HBox;
1238 1537
1239# TODO: wrap into common Box base class
1240
1241our @ISA = CFClient::UI::Container::; 1538our @ISA = CFClient::UI::Box::;
1242 1539
1243sub size_request { 1540sub new {
1244 my ($self) = @_; 1541 my $class = shift;
1245 1542
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1543 $class->SUPER::new (
1247 1544 vertical => 0,
1248 ( 1545 @_,
1249 (List::Util::sum map $_->[0], @alloc),
1250 (List::Util::max map $_->[1], @alloc),
1251 ) 1546 )
1252} 1547}
1253 1548
1254sub size_allocate {
1255 my ($self, $w, $h) = @_;
1256
1257 ($h, $w) = ($w, $h);
1258
1259 my $children = $self->{children};
1260
1261 my @h = map $_->{req_w}, @$children;
1262
1263 my $req_h = List::Util::sum @h;
1264
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children;
1270 $exp ||= 1;
1271
1272 for (0 .. $#$children) {
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 }
1279 }
1280
1281 CFClient::UI::harmonize \@h;
1282
1283 my $y = 0;
1284 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_];
1287 $child->configure ($y, 0, $h, $w);
1288
1289 $y += $h;
1290 }
1291
1292 1
1293}
1294
1295############################################################################# 1549#############################################################################
1296 1550
1297package CFClient::UI::VBox; 1551package CFClient::UI::VBox;
1298 1552
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1553our @ISA = CFClient::UI::Box::;
1302 1554
1303sub size_request { 1555sub new {
1304 my ($self) = @_; 1556 my $class = shift;
1305 1557
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1558 $class->SUPER::new (
1307 1559 vertical => 1,
1308 ( 1560 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1561 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1562}
1352 1563
1353############################################################################# 1564#############################################################################
1354 1565
1355package CFClient::UI::Label; 1566package CFClient::UI::Label;
… …
1372 ellipsise => 3, # end 1583 ellipsise => 3, # end
1373 layout => (new CFClient::Layout), 1584 layout => (new CFClient::Layout),
1374 fontsize => 1, 1585 fontsize => 1,
1375 align => -1, 1586 align => -1,
1376 valign => -1, 1587 valign => -1,
1377 padding => 2, 1588 padding_x => 2,
1589 padding_y => 2,
1378 can_events => 0, 1590 can_events => 0,
1379 %arg 1591 %arg
1380 ); 1592 );
1381 1593
1382 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
… …
1409 1621
1410 delete $self->{texture}; 1622 delete $self->{texture};
1411 $self->SUPER::update; 1623 $self->SUPER::update;
1412} 1624}
1413 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1414sub set_text { 1633sub set_text {
1415 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1416 1635
1417 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1418 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1419 1638
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1422 1640
1641 delete $self->{size_req};
1642 $self->realloc;
1423 $self->update; 1643 $self->update;
1424 $self->check_size;
1425} 1644}
1426 1645
1427sub set_markup { 1646sub set_markup {
1428 my ($self, $markup) = @_; 1647 my ($self, $markup) = @_;
1429 1648
1430 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1431 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1432 1651
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1653
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1437 1655
1656 delete $self->{size_req};
1657 $self->realloc;
1438 $self->update; 1658 $self->update;
1439 $self->check_size;
1440} 1659}
1441 1660
1442sub size_request { 1661sub size_request {
1443 my ($self) = @_; 1662 my ($self) = @_;
1444 1663
1664 $self->{size_req} ||= do {
1445 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1446 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1447 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1448 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1450 1670
1451 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1452 1672
1453 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1454 $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);
1455 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1456 1677
1457 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1458 1679
1459 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1460 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1461 } 1685 };
1462 1686
1463 ( 1687 @{ $self->{size_req} }
1464 $w + $self->{padding} * 2,
1465 $h + $self->{padding} * 2,
1466 )
1467} 1688}
1468 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1469sub size_allocate { 1694sub invoke_size_allocate {
1470 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1471 1696
1697 delete $self->{ox};
1698
1472 delete $self->{texture}; 1699 delete $self->{texture}
1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1473} 1703}
1474 1704
1475sub set_fontsize { 1705sub set_fontsize {
1476 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1477 1707
1478 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1479 delete $self->{texture}; 1710 delete $self->{texture};
1480 1711
1481 $self->update; 1712 $self->realloc;
1482 $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;
1483} 1722}
1484 1723
1485sub _draw { 1724sub _draw {
1486 my ($self) = @_; 1725 my ($self) = @_;
1487 1726
1488 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1489 1728
1490 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1491 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1492 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1493 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1736
1498 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1737 [$self->{layout}->size]
1499
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1502 : ($self->{w} - $tex->{w}) * 0.5);
1503
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1506 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1509 }; 1738 };
1510 1739
1511 glEnable GL_TEXTURE_2D; 1740 unless (exists $self->{ox}) {
1512 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);
1513 1744
1514 if ($tex->{format} == GL_ALPHA) { 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1515 glColor @{$self->{fg}}; 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1747 : ($self->{h} - $size->[1]) * 0.5);
1517 } else {
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1519 } 1748 };
1520 1749
1521 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});
1522} 1754}
1523 1755
1524############################################################################# 1756#############################################################################
1525 1757
1526package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1540 can_hover => 1, 1772 can_hover => 1,
1541 can_focus => 1, 1773 can_focus => 1,
1542 valign => 0, 1774 valign => 0,
1543 can_events => 1, 1775 can_events => 1,
1544 #text => ... 1776 #text => ...
1777 #hidden => "*",
1545 @_ 1778 @_
1546 ) 1779 )
1547} 1780}
1548 1781
1549sub _set_text { 1782sub _set_text {
… …
1551 1784
1552 delete $self->{cur_h}; 1785 delete $self->{cur_h};
1553 1786
1554 return if $self->{text} eq $text; 1787 return if $self->{text} eq $text;
1555 1788
1556 delete $self->{texture};
1557
1558 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1559 $self->{text} = $text; 1790 $self->{text} = $text;
1560 1791
1561 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1562 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1563 1795
1564 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1799 $self->update;
1565} 1800}
1566 1801
1567sub set_text { 1802sub set_text {
1568 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1569 1804
1570 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 1806 $self->_set_text ($text);
1572 $self->update;
1573 $self->check_size;
1574} 1807}
1575 1808
1576sub get_text { 1809sub get_text {
1577 $_[0]{text} 1810 $_[0]{text}
1578} 1811}
… …
1583 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1584 1817
1585 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1586} 1819}
1587 1820
1588sub key_down { 1821sub invoke_key_down {
1589 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1590 1823
1591 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1592 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1593 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1605 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1606 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1607 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1608 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1609 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1610 $self->_emit ('escape'); 1843 $self->emit ('escape');
1611 } elsif ($uni) { 1844 } elsif ($uni) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else {
1847 return 0;
1613 } 1848 }
1614 1849
1615 $self->_set_text ($text); 1850 $self->_set_text ($text);
1616 $self->update;
1617 $self->check_size;
1618}
1619 1851
1852 $self->realloc;
1853
1854 1
1855}
1856
1620sub focus_in { 1857sub invoke_focus_in {
1621 my ($self) = @_; 1858 my ($self) = @_;
1622 1859
1623 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1624 1861
1625 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1626} 1863}
1627 1864
1628sub button_down { 1865sub invoke_button_down {
1629 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1630 1867
1631 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1632 1869
1633 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1634 1871
1635 # byte-index to char-index 1872 # byte-index to char-index
1636 my $text = $self->{text}; 1873 my $text = $self->{text};
1637 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1638 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1639 1876
1640 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1641 $self->update; 1878 $self->update;
1879
1880 1
1642} 1881}
1643 1882
1644sub mouse_motion { 1883sub invoke_mouse_motion {
1645 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1646# 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
1647} 1888}
1648 1889
1649sub _draw { 1890sub _draw {
1650 my ($self) = @_; 1891 my ($self) = @_;
1651 1892
1652 local $self->{fg} = $self->{fg}; 1893 local $self->{fg} = $self->{fg};
1653 1894
1654 if ($FOCUS == $self) { 1895 if ($FOCUS == $self) {
1655 glColor @{$self->{active_bg}}; 1896 glColor_premultiply @{$self->{active_bg}};
1656 $self->{fg} = $self->{active_fg}; 1897 $self->{fg} = $self->{active_fg};
1657 } else { 1898 } else {
1658 glColor @{$self->{bg}}; 1899 glColor_premultiply @{$self->{bg}};
1659 } 1900 }
1660 1901
1661 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1662 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1663 glBegin GL_QUADS; 1904 glBegin GL_QUADS;
1664 glVertex 0 , 0; 1905 glVertex 0 , 0;
1665 glVertex 0 , $self->{h}; 1906 glVertex 0 , $self->{h};
1666 glVertex $self->{w}, $self->{h}; 1907 glVertex $self->{w}, $self->{h};
1667 glVertex $self->{w}, 0; 1908 glVertex $self->{w}, 0;
… …
1692 1933
1693our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1694 1935
1695use CFClient::OpenGL; 1936use CFClient::OpenGL;
1696 1937
1697sub key_down { 1938sub invoke_key_down {
1698 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1699 1940
1700 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1701 1942
1702 if ($sym == 13) { 1943 if ($sym == 13) {
1703 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1704 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1705 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1706 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1707 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1708 $self->update; 1950 $self->update;
1709 1951
1710 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1711 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1712 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1728 } else { 1970 } else {
1729 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1730 } 1972 }
1731 1973
1732 } else { 1974 } else {
1733 $self->SUPER::key_down ($ev); 1975 return $self->SUPER::invoke_key_down ($ev)
1976 }
1977
1734 } 1978 1
1735
1736} 1979}
1737 1980
1738############################################################################# 1981#############################################################################
1739 1982
1740package CFClient::UI::Button; 1983package CFClient::UI::Button;
… …
1749 1992
1750sub new { 1993sub new {
1751 my $class = shift; 1994 my $class = shift;
1752 1995
1753 $class->SUPER::new ( 1996 $class->SUPER::new (
1754 padding => 4, 1997 padding_x => 4,
1998 padding_y => 4,
1755 fg => [1, 1, 1], 1999 fg => [1, 1, 1],
1756 active_fg => [0, 0, 1], 2000 active_fg => [0, 0, 1],
1757 can_hover => 1, 2001 can_hover => 1,
1758 align => 0, 2002 align => 0,
1759 valign => 0, 2003 valign => 0,
1760 can_events => 1, 2004 can_events => 1,
1761 @_ 2005 @_
1762 ) 2006 )
1763} 2007}
1764 2008
1765sub activate { }
1766
1767sub button_up { 2009sub invoke_button_up {
1768 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1769 2011
1770 $self->emit ("activate") 2012 $self->emit ("activate")
1771 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1772 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
2015
2016 1
1773} 2017}
1774 2018
1775sub _draw { 2019sub _draw {
1776 my ($self) = @_; 2020 my ($self) = @_;
1777 2021
1778 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1779
1780 if ($GRAB == $self) {
1781 $self->{fg} = $self->{active_fg};
1782 }
1783 2023
1784 glEnable GL_TEXTURE_2D; 2024 glEnable GL_TEXTURE_2D;
1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1786 glColor 0, 0, 0, 1; 2026 glColor 0, 0, 0, 1;
1787 2027
… …
1792 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
1793} 2033}
1794 2034
1795############################################################################# 2035#############################################################################
1796 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
1797package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
1798 2074
1799our @ISA = CFClient::UI::DrawBG::; 2075our @ISA = CFClient::UI::DrawBG::;
1800 2076
1801my @tex = 2077my @tex =
… …
1806 2082
1807sub new { 2083sub new {
1808 my $class = shift; 2084 my $class = shift;
1809 2085
1810 $class->SUPER::new ( 2086 $class->SUPER::new (
1811 padding => 2, 2087 padding_x => 2,
2088 padding_y => 2,
1812 fg => [1, 1, 1], 2089 fg => [1, 1, 1],
1813 active_fg => [1, 1, 0], 2090 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5], 2092 active_bg => [1, 1, 1, 0.5],
1816 state => 0, 2093 state => 0,
… …
1820} 2097}
1821 2098
1822sub size_request { 2099sub size_request {
1823 my ($self) = @_; 2100 my ($self) = @_;
1824 2101
1825 ($self->{padding} * 2 + 6) x 2 2102 (6) x 2
1826} 2103}
1827 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1828sub button_down { 2113sub invoke_button_down {
1829 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1830 2115
1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833 $self->{state} = !$self->{state}; 2118 $self->toggle;
1834 $self->_emit (changed => $self->{state}); 2119 } else {
2120 return 0
2121 }
2122
1835 } 2123 1
1836} 2124}
1837 2125
1838sub _draw { 2126sub _draw {
1839 my ($self) = @_; 2127 my ($self) = @_;
1840 2128
1841 $self->SUPER::_draw; 2129 $self->SUPER::_draw;
1842 2130
1843 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2131 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844 2132
1845 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;
1846 2136
1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2137 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848 2138
1849 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2139 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850 2140
… …
1858package CFClient::UI::Image; 2148package CFClient::UI::Image;
1859 2149
1860our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
1861 2151
1862use CFClient::OpenGL; 2152use CFClient::OpenGL;
1863use Carp qw/confess/;
1864 2153
1865our %loaded_images; 2154our %texture_cache;
1866 2155
1867sub new { 2156sub new {
1868 my $class = shift; 2157 my $class = shift;
1869 2158
1870 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
1871 2163
1872 $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";
1873 2166
1874 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1875 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;
1876 2169
1877 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
1878 2171
1879 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1880
1881 $self->{aspect} = $tex->{w} / $tex->{h};
1882 2173
1883 $self 2174 $self
1884} 2175}
1885 2176
1886sub size_request { 2177sub size_request {
1887 my ($self) = @_; 2178 my ($self) = @_;
1888 2179
1889 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
1890} 2181}
1891 2182
1892sub _draw { 2183sub _draw {
1893 my ($self) = @_; 2184 my ($self) = @_;
1894 2185
… …
2003 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2004 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2005 2296
2006 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2007 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);
2008 2302
2009 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2010 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;
2011 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2308
2014 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2309 glBindTexture GL_TEXTURE_2D, $t1->{name};
2015 glBegin GL_QUADS; 2310 glBegin GL_QUADS;
… …
2030 2325
2031 if ($t3) { 2326 if ($t3) {
2032 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2033 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2034 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2035 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2036 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2037 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2038 glEnd; 2333 glEnd;
2039 } 2334 }
2040 2335
2041 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2115 fg => [1, 1, 1], 2410 fg => [1, 1, 1],
2116 active_fg => [0, 0, 0], 2411 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2], 2412 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5], 2413 active_bg => [1, 1, 1, 0.5],
2119 range => [0, 0, 100, 10, 0], 2414 range => [0, 0, 100, 10, 0],
2120 req_w => $::WIDTH / 80, 2415 min_w => $::WIDTH / 80,
2121 req_h => $::WIDTH / 80, 2416 min_h => $::WIDTH / 80,
2122 vertical => 0, 2417 vertical => 0,
2123 can_hover => 1, 2418 can_hover => 1,
2124 inner_pad => 0.02, 2419 inner_pad => 0.02,
2125 @_ 2420 @_
2126 ); 2421 );
… …
2132} 2427}
2133 2428
2134sub set_range { 2429sub set_range {
2135 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2136 2431
2137 $self->{range} = $range; 2432 ($range, $self->{range}) = ($self->{range}, $range);
2138 2433
2434 if ("@$range" ne "@{$self->{range}}") {
2139 $self->update; 2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2140} 2438}
2141 2439
2142sub set_value { 2440sub set_value {
2143 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2144 2442
… …
2155 if $unit; 2453 if $unit;
2156 2454
2157 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2158 2456
2159 if ($value != $old_value) { 2457 if ($value != $old_value) {
2160 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2161 $self->update; 2459 $self->update;
2162 } 2460 }
2163} 2461}
2164 2462
2165sub size_request { 2463sub size_request {
2166 my ($self) = @_; 2464 my ($self) = @_;
2167 2465
2168 my $w = $self->{req_w}; 2466 ($self->{req_w}, $self->{req_h})
2169 my $h = $self->{req_h};
2170
2171 $self->{vertical} ? ($h, $w) : ($w, $h)
2172} 2467}
2173 2468
2174sub button_down { 2469sub invoke_button_down {
2175 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2176 2471
2177 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2178 2473
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180 2475
2181 $self->mouse_motion ($ev, $x, $y); 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2182} 2477}
2183 2478
2184sub mouse_motion { 2479sub invoke_mouse_motion {
2185 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2186 2481
2187 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2188 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2189 2484
2190 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2485 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191 2486
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2487 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193 2488
2194 $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
2195 } 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
2196} 2505}
2197 2506
2198sub update { 2507sub update {
2199 my ($self) = @_; 2508 my ($self) = @_;
2200 2509
2201 $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}) {
2202 $self->set_value ($self->{range}[0]); 2518 $self->set_value ($self->{range}[0]);
2203 2519
2204 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2520 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100; 2521 my $range = ($hi - $page - $lo) || 1e-100;
2206 2522
… …
2212 $value = ($value - $lo) / $range; 2528 $value = ($value - $lo) / $range;
2213 $value = $value * $self->{scale} + $self->{offset}; 2529 $value = $value * $self->{scale} + $self->{offset};
2214 2530
2215 $self->{knob_x} = $value - $knob_w * 0.5; 2531 $self->{knob_x} = $value - $knob_w * 0.5;
2216 $self->{knob_w} = $knob_w; 2532 $self->{knob_w} = $knob_w;
2217 }); 2533 }
2218
2219 $self->SUPER::update;
2220}
2221
2222sub _draw {
2223 my ($self) = @_;
2224 2534
2225 $self->SUPER::_draw (); 2535 $self->SUPER::_draw ();
2226 2536
2227 glScale $self->{w}, $self->{h}; 2537 glScale $self->{w}, $self->{h};
2228 2538
… …
2289sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2290sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2291 2601
2292############################################################################# 2602#############################################################################
2293 2603
2294package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2295 2605
2296our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2297 2607
2298use CFClient::OpenGL; 2608use CFClient::OpenGL;
2299 2609
2300sub new { 2610sub new {
2301 my $class = shift; 2611 my $class = shift;
2302 2612
2303 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2304 fontsize => 1, 2614 fontsize => 1,
2305 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2306 #font => default_font 2617 #font => default_font
2307 @_, 2618 @_,
2308 2619
2309 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2310 par => [], 2621 par => [],
2311 height => 0, 2622 height => 0,
2312 children => [ 2623 children => [
2313 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2314 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2325 2636
2326 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2327 $self->reflow; 2638 $self->reflow;
2328} 2639}
2329 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
2330sub size_allocate { 2650sub invoke_size_allocate {
2331 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2332 2652
2333 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2334 2655
2335 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337 $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});
2338 2660
2339 $self->reflow; 2661 $self->reflow;
2340}
2341 2662
2342sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2343 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) = @_;
2344 2679
2345 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2346 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2347 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2348 $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});
2349 $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}}
2350 2693 );
2694
2351 $layout->size 2695 $layout
2352} 2696}
2353 2697
2354sub reflow { 2698sub reflow {
2355 my ($self) = @_; 2699 my ($self) = @_;
2356 2700
… …
2365 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2366} 2710}
2367 2711
2368sub clear { 2712sub clear {
2369 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2370 2717
2371 $self->{par} = []; 2718 $self->{par} = [];
2372 $self->{height} = 0; 2719 $self->{height} = 0;
2373 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2374} 2721}
2375 2722
2376sub add_paragraph { 2723sub add_paragraph {
2377 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2378 2725
2379 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2380 my ($w, $h) = $self->text_size ($line); 2727
2381 $self->{height} += $h; 2728 $para = {
2382 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,
2383 } 2735 };
2384 2736
2385 $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;
2386} 2749}
2387 2750
2388sub update { 2751sub update {
2389 my ($self) = @_; 2752 my ($self) = @_;
2390 2753
… …
2392 2755
2393 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2394 2757
2395 delete $self->{texture}; 2758 delete $self->{texture};
2396 2759
2397 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399 2762
2400 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2401 my $height = 0; 2764 my $height = 0;
2402 2765
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406
2407 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2408 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2409 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2410 $layout->set_markup ($_->[4]);
2411 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2412 $_->[0] = $w + $_->[3]; 2770
2413 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2414 } 2774 }
2415 2775
2416 $height += $_->[1]; 2776 $height += $para->{h};
2417 } 2777 }
2418 2778
2419 $self->{height} = $height; 2779 $self->{height} = $height;
2420 2780
2421 $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]);
2422 2782
2423 delete $self->{texture}; 2783 delete $self->{texture};
2424 } 2784 }
2425 2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2427 glClearColor 0.5, 0.5, 0.5, 0; 2791 glClearColor 0, 0, 0, 0;
2428 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
2429 2793
2430 my $top = int $self->{children}[1]{range}[0]; 2794 my $top = int $self->{children}[1]{range}[0];
2431 2795
2432 my $y0 = $top; 2796 my $y0 = $top;
2433 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2434 2798
2435 my $y = 0; 2799 my $y = 0;
2436 2800
2437 my $layout = $self->{layout};
2438
2439 $layout->set_font ($self->{font}) if $self->{font};
2440
2441 glEnable GL_BLEND;
2442 #TODO# not correct in windows where rgba is forced off
2443 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2444
2445 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2446 my $h = $par->[1]; 2802 my $h = $para->{h};
2447 2803
2448 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2449 $layout->set_foreground (@{ $par->[2] });
2450 $layout->set_width ($W - $par->[3]);
2451 $layout->set_markup ($par->[4]);
2452 2805
2453 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2454 2807
2455 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2456 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 }
2457 } 2822 }
2458 2823
2459 $y += $h; 2824 $y += $h;
2460 } 2825 }
2461
2462 glDisable GL_BLEND;
2463 }; 2826 };
2464 }); 2827 });
2465} 2828}
2466 2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2837}
2838
2467sub _draw { 2839sub _draw {
2468 my ($self) = @_; 2840 my ($self) = @_;
2469 2841
2470 glEnable GL_TEXTURE_2D; 2842 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2843 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 1, 1, 1, 1; 2844 glColor 0, 0, 0, 1;
2473 $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});
2474 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2475 2847
2476 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2477
2478} 2849}
2479 2850
2480############################################################################# 2851#############################################################################
2481 2852
2482package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2527 2898
2528sub new { 2899sub new {
2529 my $class = shift; 2900 my $class = shift;
2530 2901
2531 my $self = $class->SUPER::new ( 2902 my $self = $class->SUPER::new (
2532 state => 0, 2903 state => 0,
2533 connect_activate => \&toggle_flopper, 2904 on_activate => \&toggle_flopper,
2534 @_ 2905 @_
2535 ); 2906 );
2536 2907
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2908 $self
2543} 2909}
2544 2910
2545sub toggle_flopper { 2911sub toggle_flopper {
2546 my ($self) = @_; 2912 my ($self) = @_;
2547 2913
2548 # TODO: use animation 2914 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2915}
2560 2916
2561############################################################################# 2917#############################################################################
2562 2918
2563package CFClient::UI::Tooltip; 2919package CFClient::UI::Tooltip;
… …
2576} 2932}
2577 2933
2578sub set_tooltip_from { 2934sub set_tooltip_from {
2579 my ($self, $widget) = @_; 2935 my ($self, $widget) = @_;
2580 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
2581 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2582 markup => $widget->{tooltip}, 2950 markup => $tooltip,
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8, 2952 fontsize => 0.8,
2585 fg => [0, 0, 0, 1], 2953 fg => [0, 0, 0, 1],
2586 ellipsise => 0, 2954 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP), 2955 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2594 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2595 2963
2596 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2597} 2965}
2598 2966
2599sub size_allocate { 2967sub invoke_size_allocate {
2600 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2601 2969
2602 $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 });
2603} 2989}
2604 2990
2605sub _draw { 2991sub _draw {
2606 my ($self) = @_; 2992 my ($self) = @_;
2607 2993
… …
2624 glVertex $w, $h; 3010 glVertex $w, $h;
2625 glVertex $w, 0; 3011 glVertex $w, 0;
2626 glEnd; 3012 glEnd;
2627 3013
2628 glTranslate 2 - 0.375, 2 - 0.375; 3014 glTranslate 2 - 0.375, 2 - 0.375;
3015
2629 $self->SUPER::_draw; 3016 $self->SUPER::_draw;
2630} 3017}
2631 3018
2632############################################################################# 3019#############################################################################
2633 3020
… …
2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2693 3080
2694 if ($tex) { 3081 if ($tex) {
2695 glEnable GL_TEXTURE_2D; 3082 glEnable GL_TEXTURE_2D;
2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2697 glColor 1, 1, 1, 1; 3084 glColor 0, 0, 0, 1;
2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2699 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2700 } 3087 }
2701} 3088}
2702 3089
2703sub DESTROY { 3090sub destroy {
2704 my ($self) = @_; 3091 my ($self) = @_;
2705 3092
2706 $self->{timer}->cancel 3093 $self->{timer}->cancel
2707 if $self->{timer}; 3094 if $self->{timer};
2708 3095
2709 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2710} 3097}
2711 3098
2712############################################################################# 3099#############################################################################
2713 3100
2714package CFClient::UI::Inventory; 3101package CFClient::UI::Buttonbar;
2715 3102
2716our @ISA = CFClient::UI::ScrolledWindow::; 3103our @ISA = CFClient::UI::HBox::;
2717 3104
2718sub new { 3105# TODO: should actualyl wrap buttons and other goodies.
2719 my $class = shift;
2720
2721 my $self = $class->SUPER::new (
2722 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2723 @_,
2724 );
2725
2726 $self
2727}
2728
2729sub set_items {
2730 my ($self, $items) = @_;
2731
2732 $self->{scrolled}->clear;
2733 return unless $items;
2734
2735 my @items = sort {
2736 ($a->{type} <=> $b->{type})
2737 or ($a->{name} cmp $b->{name})
2738 } @$items;
2739
2740 $self->{real_items} = \@items;
2741
2742 my $row = 0;
2743 for my $item (@items) {
2744 CFClient::Item::update_widgets $item;
2745
2746 $self->{scrolled}->add (0, $row, $item->{face_widget});
2747 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2748 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2749
2750 $row++;
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760 3106
2761############################################################################# 3107#############################################################################
2762 3108
2763package CFClient::UI::Menu; 3109package CFClient::UI::Menu;
2764 3110
… …
2776 ); 3122 );
2777 3123
2778 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2779 3125
2780 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2781 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2782 3128
2783 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2784 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 {
2785 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2786 can_hover => 1, 3146 can_hover => 1,
2787 can_events => 1, 3147 can_events => 1,
2788 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2789 } 3151 }
2790 3152
2791 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2792 3154
2793 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2798 3160
2799# 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)
2800sub popup { 3162sub popup {
2801 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2802 3164
2803 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2804 3166
2805 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2806 $GRAB = $self; 3168 $GRAB = $self;
2807 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2808 3170
2809 $self->show; 3171 $self->show;
2810 $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);
2811} 3173}
2812 3174
2813sub mouse_motion { 3175sub invoke_mouse_motion {
2814 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2815 3177
2816 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2817 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2818 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2819}
2820 3181
3182 0
3183}
3184
2821sub button_up { 3185sub invoke_button_up {
2822 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2823 3187
2824 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2825 undef $GRAB; 3189 undef $GRAB;
2826 $self->hide; 3190 $self->hide;
2827 3191
2828 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2829 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
3194 } else {
3195 return 0
3196 }
3197
2830 } 3198 1
2831} 3199}
2832 3200
2833############################################################################# 3201#############################################################################
2834 3202
2835package CFClient::UI::Statusbox; 3203package CFClient::UI::Multiplexer;
2836 3204
2837our @ISA = CFClient::UI::VBox::; 3205our @ISA = CFClient::UI::Container::;
2838 3206
2839sub new { 3207sub new {
2840 my $class = shift; 3208 my $class = shift;
2841 3209
2842 $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 (
2843 fontsize => 0.8, 3389 fontsize => 0.8,
2844 @_, 3390 @_,
2845 ) 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
2846} 3398}
2847 3399
2848sub reorder { 3400sub reorder {
2849 my ($self) = @_; 3401 my ($self) = @_;
2850 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} };
2851 3408
2852 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
2853 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2854 } 3411 }
2855 3412
… …
2858 my @items = sort { 3415 my @items = sort {
2859 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
2860 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
2861 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
2862 3419
3420 $self->{timer}->interval (1);
3421
2863 my $count = 10 + 1; 3422 my $count = 10 + 1;
2864 for my $item (@items) { 3423 for my $item (@items) {
2865 last unless --$count; 3424 last unless --$count;
2866 3425
2867 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
2868 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
2869 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
2870 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
2871 : $item->{text}; 3430 : $item->{text};
2872 3431
… …
2880 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
2881 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
2882 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
2883 fontsize => $item->{fontsize} || $self->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
2884 max_w => $::WIDTH * 0.44, 3443 max_w => $::WIDTH * 0.44,
2885 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
2886 can_events => 1, 3445 can_events => 1,
2887 can_hover => 1 3446 can_hover => 1
2888 }; 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;
2889 } 3460 }
2890 3461
2891 $self->clear; 3462 $self->clear;
2892 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
2893} 3464}
… …
2898 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
2899 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
2900 3471
2901 return unless $text; 3472 return unless $text;
2902 3473
2903 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2904 3475
2905 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2906 3477
2907 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
2908 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
2909 $item->{count}++; 3480 $item->{count}++;
2910 } else { 3481 } else {
2911 $item->{count} = 1; 3482 $item->{count} = 1;
2912 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
2913 } 3484 }
2914 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
2915 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
2916 delete $item->{label}; 3487 delete $item->{label};
2917 } else { 3488 } else {
2918 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
2919 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
2925 count => 1, 3496 count => 1,
2926 %arg, 3497 %arg,
2927 }; 3498 };
2928 } 3499 }
2929 3500
3501 $ROOT->on_refresh (reorder => sub {
2930 $self->reorder; 3502 $self->reorder;
3503 });
2931} 3504}
2932 3505
2933sub reconfigure { 3506sub reconfigure {
2934 my ($self) = @_; 3507 my ($self) = @_;
2935 3508
… …
2938 3511
2939 $self->reorder; 3512 $self->reorder;
2940 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
2941} 3514}
2942 3515
3516sub destroy {
3517 my ($self) = @_;
3518
3519 $self->{timer}->cancel;
3520
3521 $self->SUPER::destroy;
3522}
3523
2943############################################################################# 3524#############################################################################
2944 3525
2945package CFClient::UI::Root; 3526package CFClient::UI::Inventory;
2946 3527
2947our @ISA = CFClient::UI::Container::; 3528our @ISA = CFClient::UI::Table::;
2948
2949use CFClient::OpenGL;
2950 3529
2951sub new { 3530sub new {
2952 my $class = shift; 3531 my $class = shift;
2953 3532
2954 $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 => [],
2955 @_, 3578 @_,
2956 ) 3579 )
2957} 3580}
2958 3581
2959sub configure { 3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2960 my ($self, $x, $y, $w, $h) = @_;
2961 3583
2962 $self->{w} = $w; 3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2963 $self->{h} = $h; 3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2964} 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");
2965 3594
2966sub 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 {
2967 my ($self) = @_; 3668 my ($self, $spell) = @_;
2968 3669
2969 $self->size_allocate ($self->{w}, $self->{h}) 3670 $self->{spell}->{$spell->{name}} = $spell;
2970 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
2971} 3709}
2972 3710
2973sub size_request { 3711sub size_request {
2974 my ($self) = @_; 3712 my ($self) = @_;
2975 3713
2976 ($self->{w}, $self->{h}) 3714 ($self->{w}, $self->{h})
2977} 3715}
2978 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
2979sub size_allocate { 3731sub invoke_size_allocate {
2980 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
2981 3733
2982 for my $child ($self->children) { 3734 for my $child ($self->children) {
2983 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)};
2984 3736
2985 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3737 $X = $child->{force_x} if exists $child->{force_x};
2986 if exists $child->{req_x}; 3738 $Y = $child->{force_y} if exists $child->{force_y};
2987 3739
2988 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3740 $X = _to_pixel $X, $W, $self->{w};
2989 if exists $child->{req_y}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
2990
2991 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2992 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2993 3742
2994 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
2995 } 3744 }
3745
3746 1
2996} 3747}
2997 3748
2998sub coord2local { 3749sub coord2local {
2999 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3000 3751
… …
3008} 3759}
3009 3760
3010sub update { 3761sub update {
3011 my ($self) = @_; 3762 my ($self) = @_;
3012 3763
3013 $self->check_size;
3014 $::WANT_REFRESH++; 3764 $::WANT_REFRESH++;
3015} 3765}
3016 3766
3017sub add { 3767sub add {
3018 my ($self, @children) = @_; 3768 my ($self, @children) = @_;
3019 3769
3020 for (my @widgets = @children; my $w = pop @widgets; ) {
3021 push @widgets, $w->children;
3022 $w->{root} = $self;
3023 $w->{visible} = 1;
3024 }
3025
3026 for my $child (@children) {
3027 $child->{is_toplevel} = 1; 3770 $_->{is_toplevel} = 1
3028 3771 for @children;
3029 # integerise window positions
3030 $child->{x} = int $child->{x};
3031 $child->{y} = int $child->{y};
3032 }
3033 3772
3034 $self->SUPER::add (@children); 3773 $self->SUPER::add (@children);
3035} 3774}
3036 3775
3037sub remove { 3776sub remove {
3038 my ($self, @children) = @_; 3777 my ($self, @children) = @_;
3039 3778
3040 $self->SUPER::remove (@children); 3779 $self->SUPER::remove (@children);
3780
3781 delete $self->{is_toplevel}
3782 for @children;
3041 3783
3042 while (@children) { 3784 while (@children) {
3043 my $w = pop @children; 3785 my $w = pop @children;
3044 push @children, $w->children; 3786 push @children, $w->children;
3045 $w->set_invisible; 3787 $w->set_invisible;
… …
3064 while ($self->{refresh_hook}) { 3806 while ($self->{refresh_hook}) {
3065 $_->() 3807 $_->()
3066 for values %{delete $self->{refresh_hook}}; 3808 for values %{delete $self->{refresh_hook}};
3067 } 3809 }
3068 3810
3069 if ($self->{check_size}) { 3811 if ($self->{realloc}) {
3070 my @queue = ([], []); 3812 my %queue;
3813 my @queue;
3814 my $widget;
3071 3815
3072 for (;;) { 3816 outer:
3073 if ($self->{check_size}) { 3817 while () {
3074 # heuristic: check containers last 3818 if (my $realloc = delete $self->{realloc}) {
3075 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3819 for $widget (values %$realloc) {
3076 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 }
3077 } 3826 }
3078 3827
3079 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3828 while () {
3829 @queue or last outer;
3080 3830
3081 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3831 $widget = pop @{ $queue[-1] || [] }
3082 ? @$widget{qw(user_w user_h)} 3832 and last;
3083 : $widget->size_request;
3084
3085 if (delete $widget->{force_alloc}
3086 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3087 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3088 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}) {
3089 $widget->{req_w} = $w; 3852 $widget->{req_w} = $w;
3090 $widget->{req_h} = $h; 3853 $widget->{req_h} = $h;
3091 3854
3092 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3855 $self->{size_alloc}{$widget+0} = $widget;
3093 3856
3094 $widget->{parent}->check_size
3095 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 }
3096 } 3864 }
3865
3866 delete $self->{realloc}{$widget+0};
3097 } 3867 }
3098 } 3868 }
3099 3869
3100 while ($self->{size_alloc}) { 3870 while (my $size_alloc = delete $self->{size_alloc}) {
3101 for (values %{delete $self->{size_alloc}}) { 3871 my @queue = sort { $b->{visible} <=> $a->{visible} }
3102 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)};
3103 3878
3104 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3105 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3106 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
3107 $widget->{w} = $w; 3895 $widget->{w} = $w;
3108 $widget->{h} = $h; 3896 $widget->{h} = $h;
3897
3109 $widget->emit (size_allocate => $w, $h); 3898 $widget->emit (size_allocate => $w, $h);
3899 }
3110 } 3900 }
3111 } 3901 }
3112 3902
3113 while ($self->{post_alloc_hook}) { 3903 while ($self->{post_alloc_hook}) {
3114 $_->() 3904 $_->()
3115 for values %{delete $self->{post_alloc_hook}}; 3905 for values %{delete $self->{post_alloc_hook}};
3116 } 3906 }
3907
3117 3908
3118 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3909 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3119 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3910 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3120 glClear GL_COLOR_BUFFER_BIT; 3911 glClear GL_COLOR_BUFFER_BIT;
3121 3912
… …
3123 glLoadIdentity; 3914 glLoadIdentity;
3124 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3125 glMatrixMode GL_MODELVIEW; 3916 glMatrixMode GL_MODELVIEW;
3126 glLoadIdentity; 3917 glLoadIdentity;
3127 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
3128 $self->_draw; 3926 $self->_draw;
3129} 3927}
3130 3928
3131############################################################################# 3929#############################################################################
3132 3930

Diff Legend

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