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

Diff Legend

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