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.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.447 by root, Sat Dec 22 06:50:45 2007 UTC

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

Diff Legend

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