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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 UTC

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

Diff Legend

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