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

Diff Legend

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