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

Diff Legend

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