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.66 by root, Tue Apr 11 14:36:02 2006 UTC vs.
Revision 1.85 by elmex, Wed Apr 12 12:55:56 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { 84 my $self = bless {
79 x => 0, 85 x => 0,
80 y => 0, 86 y => 0,
81 z => 0, 87 z => 0,
88 w => -1,
89 h => -1,
82 @_ 90 @_
83 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
84} 100}
85 101
86sub move { 102sub move {
87 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
88 $self->{x} = $x; 104 $self->{x} = $x;
… …
97sub size_request { 113sub size_request {
98 require Carp; 114 require Carp;
99 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
100} 116}
101 117
102sub size_allocate { 118sub _size_allocate {
103 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
104 125
105 $self->{w} = $w; 126 $self->{w} = $w;
106 $self->{h} = $h; 127 $self->{h} = $h;
107}
108 128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
109# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
110sub translate { 139sub translate {
111 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
112 141
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114} 143}
115 144
116sub focus_in { 145sub focus_in {
117 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
118 149
119 my $focus = $FOCUS; $FOCUS = $self; 150 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus; 151 $focus->update if $focus;
121 $FOCUS->update; 152 $FOCUS->update;
122} 153}
… …
130 $focus->update if $focus; #? 161 $focus->update if $focus; #?
131} 162}
132 163
133sub mouse_motion { } 164sub mouse_motion { }
134sub button_up { } 165sub button_up { }
135sub button_down { }
136sub key_down { } 166sub key_down { }
137sub key_up { } 167sub key_up { }
168
169sub button_down {
170 my ($self, $ev, $x, $y) = @_;
171
172 $self->focus_in;
173}
138 174
139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 175sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 176sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 177sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 178sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 179sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144 180
145sub draw { 181sub draw {
146 my ($self) = @_; 182 my ($self) = @_;
147 183
184 return unless $self->{h} && $self->{w};
185
148 glPushMatrix; 186 glPushMatrix;
149 glTranslate $self->{x}, $self->{y}, 0; 187 glTranslate $self->{x}, $self->{y}, 0;
150 $self->_draw; 188 $self->_draw;
189 glPopMatrix;
190
151 if ($self == $HOVER) { 191 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4; 192 my ($x, $y) = @$self{qw(x y)};
193
194 glColor 0, 0, 1, 0.2;
153 glEnable GL_BLEND; 195 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 197 glBegin GL_QUADS;
155 glVertex 0 , 0; 198 glVertex $x , $y;
156 glVertex $self->{w}, 0; 199 glVertex $x + $self->{w}, $y;
157 glVertex $self->{w}, $self->{h}; 200 glVertex $x + $self->{w}, $y + $self->{h};
158 glVertex 0 , $self->{h}; 201 glVertex $x , $y + $self->{h};
159 glEnd; 202 glEnd;
160 glDisable GL_BLEND; 203 glDisable GL_BLEND;
161 } 204 }
162 glPopMatrix;
163} 205}
164 206
165sub _draw { 207sub _draw {
166 my ($self) = @_; 208 my ($self) = @_;
167 209
168 warn "no draw defined for $self\n"; 210 warn "no draw defined for $self\n";
169}
170
171sub bbox {
172 my ($self) = @_;
173 my ($w, $h) = $self->size_request;
174 (
175 $self->{x},
176 $self->{y},
177 $self->{x} = $w,
178 $self->{y} = $h
179 )
180} 211}
181 212
182sub find_widget { 213sub find_widget {
183 my ($self, $x, $y) = @_; 214 my ($self, $x, $y) = @_;
184 215
… …
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188 219
189 () 220 ()
190} 221}
191 222
192sub del_parent { $_[0]->{parent} = undef }
193
194sub set_parent { 223sub set_parent {
195 my ($self, $par) = @_; 224 my ($self, $par) = @_;
196 225
197 $self->{parent} = $par; 226 $self->{parent} = $par;
198 Scalar::Util::weaken $self->{parent}; 227 Scalar::Util::weaken $self->{parent};
… …
207 236
208 $self->{parent}->update 237 $self->{parent}->update
209 if $self->{parent}; 238 if $self->{parent};
210} 239}
211 240
241sub connect {
242 my ($self, $signal, $cb) = @_;
243
244 push @{ $self->{cb}{$signal} }, $cb;
245}
246
247sub emit {
248 my ($self, $signal, @args) = @_;
249
250 $_->($self, @args)
251 for @{$self->{cb}{$signal} || []};
252}
253
212sub DESTROY { 254sub DESTROY {
213 my ($self) = @_; 255 my ($self) = @_;
214 256
215 #$self->deactivate; 257 #$self->deactivate;
216} 258}
217 259
218############################################################################# 260#############################################################################
219 261
262package CFClient::UI::DrawBG;
263
264our @ISA = CFClient::UI::Base::;
265
266use strict;
267use SDL::OpenGL;
268
269sub new {
270 my $class = shift;
271
272 # range [value, low, high, page]
273
274 $class->SUPER::new (
275 bg => [0, 0, 0, 0.2],
276 active_bg => [1, 1, 1, 0.5],
277 @_
278 )
279}
280
281sub _draw {
282 my ($self) = @_;
283
284 my ($w, $h) = @$self{qw(w h)};
285
286 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
289
290 glBegin GL_QUADS;
291 glVertex 0 , 0;
292 glVertex 0 , $h;
293 glVertex $w, $h;
294 glVertex $w, 0;
295 glEnd;
296
297 glDisable GL_BLEND;
298}
299
300#############################################################################
301
220package CFClient::Widget::Empty; 302package CFClient::UI::Empty;
221 303
222our @ISA = CFClient::Widget::; 304our @ISA = CFClient::UI::Base::;
223 305
224sub size_request { 306sub size_request {
225 (0, 0) 307 (0, 0)
226} 308}
227 309
228sub draw { 310sub draw { }
229}
230 311
231############################################################################# 312#############################################################################
232 313
233package CFClient::Widget::Container; 314package CFClient::UI::Container;
234 315
235our @ISA = CFClient::Widget::; 316our @ISA = CFClient::UI::Base::;
236 317
237sub new { 318sub new {
238 my ($class, %arg) = @_; 319 my ($class, %arg) = @_;
239 320
240 my $children = delete $arg{children} || []; 321 my $children = delete $arg{children} || [];
… …
244 325
245 $self 326 $self
246} 327}
247 328
248sub add { 329sub add {
249 my ($self, $chld, $expand) = @_; 330 my ($self, $chld) = @_;
250 331
251 $chld->{expand} = $expand;
252 $chld->set_parent ($self); 332 $chld->set_parent ($self);
253 333
254 $self->{children} = [ 334 $self->{children} = [
255 sort { $a->{z} <=> $b->{z} } 335 sort { $a->{z} <=> $b->{z} }
256 @{$self->{children}}, $chld 336 @{$self->{children}}, $chld
257 ]; 337 ];
258 338
259 $self->size_allocate ($self->{w}, $self->{h}) 339 $self->{w} = $self->{h} = -1;
260 if $self->{w}; #TODO: check for "realised state" 340 $self->update;
261} 341}
262 342
263sub remove { 343sub remove {
264 my ($self, $widget) = @_; 344 my ($self, $widget) = @_;
265 345
266 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
267 347
268 $self->size_allocate ($self->{w}, $self->{h}); 348 $self->size_allocate (0, 0, $self->{w}, $self->{h});
269} 349}
270 350
271sub find_widget { 351sub find_widget {
272 my ($self, $x, $y) = @_; 352 my ($self, $x, $y) = @_;
273 353
… …
290 $_->draw for @{$self->{children}}; 370 $_->draw for @{$self->{children}};
291} 371}
292 372
293############################################################################# 373#############################################################################
294 374
295package CFClient::Widget::Bin; 375package CFClient::UI::Bin;
296 376
297our @ISA = CFClient::Widget::Container::; 377our @ISA = CFClient::UI::Container::;
298 378
299sub new { 379sub new {
300 my ($class, %arg) = @_; 380 my ($class, %arg) = @_;
301 381
302 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 382 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
303 383
304 $class->SUPER::new (children => [$child], %arg) 384 $class->SUPER::new (children => [$child], %arg)
305} 385}
306 386
307sub add { 387sub add {
… …
315sub remove { 395sub remove {
316 my ($self, $widget) = @_; 396 my ($self, $widget) = @_;
317 397
318 $self->SUPER::remove ($widget); 398 $self->SUPER::remove ($widget);
319 399
320 $self->{children} = [new CFClient::Widget::Empty] 400 $self->{children} = [new CFClient::UI::Empty]
321 unless @{$self->{children}}; 401 unless @{$self->{children}};
322} 402}
323 403
324sub child { $_[0]->{children}[0] } 404sub child { $_[0]->{children}[0] }
325 405
326sub size_request { 406sub size_request {
327 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 407 $_[0]{children}[0]->size_request
328} 408}
329 409
330sub size_allocate { 410sub size_allocate {
331 my ($self, $w, $h) = @_; 411 my ($self, $x, $y, $w, $h) = @_;
332 412
333 $self->SUPER::size_allocate ($w, $h); 413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
334 $self->{children}[0]->size_allocate ($w, $h) 415 $self->{children}[0]->size_allocate (0, 0, $w, $h);
335 if $self->{children}[0]
336} 416}
337 417
338############################################################################# 418#############################################################################
339 419
340package CFClient::Widget::Window; 420package CFClient::UI::Window;
341 421
342our @ISA = CFClient::Widget::Bin::; 422our @ISA = CFClient::UI::Bin::;
343 423
344use SDL::OpenGL; 424use SDL::OpenGL;
345 425
346sub new { 426sub new {
347 my ($class, %arg) = @_; 427 my ($class, %arg) = @_;
… …
365 $self->{w}, $self->{h}, sub { $self->child->draw } 445 $self->{w}, $self->{h}, sub { $self->child->draw }
366 ); 446 );
367} 447}
368 448
369sub size_allocate { 449sub size_allocate {
370 my ($self, $w, $h) = @_; 450 my ($self, $x, $y, $w, $h) = @_;
371 451
372 $self->{w} = $w; 452 $self->_size_allocate ($x, $y, $w, $h) or return;
373 $self->{h} = $h;
374 453
375 $self->child->size_allocate ($w, $h); 454 $self->child->size_allocate (0, 0, $w, $h);
376 455
377 $self->render_chld; 456 $self->render_chld;
378} 457}
379 458
380sub _draw { 459sub _draw {
… …
384 463
385 my $tex = $self->{texture} 464 my $tex = $self->{texture}
386 or return; 465 or return;
387 466
388 glEnable GL_BLEND; 467 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
389 glEnable GL_TEXTURE_2D; 469 glEnable GL_TEXTURE_2D;
390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
391 471
392 $tex->draw_quad (0, 0, $w, $h); 472 $tex->draw_quad (0, 0, $w, $h);
393 473
… …
395 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
396} 476}
397 477
398############################################################################# 478#############################################################################
399 479
400package CFClient::Widget::Frame; 480package CFClient::UI::Frame;
401 481
402our @ISA = CFClient::Widget::Bin::; 482our @ISA = CFClient::UI::Bin::;
403 483
404use SDL::OpenGL; 484use SDL::OpenGL;
405 485
406sub size_request { 486sub size_request {
407 my ($self) = @_; 487 my ($self) = @_;
… …
412 492
413 map { $_ + 4 } $chld->size_request; 493 map { $_ + 4 } $chld->size_request;
414} 494}
415 495
416sub size_allocate { 496sub size_allocate {
417 my ($self, $w, $h) = @_; 497 my ($self, $x, $y, $w, $h) = @_;
418 498
419 $self->{w} = $w; 499 $self->_size_allocate ($x, $y, $w, $h) or return;
420 $self->{h} = $h;
421 500
422 $self->child->size_allocate ($w - 4, $h - 4); 501 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
423 $self->child->move (2, 2);
424} 502}
425 503
426sub _draw { 504sub _draw {
427 my ($self) = @_; 505 my ($self) = @_;
428 506
… …
441 $chld->draw; 519 $chld->draw;
442} 520}
443 521
444############################################################################# 522#############################################################################
445 523
446package CFClient::Widget::FancyFrame; 524package CFClient::UI::FancyFrame;
447 525
448our @ISA = CFClient::Widget::Bin::; 526our @ISA = CFClient::UI::Bin::;
449 527
450use SDL::OpenGL; 528use SDL::OpenGL;
451 529
452my @tex = 530my @tex =
453 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
454 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
455 533
456sub size_request { 534sub size_request {
457 my ($self) = @_; 535 my ($self) = @_;
458 536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
459 my ($w, $h) = $self->SUPER::size_request; 539 my ($w, $h) = $self->SUPER::size_request;
460 540
461 $h += $tex[1]->{height}; 541 $h += $tex[1]->{h};
462 $h += $tex[4]->{height}; 542 $h += $tex[4]->{h};
463 $w += $tex[2]->{width}; 543 $w += $tex[2]->{w};
464 $w += $tex[3]->{width}; 544 $w += $tex[3]->{w};
465 545
466 ($w, $h) 546 ($w, $h)
467} 547}
468 548
469sub size_allocate { 549sub size_allocate {
470 my ($self, $w, $h) = @_; 550 my ($self, $x, $y, $w, $h) = @_;
471 551
472 $self->SUPER::size_allocate ($w, $h); 552 $self->_size_allocate ($x, $y, $w, $h) or return;
473 553
474 $h -= $tex[1]->{height}; 554 $h -= $tex[1]{h};
475 $h -= $tex[4]->{height}; 555 $h -= $tex[4]{h};
476 $w -= $tex[2]->{width}; 556 $w -= $tex[2]{w};
477 $w -= $tex[3]->{width}; 557 $w -= $tex[3]{w};
478 558
479 $h = $h < 0 ? 0 : $h; 559 $h = $h < 0 ? 0 : $h;
480 $w = $w < 0 ? 0 : $w; 560 $w = $w < 0 ? 0 : $w;
481 561
482 my $child = $self->child; 562 my $child = $self->child;
483 563
484 $child->size_allocate ($w, $h); 564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
485 $child->move ($tex[3]->{width}, $tex[1]->{height}); 565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
486} 613}
487 614
488sub _draw { 615sub _draw {
489 my ($self) = @_; 616 my ($self) = @_;
490 617
491 my ($w, $h) = ($self->{w}, $self->{h}); 618 my ($w, $h) = ($self->{w}, $self->{h});
492 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
493 620
494 glEnable GL_BLEND; 621 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
495 glEnable GL_TEXTURE_2D; 623 glEnable GL_TEXTURE_2D;
496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
497 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
498 625
499 my $top = $tex[1]; 626 my $top = $tex[1];
500 $top->draw_quad (0, 0, $w, $top->{height}); 627 $top->draw_quad (0, 0, $w, $top->{h});
501 628
502 my $left = $tex[3]; 629 my $left = $tex[3];
503 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
504 631
505 my $right = $tex[2]; 632 my $right = $tex[2];
506 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); 633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
507 634
508 my $bottom = $tex[4]; 635 my $bottom = $tex[4];
509 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); 636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
510 637
511 my $bg = $tex[0]; 638 my $bg = $tex[0];
639
512 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
515 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
516 642
517 my $rep_x = $cw / $bg->{width}; 643 my $rep_x = $cw / $bg->{w};
518 my $rep_y = $ch / $bg->{height}; 644 my $rep_y = $ch / $bg->{h};
519 645
520 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
521 647
648 glDisable GL_TEXTURE_2D;
522 glDisable GL_BLEND; 649 glDisable GL_BLEND;
523 glDisable GL_TEXTURE_2D;
524 650
525 $self->child->draw; 651 $self->child->draw;
526 652
527} 653}
528 654
529############################################################################# 655#############################################################################
530 656
531package CFClient::Widget::Table; 657package CFClient::UI::Table;
532 658
533our @ISA = CFClient::Widget::Bin::; 659our @ISA = CFClient::UI::Base::;
660
661use List::Util qw(max sum);
534 662
535use SDL::OpenGL; 663use SDL::OpenGL;
664
665sub new {
666 my $class = shift;
667
668 $class->SUPER::new (
669 col_expand => [],
670 @_
671 )
672}
536 673
537sub add { 674sub add {
538 my ($self, $x, $y, $chld) = @_; 675 my ($self, $x, $y, $chld) = @_;
539 my $old_chld = $self->{children}[$y][$x];
540 676
541 $self->{children}[$y][$x] = $chld; 677 $self->{children}[$y][$x] = $chld;
542 $chld->set_parent ($self); 678 $chld->set_parent ($self);
679
680 $self->{w} = $self->{h} = -1;
543 $self->update; 681 $self->update;
544} 682}
545 683
546sub max_row_height { 684sub get_wh {
547 my ($self, $row) = @_; 685 my ($self) = @_;
548 686
549 my $hs = 0; 687 my (@w, @h);
550 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 688
689 for my $y (0 .. $#{$self->{children}}) {
551 my $c = $self->{children}->[$row]->[$xi]; 690 my $row = $self->{children}[$y]
552 if ($c) { 691 or next;
692
693 for my $x (0 .. $#$row) {
694 my $widget = $row->[$x]
695 or next;
553 my ($w, $h) = $c->size_request; 696 my ($w, $h) = $widget->size_request;
554 if ($hs < $h) { $hs = $h } 697
698 $w[$x] = max $w[$x], $w;
699 $h[$y] = max $h[$y], $h;
555 } 700 }
556 } 701 }
557 return $hs;
558}
559 702
560sub max_col_width { 703 (\@w, \@h)
704}
705
706sub size_request {
561 my ($self, $col) = @_; 707 my ($self) = @_;
562 708
709 my ($ws, $hs) = $self->get_wh;
710
711 (
712 (sum @$ws),
713 (sum @$hs),
714 )
715}
716
717sub size_allocate {
718 my ($self, $x, $y, $w, $h) = @_;
719
720 $self->_size_allocate ($x, $y, $w, $h) or return;
721
722 my ($ws, $hs) = $self->get_wh;
723
724 my $req_w = sum @$ws;
725 my $req_h = sum @$hs;
726
727 # TODO: nicer code && do row_expand
728 my @col_expand = @{$self->{col_expand}};
729 @col_expand = (1) x @$ws unless @col_expand;
730 my $col_expand = (sum @col_expand) || 1;
731
732 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
735
736 my $y;
737
738 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r]
740 or next;
741
563 my $ws = 0; 742 my $x = 0;
564 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 743 my $row_h = $hs->[$r];
565 my $c = ($self->{children}->[$yi] || [])->[$col]; 744
566 if ($c) { 745 for my $c (0 .. $#$row) {
567 my ($w, $h) = $c->size_request; 746 my $col_w = $ws->[$c];
568 if ($ws < $w) { $ws = $w } 747
748 if (my $widget = $row->[$c]) {
749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
751
752 $x += $col_w;
569 } 753 }
754
755 $y += $row_h;
570 } 756 }
571 return $ws; 757
572} 758}
759
760sub find_widget {
761 my ($self, $x, $y) = @_;
762
763 $x -= $self->{x};
764 $y -= $self->{y};
765
766 my $res;
767
768 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
769 $res = $_->find_widget ($x, $y)
770 and return $res;
771 }
772
773 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
774}
775
776sub _draw {
777 my ($self) = @_;
778
779 for (grep $_, @{$self->{children}}) {
780 $_->draw for grep $_, @$_;
781 }
782}
783
784#############################################################################
785
786package CFClient::UI::HBox;
787
788# TODO: wrap into common Box base class
789
790our @ISA = CFClient::UI::Container::;
573 791
574sub size_request { 792sub size_request {
575 my ($self) = @_; 793 my ($self) = @_;
576 794
795 my @alloc = map [$_->size_request], @{$self->{children}};
796
797 (
798 (List::Util::sum map $_->[0], @alloc),
799 (List::Util::max map $_->[1], @alloc),
800 )
801}
802
803sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_;
805
806 $self->_size_allocate ($x, $y, $w, $h) or return;
807
808 return unless $self->{w};
809
577 my ($hs, $ws) = (0, 0); 810 ($h, $w) = ($w, $h);
578 811
579 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 812 my $children = $self->{children};
580 $hs += $self->max_row_height ($yi);
581 }
582 813
583 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 814 my @h = map +($_->size_request)[0], @$children;
584 my $wm = 0; 815
585 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 816 my $req_h = List::Util::sum @h;
586 $wm += $self->max_col_width ($xi) 817
818 if ($req_h > $h) {
819 # ah well, not enough space
820 $_ *= $h / $req_h for @h;
821 } else {
822 my $exp = List::Util::sum map $_->{expand}, @$children;
823 $exp ||= 1;
824
825 for (0 .. $#$children) {
826 my $child = $children->[$_];
827
828 my $alloc_h = $h[$_];
829 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830 $h[$_] = $alloc_h;
587 } 831 }
588 if ($ws < $wm) { $ws = $wm }
589 } 832 }
590
591 return ($ws, $hs);
592}
593
594sub _draw {
595 my ($self) = @_;
596 833
597 my $y = 0; 834 my $y = 0;
598 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 835 for (0 .. $#$children) {
836 my $child = $children->[$_];
599 my $x = 0; 837 my $h = $h[$_];
838 $child->size_allocate ($y, 0, $h, $w);
600 839
601 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 840 $y += $h;
602
603 my $c = $self->{children}->[$yi]->[$xi];
604 if ($c) {
605 $c->move ($x, $y, 0); #TODO: Move to size_request
606 $c->draw if $c;
607 }
608
609 $x += $self->max_col_width ($xi);
610 }
611
612 $y += $self->max_row_height ($yi);
613 } 841 }
614} 842}
615 843
616############################################################################# 844#############################################################################
617 845
618package CFClient::Widget::VBox; 846package CFClient::UI::VBox;
619 847
848# TODO: wrap into common Box base class
849
620our @ISA = CFClient::Widget::Container::; 850our @ISA = CFClient::UI::Container::;
621
622use SDL::OpenGL;
623 851
624sub size_request { 852sub size_request {
625 my ($self) = @_; 853 my ($self) = @_;
626 854
627 my @alloc = map [$_->size_request], @{$self->{children}}; 855 my @alloc = map [$_->size_request], @{$self->{children}};
… …
631 (List::Util::sum map $_->[1], @alloc), 859 (List::Util::sum map $_->[1], @alloc),
632 ) 860 )
633} 861}
634 862
635sub size_allocate { 863sub size_allocate {
636 my ($self, $w, $h) = @_; 864 my ($self, $x, $y, $w, $h) = @_;
637 865
638 $self->w ($w); 866 $self->_size_allocate ($x, $y, $w, $h) or return;
639 $self->h ($h);
640 867
641 my $exp; 868 return unless $self->{h};
642 my @oth; 869
643 # find expand widget 870 my $children = $self->{children};
644 for (@{$self->{children}}) { 871
645 if ($_->{expand}) { 872 my @h = map +($_->size_request)[1], @$children;
873
874 my $req_h = List::Util::sum @h;
875
876 if ($req_h > $h) {
877 # ah well, not enough space
878 $_ *= $h / $req_h for @h;
879 } else {
880 my $exp = List::Util::sum map $_->{expand}, @$children;
646 $exp = $_; 881 $exp ||= 1;
647 last; 882
883 for (0 .. $#$children) {
884 my $child = $children->[$_];
885
886 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
648 } 887 }
649 push @oth, $_;
650 }
651
652 my ($ow, $oh);
653
654 # get sizes of other widgets
655 for (@oth) {
656 my ($w, $h) = $_->size_request;
657 $oh += $h;
658 if ($ow < $w) { $ow = $w }
659 } 888 }
660 889
661 my $y = 0; 890 my $y = 0;
662 for (@{$self->{children}}) { 891 for (0 .. $#$children) {
663 $_->move (0, $y); 892 my $child = $children->[$_];
664 893 my $h = $h[$_];
665 if ($_ == $exp) {
666 $_->size_allocate ($w, $h - $oh);
667 $y += $h - $oh;
668 } else {
669 my ($cw, $h) = $_->size_request;
670 $_->size_allocate ($w, $h); 894 $child->size_allocate (0, $y, $w, $h);
895
671 $y += $h; 896 $y += $h;
672 }
673 } 897 }
674} 898}
675 899
676############################################################################# 900#############################################################################
677 901
678package CFClient::Widget::Label; 902package CFClient::UI::Label;
679 903
680our @ISA = CFClient::Widget::; 904our @ISA = CFClient::UI::Base::;
681 905
682use SDL::OpenGL; 906use SDL::OpenGL;
683 907
684sub new { 908sub new {
685 my ($class, %arg) = @_; 909 my ($class, %arg) = @_;
686 910
687 # TODO: color, and make height, xyz etc. optional
688 my $self = $class->SUPER::new ( 911 my $self = $class->SUPER::new (
689 color => [1, 1, 1], 912 fg => [1, 1, 1],
690 height => $::FONTSIZE, 913 height => $::FONTSIZE,
691 text => "", 914 text => "",
915 align => -1,
916 padding => 2,
692 layout => new CFClient::Layout, 917 layout => new CFClient::Layout,
693 %arg 918 %arg
694 ); 919 );
695 920
696 $self->set_text ($self->{text}); 921 $self->set_text ($self->{text});
697 922
698 $self 923 $self
699} 924}
700 925
926sub escape_text {
927 local $_ = $_[1];
928
929 s/&/&amp;/g;
930 s/>/&gt;/g;
931 s/</&lt;/g;
932
933 $_[1]
934}
935
701sub set_text { 936sub set_text {
702 my ($self, $text) = @_; 937 my ($self, $text) = @_;
703 938
704 $self->{text} = $text; 939 $self->{text} = $text;
705 $self->{layout}->set_markup ($text); 940 $self->{layout}->set_markup ($text);
706 941
707 delete $self->{texture}; 942 delete $self->{texture};
943# $self->{w} = $self->{h} = -1;
944 $self->update;
708} 945}
709 946
710sub get_text { 947sub get_text {
711 my ($self, $text) = @_; 948 my ($self, $text) = @_;
712 949
… …
716sub size_request { 953sub size_request {
717 my ($self) = @_; 954 my ($self) = @_;
718 955
719 $self->{layout}->set_width; 956 $self->{layout}->set_width;
720 $self->{layout}->set_height ($self->{height}); 957 $self->{layout}->set_height ($self->{height});
721 $self->{layout}->size 958 my ($w, $h) = $self->{layout}->size;
722# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 959
723# ( 960 (
724# $self->{texture}{width}, 961 $w + $self->{padding} * 2,
725# $self->{texture}{height}, 962 $h + $self->{padding} * 2,
726# ) 963 )
727# } else {
728# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
729#
730# ($w, $h)
731# }
732} 964}
733 965
734sub size_allocate { 966sub size_allocate {
735 my ($self, $w, $h) = @_; 967 my ($self, $x, $y, $w, $h) = @_;
736 968
737 $self->SUPER::size_allocate ($w, $h); 969 $self->_size_allocate ($x, $y, $w, $h) or return;
970
738 delete $self->{texture}; 971 delete $self->{texture};
972}
973
974sub update {
975 my ($self) = @_;
976
977 delete $self->{texture};
978 $self->SUPER::update;
739} 979}
740 980
741sub _draw { 981sub _draw {
742 my ($self) = @_; 982 my ($self) = @_;
743 983
744 my $tex = $self->{texture} ||= do { 984 my $tex = $self->{texture} ||= do {
745 $self->{layout}->set_width ($self->{w}); 985 $self->{layout}->set_width ($self->{w});
986 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
746 new_from_layout CFClient::Texture $self->{layout}; 987 new_from_layout CFClient::Texture $self->{layout}
747 }; 988 };
989
990 glEnable GL_BLEND;
991 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
992 glEnable GL_TEXTURE_2D;
993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
994
995 glColor @{$self->{fg}};
996
997 my $x =
998 $self->{align} < 0 ? $self->{padding}
999 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1000 : ($self->{w} - $tex->{w}) * 0.5;
1001
1002 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
1003 $tex->draw_quad (0, 0);
1004
1005 glDisable GL_TEXTURE_2D;
1006 glDisable GL_BLEND;
1007}
1008
1009#############################################################################
1010
1011package CFClient::UI::Entry;
1012
1013our @ISA = CFClient::UI::Label::;
1014
1015use SDL;
1016use SDL::OpenGL;
1017
1018sub new {
1019 my $class = shift;
1020
1021 $class->SUPER::new (
1022 fg => [1, 1, 1],
1023 bg => [0, 0, 0, 0.2],
1024 active_bg => [1, 1, 1, 0.5],
1025 active_fg => [0, 0, 0],
1026 @_
1027 )
1028}
1029
1030sub _set_text {
1031 my ($self, $text) = @_;
1032
1033 $self->{last_activity} = $::NOW;
1034
1035 $self->{text} = $text;
1036 $self->{layout}->set_width ($self->{w});
1037 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1038
1039 $text =~ s/./*/g if $self->{hidden};
1040
1041 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1042
1043 $text = substr $text, 0, $self->{cursor};
1044 utf8::encode $text;
1045
1046 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1047}
1048
1049sub size_request {
1050 my ($self) = @_;
1051
1052 my ($w, $h) = $self->SUPER::size_request;
1053
1054 ($w + 1, $h) # add 1 for cursor
1055}
1056
1057sub size_allocate {
1058 my ($self, $x, $y, $w, $h) = @_;
1059
1060 $self->SUPER::size_allocate ($x, $y, $w, $h);
1061
1062 $self->_set_text ($self->{text});
1063}
1064
1065sub set_text {
1066 my ($self, $text) = @_;
1067
1068 $self->{cursor} = length $text;
1069 $self->_set_text ($text);
1070 $self->update;
1071}
1072
1073sub key_down {
1074 my ($self, $ev) = @_;
1075
1076 my $mod = $ev->key_mod;
1077 my $sym = $ev->key_sym;
1078
1079 my $uni = $ev->key_unicode;
1080
1081 my $text = $self->get_text;
1082
1083 if ($sym == SDLK_BACKSPACE) {
1084 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1085 } elsif ($sym == SDLK_DELETE) {
1086 substr $text, $self->{cursor}, 1, "";
1087 } elsif ($sym == SDLK_LEFT) {
1088 --$self->{cursor} if $self->{cursor};
1089 } elsif ($sym == SDLK_RIGHT) {
1090 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1091 } elsif ($sym == SDLK_HOME) {
1092 $self->{cursor} = 0;
1093 } elsif ($sym == SDLK_END) {
1094 $self->{cursor} = length $text;
1095 } elsif ($uni) {
1096 substr $text, $self->{cursor}++, 0, chr $uni;
1097 }
1098
1099 $self->_set_text ($text);
1100 $self->update;
1101}
1102
1103sub focus_in {
1104 my ($self) = @_;
1105
1106 $self->{last_activity} = $::NOW;
1107
1108 $self->SUPER::focus_in;
1109}
1110
1111sub button_down {
1112 my ($self, $ev, $x, $y) = @_;
1113
1114 $self->SUPER::button_down ($ev, $x, $y);
1115
1116 my $idx = $self->{layout}->xy_to_index ($x, $y);
1117
1118 # byte-index to char-index
1119 my $text = $self->{text};
1120 utf8::encode $text;
1121 $self->{cursor} = length substr $text, 0, $idx;
1122
1123 $self->_set_text ($self->{text});
1124 $self->update;
1125}
1126
1127sub mouse_motion {
1128 my ($self, $ev, $x, $y) = @_;
1129# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1130}
1131
1132sub _draw {
1133 my ($self) = @_;
1134
1135 local $self->{fg} = $self->{fg};
1136
1137 if ($FOCUS == $self) {
1138 glColor @{$self->{active_bg}};
1139 $self->{fg} = $self->{active_fg};
1140 } else {
1141 glColor @{$self->{bg}};
1142 }
1143
1144 glEnable GL_BLEND;
1145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1146 glBegin GL_QUADS;
1147 glVertex 0 , 0;
1148 glVertex 0 , $self->{h};
1149 glVertex $self->{w}, $self->{h};
1150 glVertex $self->{w}, 0;
1151 glEnd;
1152 glDisable GL_BLEND;
1153
1154 $self->SUPER::_draw;
1155
1156 #TODO: force update every cursor change :(
1157 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1158 glColor @{$self->{fg}};
1159 glBegin GL_LINES;
1160 glVertex $self->{cur_x}, $self->{cur_y};
1161 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1162 glEnd;
1163 }
1164}
1165
1166#############################################################################
1167
1168package CFClient::UI::Button;
1169
1170our @ISA = CFClient::UI::Label::;
1171
1172use SDL;
1173use SDL::OpenGL;
1174
1175my @tex =
1176 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1177 qw(b1_button_active.png);
1178
1179sub new {
1180 my $class = shift;
1181
1182 $class->SUPER::new (
1183 padding => 4,
1184 fg => [1, 1, 1],
1185 bg => [1, 1, 1, 0.2],
1186 active_fg => [1, 1, 0],
1187# active_bg => [0, 0, 0, 0.5],
1188# border_fg => [1, 1, 0],
1189 @_
1190 )
1191}
1192
1193sub button_up {
1194 my ($self, $ev, $x, $y) = @_;
1195
1196 if ($x >= 0 && $x < $self->{w}
1197 && $y >= 0 && $y < $self->{h}) {
1198 $self->emit ("activate");
1199 }
1200}
1201
1202sub _draw {
1203 my ($self) = @_;
1204
1205 local $self->{fg} = $self->{fg};
1206 my $tex = $tex[0];
748 1207
749 glEnable GL_BLEND; 1208 glEnable GL_BLEND;
750 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211
1212 if ($GRAB == $self) {
1213 $self->{fg} = $self->{active_fg};
1214 }
1215
1216 glBindTexture GL_TEXTURE_2D, $tex->{name};
752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1217 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
753 1218
754 glColor @{$self->{color}}; 1219 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
755 1220
756 $tex->draw_quad (0, 0); 1221 glDisable GL_TEXTURE_2D;
757
758 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
759 glDisable GL_TEXTURE_2D;
760}
761 1223
762############################################################################# 1224 $self->SUPER::_draw;
1225}
763 1226
1227#############################################################################
1228
1229package CFClient::UI::Slider;
1230
1231use strict;
1232
1233use SDL::OpenGL;
1234
1235our @ISA = CFClient::UI::DrawBG::;
1236
1237sub new {
1238 my $class = shift;
1239
1240 # range [value, low, high, page]
1241
1242 my $self = $class->SUPER::new (
1243 fg => [1, 1, 1],
1244 active_fg => [0, 0, 0],
1245 range => [0, 0, 100, 10],
1246 req_w => 40,
1247 req_h => 10,
1248 vertical => 0,
1249 @_
1250 );
1251
1252 $self
1253}
1254
1255sub size_request {
1256 my ($self) = @_;
1257
1258 my $w = $self->{req_w};
1259 my $h = $self->{req_h};
1260
1261 $self->{vertical} ? ($h, $w) : ($w, $h)
1262}
1263
1264sub button_down {
1265 my ($self, $ev, $x, $y) = @_;
1266
1267 $self->SUPER::button_down ($ev, $x, $y);
1268 $self->mouse_motion ($ev, $x, $y);
1269}
1270
1271sub mouse_motion {
1272 my ($self, $ev, $x, $y) = @_;
1273
1274 if ($GRAB == $self) {
1275 my ($value, $lo, $hi, $page) = @{$self->{range}};
1276
1277 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1278
1279 $x = $x * ($hi - $lo) / $w + $lo;
1280 $x = $lo if $x < $lo;
1281 $x = $hi - $page if $x > $hi - $page;
1282 $self->{range}[0] = $x;
1283
1284 $self->emit (changed => $x);
1285 $self->update;
1286 }
1287}
1288
1289sub _draw {
1290 my ($self) = @_;
1291
1292 $self->SUPER::_draw ();
1293
1294 my ($w, $h) = @$self{qw(w h)};
1295
1296 if ($self->{vertical}) {
1297 # draw a vertical slider like a rotated horizontal slider
1298
1299 glRotate 90, 0, 0, 1;
1300 glTranslate 0, -$self->{w}, 0;
1301
1302 ($w, $h) = ($h, $w);
1303 }
1304
1305 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1306 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1307
1308 my ($value, $lo, $hi, $page) = @{$self->{range}};
1309
1310 $page = int $page * $w / ($hi - $lo);
1311 $value = int +($value - $lo) * $w / ($hi - $lo);
1312
1313 $w -= $page;
1314 $page &= ~1;
1315 glTranslate $page * 0.5, 0, 0;
1316 $page ||= 2;
1317
1318 glColor @$fg;
1319 glBegin GL_LINES;
1320 glVertex 0, 0; glVertex 0, $h;
1321 glVertex $w - 1, 0; glVertex $w - 1, $h;
1322 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1323 glEnd;
1324
1325 my $knob_a = $value - $page * 0.5;
1326 my $knob_b = $value + $page * 0.5;
1327
1328 glBegin GL_QUADS;
1329 glColor @$fg;
1330 glVertex $knob_a, 0;
1331 glVertex $knob_a, $h;
1332 glVertex $knob_b, $h;
1333 glVertex $knob_b, 0;
1334
1335 if ($knob_a < $knob_b - 2) {
1336 glColor @$bg;
1337 glVertex $knob_a + 1, 1;
1338 glVertex $knob_a + 1, $h - 1;
1339 glVertex $knob_b - 1, $h - 1;
1340 glVertex $knob_b - 1, 1;
1341 }
1342 glEnd;
1343}
1344
1345#############################################################################
1346
764package CFClient::Widget::Entry; 1347package CFClient::UI::MapWidget;
765 1348
766our @ISA = CFClient::Widget::Label::; 1349use strict;
1350
1351use List::Util qw(min max);
767 1352
768use SDL; 1353use SDL;
769use SDL::OpenGL; 1354use SDL::OpenGL;
770 1355
771sub key_down {
772 my ($self, $ev) = @_;
773
774 my $mod = $ev->key_mod;
775 my $sym = $ev->key_sym;
776
777 my $uni = $ev->key_unicode;
778
779 my $text = $self->get_text;
780
781 if ($sym == SDLK_BACKSPACE) {
782 substr $text, -1, 1, '';
783 } elsif ($uni) {
784 $text .= chr $uni;
785 }
786
787 $self->set_text ($text);
788}
789
790sub button_down {
791 my ($self, $ev) = @_;
792
793 $self->focus_in;
794}
795
796sub mouse_motion {
797 my ($self, $ev, $x, $y) = @_;
798 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
799}
800
801sub _draw {
802 my ($self) = @_;
803
804 if ($FOCUS == $self) {
805 glColor 1, 1, 1;
806 } else {
807 glColor 0.7, 0.7, 0.7;
808 }
809
810 glBegin GL_QUADS;
811 glVertex 0 , 0;
812 glVertex 0 , $self->{h} - 1;
813 glVertex $self->{w} - 1, $self->{h} - 1;
814 glVertex $self->{w} - 1, 0;
815 glEnd;
816
817 $self->SUPER::_draw;
818}
819
820#############################################################################
821
822package CFClient::Widget::MapWidget;
823
824use strict;
825
826use List::Util qw(min max);
827
828use SDL;
829use SDL::OpenGL;
830use SDL::OpenGL::Constants;
831
832our @ISA = CFClient::Widget::; 1356our @ISA = CFClient::UI::Base::;
833 1357
834sub new { 1358sub new {
835 my $class = shift; 1359 my $class = shift;
836 1360
837 $class->SUPER::new ( 1361 $class->SUPER::new (
… …
848sub key_up { 1372sub key_up {
849} 1373}
850 1374
851sub size_request { 1375sub size_request {
852 ( 1376 (
853 1 + int $::WIDTH / 32, 1377 1 + 32 * int $::WIDTH / 32,
854 1 + int $::HEIGHT / 32, 1378 1 + 32 * int $::HEIGHT / 32,
855 ) 1379 )
856} 1380}
857 1381
858sub update { 1382sub update {
859 my ($self) = @_; 1383 my ($self) = @_;
860 1384
861 $self->{need_update} = 1; 1385 $self->{need_update} = 1;
1386 $self->SUPER::update;
862} 1387}
863 1388
864sub _draw { 1389sub draw {
865 my ($self) = @_; 1390 my ($self) = @_;
866 1391
867 if (delete $self->{need_update}) { 1392 if (delete $self->{need_update}) {
868 glNewList $self->{list}, GL_COMPILE; 1393 glNewList $self->{list}, GL_COMPILE;
869 1394
… …
889 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1414 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
890 } 1415 }
891 1416
892 glEnable GL_TEXTURE_2D; 1417 glEnable GL_TEXTURE_2D;
893 glEnable GL_BLEND; 1418 glEnable GL_BLEND;
1419 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
895 1421
896 my $sw4 = ($sw + 3) & ~3; 1422 my $sw4 = ($sw + 3) & ~3;
897 my $darkness = "\x00" x ($sw4 * $sh); 1423 my $darkness = "\x00" x ($sw4 * $sh);
898 1424
… …
911 } 1437 }
912 1438
913 for my $num (grep $_, @$cell[1,2,3]) { 1439 for my $num (grep $_, @$cell[1,2,3]) {
914 my $tex = $::CONN->{face}[$num]{texture} || next; 1440 my $tex = $::CONN->{face}[$num]{texture} || next;
915 1441
916 my $w = $tex->{width}; 1442 my ($w, $h) = @$tex{qw(w h)};
917 my $h = $tex->{height};
918 1443
919 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1444 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
920 } 1445 }
921 } 1446 }
922 } 1447 }
… …
929# 1454#
930# $lighting = $pb->get_pixels; 1455# $lighting = $pb->get_pixels;
931# $lighting =~ s/(.)../$1/gs; 1456# $lighting =~ s/(.)../$1/gs;
932# } 1457# }
933 1458
934 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
936 1460
937 $darkness = new CFClient::Texture 1461 $darkness = new CFClient::Texture
938 width => $sw4, 1462 w => $sw4,
939 height => $sh, 1463 h => $sh,
940 data => $darkness, 1464 data => $darkness,
941 internalformat => GL_ALPHA, 1465 internalformat => GL_ALPHA,
942 format => GL_ALPHA; 1466 format => GL_ALPHA;
943 1467
944 glColor 0.45, 0.45, 0.45, 1; 1468 glColor 0.45, 0.45, 0.45, 1;
… …
975 my $mod = $ev->key_mod; 1499 my $mod = $ev->key_mod;
976 my $sym = $ev->key_sym; 1500 my $sym = $ev->key_sym;
977 1501
978 if ($sym == SDLK_KP5) { 1502 if ($sym == SDLK_KP5) {
979 $::CONN->send ("command stay fire"); 1503 $::CONN->send ("command stay fire");
1504 } elsif ($sym == SDLK_a) {
1505 $::CONN->send ("command apply");
980 } elsif (exists $DIR{$sym}) { 1506 } elsif (exists $DIR{$sym}) {
981 if ($mod & KMOD_SHIFT) { 1507 if ($mod & KMOD_SHIFT) {
982 $self->{shft}++; 1508 $self->{shft}++;
983 $::CONN->send ("command fire $DIR{$sym}[0]"); 1509 $::CONN->send ("command fire $DIR{$sym}[0]");
984 } elsif ($mod & KMOD_CTRL) { 1510 } elsif ($mod & KMOD_CTRL) {
… …
1004 } 1530 }
1005} 1531}
1006 1532
1007############################################################################# 1533#############################################################################
1008 1534
1009package CFClient::Widget::Animator; 1535package CFClient::UI::Animator;
1010 1536
1011use SDL::OpenGL; 1537use SDL::OpenGL;
1012 1538
1013our @ISA = CFClient::Widget::Bin::; 1539our @ISA = CFClient::UI::Bin::;
1014 1540
1015sub moveto { 1541sub moveto {
1016 my ($self, $x, $y) = @_; 1542 my ($self, $x, $y) = @_;
1017 1543
1018 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1544 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1046 glPopMatrix; 1572 glPopMatrix;
1047} 1573}
1048 1574
1049############################################################################# 1575#############################################################################
1050 1576
1051package CFClient::Widget::Toplevel; 1577package CFClient::UI::Toplevel;
1052 1578
1053our @ISA = CFClient::Widget::Container::; 1579our @ISA = CFClient::UI::Container::;
1054 1580
1055sub size_request { 1581sub size_request {
1056 ($::WIDTH, $::HEIGHT) 1582 ($::WIDTH, $::HEIGHT)
1057} 1583}
1058 1584
1059sub size_allocate { 1585sub size_allocate {
1060 my ($self, $w, $h) = @_; 1586 my ($self, $x, $y, $w, $h) = @_;
1061 1587
1062 $self->SUPER::size_allocate ($w, $h); 1588 $self->_size_allocate ($x, $y, $w, $h);
1063 1589
1064 $_->size_allocate ($_->size_request) 1590 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1065 for @{$self->{children}}; 1591 for @{$self->{children}};
1066} 1592}
1067 1593
1068sub translate { 1594sub translate {
1069 my ($self, $x, $y) = @_; 1595 my ($self, $x, $y) = @_;
… …
1072} 1598}
1073 1599
1074sub update { 1600sub update {
1075 my ($self) = @_; 1601 my ($self) = @_;
1076 1602
1077 $self->size_allocate ($self->size_request); 1603 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1078 ::refresh (); 1604 ::refresh ();
1079} 1605}
1080 1606
1081sub add { 1607sub add {
1082 my ($self, $widget) = @_; 1608 my ($self, $widget) = @_;
1083 1609
1084 $self->SUPER::add ($widget); 1610 $self->SUPER::add ($widget);
1085 1611
1086 $widget->size_allocate ($widget->size_request); 1612 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1087} 1613}
1088 1614
1089sub draw { 1615sub draw {
1090 my ($self) = @_; 1616 my ($self) = @_;
1091 1617
1092 $self->_draw; 1618 $self->_draw;
1093} 1619}
1094 1620
1095############################################################################# 1621#############################################################################
1096 1622
1097package CFClient::Widget; 1623package CFClient::UI;
1098 1624
1099$TOPLEVEL = new CFClient::Widget::Toplevel; 1625$TOPLEVEL = new CFClient::UI::Toplevel;
1100 1626
11011 16271
1102 1628

Diff Legend

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