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

Diff Legend

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