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

Diff Legend

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