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

Diff Legend

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