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

Diff Legend

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