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

Diff Legend

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