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

Diff Legend

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