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

Diff Legend

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