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

Diff Legend

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