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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.477 by root, Sun Jan 11 23:50:27 2009 UTC

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

Diff Legend

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