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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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