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

Diff Legend

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