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.31 by elmex, Sun Apr 9 00:43:11 2006 UTC vs.
Revision 1.65 by root, Tue Apr 11 14:04:27 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11our @ACTIVE_WIDGETS; 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
12 16
13# class methods for events 17# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 20}
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
18 74
19sub new { 75sub new {
20 my $class = shift; 76 my $class = shift;
21 77
22 bless { @_ }, $class 78 bless {
23} 79 x => 0,
24 80 y => 0,
25sub activate { 81 z => 0,
26 push @ACTIVE_WIDGETS, $_[0]; 82 @_
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1]; 83 }, $class
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 84}
36 85
37sub move { 86sub move {
38 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 88 $self->{x} = $x;
44sub needs_redraw { 93sub needs_redraw {
45 0 94 0
46} 95}
47 96
48sub size_request { 97sub size_request {
98 require Carp;
49 die "size_request is abtract"; 99 Carp::confess "size_request is abtract";
100}
101
102sub size_allocate {
103 my ($self, $w, $h) = @_;
104
105 $self->{w} = $w;
106 $self->{h} = $h;
107}
108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50} 114}
51 115
52sub focus_in { 116sub focus_in {
53 my ($widget) = @_; 117 my ($self) = @_;
54 $FOCUS = $widget; 118
119 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
55} 122}
56 123
57sub focus_out { 124sub focus_out {
58 my ($widget) = @_; 125 my ($self) = @_;
59}
60 126
61sub key_down { 127 return unless $FOCUS == $self;
62 my ($widget, $sdlev) = @_;
63}
64 128
65sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
66 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
67} 131}
68 132
133sub mouse_motion { }
134sub button_up { }
69sub button_down { 135sub button_down { }
70 my ($widget, $sdlev) = @_; 136sub key_down { }
71} 137sub key_up { }
72 138
73sub button_up { 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
74 my ($widget, $sdlev) = @_; 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
75}
76
77sub w { $_[0]->{w} }
78sub h { $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82 144
83sub draw { 145sub draw {
84 my ($self) = @_; 146 my ($self) = @_;
85 147
86 glPushMatrix; 148 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 150 $self->_draw;
151 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
154 glBegin GL_QUADS;
155 glVertex 0 , 0;
156 glVertex $self->{w}, 0;
157 glVertex $self->{w}, $self->{h};
158 glVertex 0 , $self->{h};
159 glEnd;
160 glDisable GL_BLEND;
161 }
89 glPopMatrix; 162 glPopMatrix;
90} 163}
91 164
92sub _draw { 165sub _draw {
93 my ($widget) = @_; 166 my ($self) = @_;
167
168 warn "no draw defined for $self\n";
94} 169}
95 170
96sub bbox { 171sub bbox {
97 my ($widget) = @_; 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}
181
182sub find_widget {
183 my ($self, $x, $y) = @_;
184
185 return $self
186 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188
189 ()
190}
191
192sub del_parent { $_[0]->{parent} = undef }
193
194sub set_parent {
195 my ($self, $par) = @_;
196
197 $self->{parent} = $par;
198 Scalar::Util::weaken $self->{parent};
199}
200
201sub get_parent {
202 $_[0]->{parent}
203}
204
205sub update {
206 my ($self) = @_;
207
208 $self->{parent}->update
209 if $self->{parent};
98} 210}
99 211
100sub DESTROY { 212sub DESTROY {
101 my ($self) = @_; 213 my ($self) = @_;
102 214
103 $self->deactivate; 215 #$self->deactivate;
104} 216}
105 217
218#############################################################################
219
106package Crossfire::Client::Widget::Container; 220package CFClient::Widget::Container;
107 221
108our @ISA = Crossfire::Client::Widget::; 222our @ISA = CFClient::Widget::;
223
224sub new {
225 my ($class, %arg) = @_;
226
227 my $children = delete $arg{children} || [];
228
229 my $self = $class->SUPER::new (children => [], %arg);
230 $self->add ($_) for @$children;
231
232 $self
233}
234
235sub add {
236 my ($self, $chld, $expand) = @_;
237
238 $chld->{expand} = $expand;
239 $chld->set_parent ($self);
240
241 @{$self->{children}} =
242 sort { $a->{z} <=> $b->{z} }
243 @{$self->{children}}, $chld;
244
245 $self->size_allocate ($self->{w}, $self->{h})
246 if $self->{w}; #TODO: check for "realised state"
247}
248
249sub remove {
250 my ($self, $widget) = @_;
251
252 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
253
254 $self->size_allocate ($self->{w}, $self->{h});
255}
256
257sub find_widget {
258 my ($self, $x, $y) = @_;
259
260 $x -= $self->{x};
261 $y -= $self->{y};
262
263 my $res;
264
265 for (reverse @{ $self->{children} }) {
266 $res = $_->find_widget ($x, $y)
267 and return $res;
268 }
269
270 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
271}
272
273sub _draw {
274 my ($self) = @_;
275
276 $_->draw for @{$self->{children}};
277}
278
279#############################################################################
280
281package CFClient::Widget::Bin;
282
283our @ISA = CFClient::Widget::Container::;
284
285sub child { $_[0]->{children}[0] }
286
287sub size_request {
288 $_[0]{children}[0]->size_request if $_[0]{children}[0];
289}
290
291sub size_allocate {
292 my ($self, $w, $h) = @_;
293
294 $self->SUPER::size_allocate ($w, $h);
295 $self->{children}[0]->size_allocate ($w, $h)
296 if $self->{children}[0]
297}
298
299#############################################################################
300
301package CFClient::Widget::Window;
302
303our @ISA = CFClient::Widget::Bin::;
109 304
110use SDL::OpenGL; 305use SDL::OpenGL;
111 306
112sub add { $_[0]->{child} = $_[1] } 307sub new {
113sub get { $_[0]->{child} } 308 my ($class, %arg) = @_;
114 309
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 310 my $self = $class->SUPER::new (%arg);
311}
116 312
117sub _draw { die "Containers can't be drawn!" } 313sub update {
118
119package Crossfire::Client::Widget::Window;
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 314 my ($self) = @_;
127 $self->SUPER::add ($chld); 315
128 $self->render_chld; #TODO: Move this to the size_request event propably? 316 # we want to do this delayed...
317 $self->render_chld;
318 $self->SUPER::update;
129} 319}
130 320
131sub render_chld { 321sub render_chld {
132 my ($self) = @_; 322 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 323
136 $self->{texture} = 324 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 325 CFClient::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 326 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 327 );
140 $self->{texture}->upload;
141} 328}
142 329
143sub size_request { 330sub size_allocate {
144 my ($self) = @_; 331 my ($self, $w, $h) = @_;
145 my $chld = $self->get 332
146 or return (0, 0); 333 $self->{w} = $w;
147 $chld->size_request 334 $self->{h} = $h;
335
336 $self->child->size_allocate ($w, $h);
337
338 $self->render_chld;
148} 339}
149 340
150sub _draw { 341sub _draw {
151 my ($self) = @_; 342 my ($self) = @_;
152 343
153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 344 my ($w, $h) = ($self->w, $self->h);
154 345
155 my $tex = $self->{texture} 346 my $tex = $self->{texture}
156 or return; 347 or return;
157 348
158 glEnable GL_BLEND; 349 glEnable GL_BLEND;
159 glEnable GL_TEXTURE_2D; 350 glEnable GL_TEXTURE_2D;
160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
161 glBindTexture GL_TEXTURE_2D, $tex->{name};
162 352
163 glColor 1, 0, 1; 353 $tex->draw_quad (0, 0, $w, $h);
164
165 glBegin GL_QUADS;
166 glTexCoord 0, 0; glVertex 0, 0;
167 glTexCoord 0, 1; glVertex 0, $h;
168 glTexCoord 1, 1; glVertex $w, $h;
169 glTexCoord 1, 0; glVertex $w, 0;
170 glEnd;
171 354
172 glDisable GL_BLEND; 355 glDisable GL_BLEND;
173 glDisable GL_TEXTURE_2D; 356 glDisable GL_TEXTURE_2D;
174} 357}
175 358
359#############################################################################
360
176package Crossfire::Client::Widget::Frame; 361package CFClient::Widget::Frame;
177 362
178our @ISA = Crossfire::Client::Widget::Container::; 363our @ISA = CFClient::Widget::Bin::;
179 364
180use SDL::OpenGL; 365use SDL::OpenGL;
181 366
182sub size_request { 367sub size_request {
183 my ($self) = @_; 368 my ($self) = @_;
184 my $chld = $self->get 369 my $chld = $self->child
185 or return (0, 0); 370 or return (0, 0);
186 371
187 $chld->move (2, 2); 372 $chld->move (2, 2);
188 373
189 map { $_ + 4 } $chld->size_request; 374 map { $_ + 4 } $chld->size_request;
190} 375}
191 376
377sub size_allocate {
378 my ($self, $w, $h) = @_;
379
380 $self->{w} = $w;
381 $self->{h} = $h;
382
383 $self->child->size_allocate ($w - 4, $h - 4);
384 $self->child->move (2, 2);
385}
386
192sub _draw { 387sub _draw {
193 my ($self) = @_; 388 my ($self) = @_;
194 389
195 my $chld = $self->get; 390 my $chld = $self->child;
196 391
197 my ($w, $h) = $chld->size_request; 392 my ($w, $h) = $chld->size_request;
198 393
199 glBegin GL_QUADS; 394 glBegin GL_QUADS;
200 glColor 0, 0, 0; 395 glColor 0, 0, 0;
201 glTexCoord 0, 0; glVertex 0 , 0; 396 glVertex 0 , 0;
202 glTexCoord 0, 1; glVertex 0 , $h + 4; 397 glVertex 0 , $h + 4;
203 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 398 glVertex $w + 4 , $h + 4;
204 glTexCoord 1, 0; glVertex $w + 4 , 0; 399 glVertex $w + 4 , 0;
205 glEnd; 400 glEnd;
206 401
207 $chld->draw; 402 $chld->draw;
208} 403}
209 404
405#############################################################################
406
210package Crossfire::Client::Widget::FancyFrame; 407package CFClient::Widget::FancyFrame;
211 408
212our @ISA = Crossfire::Client::Widget::Frame::; 409our @ISA = CFClient::Widget::Bin::;
213 410
214use SDL::OpenGL; 411use SDL::OpenGL;
215 412
216#TODO: implement themed frame 413my @tex =
414 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
415 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
217 416
417sub size_request {
418 my ($self) = @_;
419
420 my ($w, $h) = $self->SUPER::size_request;
421
422 $h += $tex[1]->{height};
423 $h += $tex[4]->{height};
424 $w += $tex[2]->{width};
425 $w += $tex[3]->{width};
426
427 ($w, $h)
428}
429
430sub size_allocate {
431 my ($self, $w, $h) = @_;
432
433 $self->SUPER::size_allocate ($w, $h);
434
435 $h -= $tex[1]->{height};
436 $h -= $tex[4]->{height};
437 $w -= $tex[2]->{width};
438 $w -= $tex[3]->{width};
439
440 $h = $h < 0 ? 0 : $h;
441 $w = $w < 0 ? 0 : $w;
442
443 $self->child->size_allocate ($w, $h);
444 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
445}
446
447sub _draw {
448 my ($self) = @_;
449
450 my ($w, $h) = ($self->{w}, $self->{h});
451 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
452
453 glEnable GL_BLEND;
454 glEnable GL_TEXTURE_2D;
455 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
457
458 my $top = $tex[1];
459 $top->draw_quad (0, 0, $w, $top->{height});
460
461 my $left = $tex[3];
462 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
463
464 my $right = $tex[2];
465 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
466
467 my $bottom = $tex[4];
468 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
469
470 my $bg = $tex[0];
471 glBindTexture GL_TEXTURE_2D, $bg->{name};
472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
473 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
474 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
475
476 my $rep_x = $cw / $bg->{width};
477 my $rep_y = $ch / $bg->{height};
478
479 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
480
481 glDisable GL_BLEND;
482 glDisable GL_TEXTURE_2D;
483
484 $self->child->draw;
485
486}
487
488#############################################################################
489
218package Crossfire::Client::Widget::Table; 490package CFClient::Widget::Table;
219 491
220our @ISA = Crossfire::Client::Widget::Container::; 492our @ISA = CFClient::Widget::Bin::;
221 493
222use SDL::OpenGL; 494use SDL::OpenGL;
223 495
224sub add { 496sub add {
225 my ($self, $x, $y, $chld) = @_; 497 my ($self, $x, $y, $chld) = @_;
498 my $old_chld = $self->{children}[$y][$x];
499
226 $self->{childs}[$y][$x] = $chld; 500 $self->{children}[$y][$x] = $chld;
501 $chld->set_parent ($self);
502 $self->update;
227} 503}
228 504
229sub max_row_height { 505sub max_row_height {
230 my ($self, $row) = @_; 506 my ($self, $row) = @_;
231 507
232 my $hs = 0; 508 my $hs = 0;
233 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 509 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
234 my $c = $self->{childs}->[$row]->[$xi]; 510 my $c = $self->{children}->[$row]->[$xi];
235 if ($c) { 511 if ($c) {
236 my ($w, $h) = $c->size_request; 512 my ($w, $h) = $c->size_request;
237 if ($hs < $h) { $hs = $h } 513 if ($hs < $h) { $hs = $h }
238 } 514 }
239 } 515 }
242 518
243sub max_col_width { 519sub max_col_width {
244 my ($self, $col) = @_; 520 my ($self, $col) = @_;
245 521
246 my $ws = 0; 522 my $ws = 0;
247 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 523 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
248 my $c = ($self->{childs}->[$yi] || [])->[$col]; 524 my $c = ($self->{children}->[$yi] || [])->[$col];
249 if ($c) { 525 if ($c) {
250 my ($w, $h) = $c->size_request; 526 my ($w, $h) = $c->size_request;
251 if ($ws < $w) { $ws = $w } 527 if ($ws < $w) { $ws = $w }
252 } 528 }
253 } 529 }
257sub size_request { 533sub size_request {
258 my ($self) = @_; 534 my ($self) = @_;
259 535
260 my ($hs, $ws) = (0, 0); 536 my ($hs, $ws) = (0, 0);
261 537
262 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 538 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
263 $hs += $self->max_row_height ($yi); 539 $hs += $self->max_row_height ($yi);
264 } 540 }
265 541
266 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 542 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
267 my $wm = 0; 543 my $wm = 0;
268 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 544 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
269 $wm += $self->max_col_width ($xi) 545 $wm += $self->max_col_width ($xi)
270 } 546 }
271 if ($ws < $wm) { $ws = $wm } 547 if ($ws < $wm) { $ws = $wm }
272 } 548 }
273 549
276 552
277sub _draw { 553sub _draw {
278 my ($self) = @_; 554 my ($self) = @_;
279 555
280 my $y = 0; 556 my $y = 0;
281 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 557 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
282 my $x = 0; 558 my $x = 0;
283 559
284 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 560 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
285 561
286 my $c = $self->{childs}->[$yi]->[$xi]; 562 my $c = $self->{children}->[$yi]->[$xi];
287 if ($c) { 563 if ($c) {
288 $c->move ($x, $y, 0); #TODO: Move to size_request 564 $c->move ($x, $y, 0); #TODO: Move to size_request
289 $c->draw if $c; 565 $c->draw if $c;
290 } 566 }
291 567
294 570
295 $y += $self->max_row_height ($yi); 571 $y += $self->max_row_height ($yi);
296 } 572 }
297} 573}
298 574
575#############################################################################
576
299package Crossfire::Client::Widget::VBox; 577package CFClient::Widget::VBox;
300 578
301our @ISA = Crossfire::Client::Widget::Container::; 579our @ISA = CFClient::Widget::Container::;
302 580
303use SDL::OpenGL; 581use SDL::OpenGL;
304 582
305sub add {
306 my ($self, $chld) = @_;
307 push @{$self->{childs}}, $chld;
308}
309
310sub size_request { 583sub size_request {
311 my ($self) = @_; 584 my ($self) = @_;
312 585
313 my ($hs, $ws) = (0, 0); 586 my @alloc = map [$_->size_request], @{$self->{children}};
587
588 (
589 (List::Util::max map $_->[0], @alloc),
590 (List::Util::sum map $_->[1], @alloc),
591 )
592}
593
594sub size_allocate {
595 my ($self, $w, $h) = @_;
596
597 $self->w ($w);
598 $self->h ($h);
599
600 my $exp;
601 my @oth;
602 # find expand widget
314 for (@{$self->{childs} || []}) { 603 for (@{$self->{children}}) {
604 if ($_->{expand}) {
605 $exp = $_;
606 last;
607 }
608 push @oth, $_;
609 }
610
611 my ($ow, $oh);
612
613 # get sizes of other widgets
614 for (@oth) {
315 my ($w, $h) = $_->size_request; 615 my ($w, $h) = $_->size_request;
316 $hs += $h; 616 $oh += $h;
317 if ($ws < $w) { $ws = $w } 617 if ($ow < $w) { $ow = $w }
318 } 618 }
319 619
320 return ($ws, $hs); 620 my $y = 0;
321}
322
323sub _draw {
324 my ($self) = @_;
325
326 my ($x, $y);
327 for (@{$self->{childs} || []}) { 621 for (@{$self->{children}}) {
328 $_->move (0, $y, 0); #TODO: move to size_request 622 $_->move (0, $y);
329 $_->draw; 623
624 if ($_ == $exp) {
625 $_->size_allocate ($w, $h - $oh);
626 $y += $h - $oh;
627 } else {
330 my ($w, $h) = $_->size_request; 628 my ($cw, $h) = $_->size_request;
629 $_->size_allocate ($w, $h);
331 $y += $h; 630 $y += $h;
631 }
332 } 632 }
333} 633}
334 634
635#############################################################################
636
335package Crossfire::Client::Widget::Label; 637package CFClient::Widget::Label;
336 638
337our @ISA = Crossfire::Client::Widget::; 639our @ISA = CFClient::Widget::;
338 640
339use SDL::OpenGL; 641use SDL::OpenGL;
340 642
341sub new { 643sub new {
342 my ($class, $x, $y, $z, $height, $text) = @_; 644 my ($class, %arg) = @_;
343 645
344 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 646 # TODO: color, and make height, xyz etc. optional
647 my $self = $class->SUPER::new (
648 color => [1, 1, 1],
649 height => $::FONTSIZE,
650 text => "",
651 layout => new CFClient::Layout,
652 %arg
653 );
345 654
346 $self->set_text ($text); 655 $self->set_text ($self->{text});
347 656
348 $self 657 $self
349} 658}
350 659
351sub set_text { 660sub set_text {
352 my ($self, $text) = @_; 661 my ($self, $text) = @_;
353 662
354 $self->{text} = $text; 663 $self->{text} = $text;
664 $self->{layout}->set_markup ($text);
355 665
356 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 666 delete $self->{texture};
357} 667}
358 668
359sub get_text { 669sub get_text {
360 my ($self, $text) = @_; 670 my ($self, $text) = @_;
361 671
363} 673}
364 674
365sub size_request { 675sub size_request {
366 my ($self) = @_; 676 my ($self) = @_;
367 677
368 ( 678 $self->{layout}->set_width;
679 $self->{layout}->set_height ($self->{height});
680 $self->{layout}->size
681# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
682# (
369 $self->{texture}{width}, 683# $self->{texture}{width},
370 $self->{texture}{height}, 684# $self->{texture}{height},
371 ) 685# )
686# } else {
687# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
688#
689# ($w, $h)
690# }
691}
692
693sub size_allocate {
694 my ($self, $w, $h) = @_;
695
696 $self->SUPER::size_allocate ($w, $h);
697 delete $self->{texture};
372} 698}
373 699
374sub _draw { 700sub _draw {
375 my ($self) = @_; 701 my ($self) = @_;
376 702
377 my $tex = $self->{texture}; 703 my $tex = $self->{texture} ||= do {
704 $self->{layout}->set_width ($self->{w});
705 new_from_layout CFClient::Texture $self->{layout};
706 };
378 707
379 glEnable GL_BLEND; 708 glEnable GL_BLEND;
380 glEnable GL_TEXTURE_2D; 709 glEnable GL_TEXTURE_2D;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
383 glBindTexture GL_TEXTURE_2D, $tex->{name};
384 712
385 glColor 1, 1, 1, 0.8; 713 glColor @{$self->{color}};
386 714
387 glBegin GL_QUADS; 715 $tex->draw_quad (0, 0);
388 glTexCoord 0, 0; glVertex 0 , 0;
389 glTexCoord 0, 1; glVertex 0 , $tex->{height};
390 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
391 glTexCoord 1, 0; glVertex $tex->{width}, 0;
392 glEnd;
393 716
394 glDisable GL_BLEND; 717 glDisable GL_BLEND;
395 glDisable GL_TEXTURE_2D; 718 glDisable GL_TEXTURE_2D;
396} 719}
397 720
721#############################################################################
722
398package Crossfire::Client::Widget::TextEntry; 723package CFClient::Widget::Entry;
399 724
400our @ISA = Crossfire::Client::Widget::Label::; 725our @ISA = CFClient::Widget::Label::;
401 726
402use SDL; 727use SDL;
403use SDL::OpenGL; 728use SDL::OpenGL;
404 729
405sub key_down { 730sub key_down {
406 my ($self, $ev) = @_; 731 my ($self, $ev) = @_;
407 732
408 my $mod = $ev->key_mod; 733 my $mod = $ev->key_mod;
409 my $sym = $ev->key_sym; 734 my $sym = $ev->key_sym;
410 735
411 $ev->set_unicode (1);
412 my $uni = $ev->key_unicode; 736 my $uni = $ev->key_unicode;
413 737
414 my $text = $self->get_text; 738 my $text = $self->get_text;
415 739
416 if ($sym == SDLK_BACKSPACE) { 740 if ($sym == SDLK_BACKSPACE) {
417 substr $text, -1, 1, ''; 741 substr $text, -1, 1, '';
418
419 } elsif ($uni) { 742 } elsif ($uni) {
420 $text .= chr $uni; 743 $text .= chr $uni;
421 } 744 }
745
422 $self->set_text ($text); 746 $self->set_text ($text);
423} 747}
424 748
749sub button_down {
750 my ($self, $ev) = @_;
425 751
426# XXX: TextView isn't neccessary with pango multiline text rendering 752 $self->focus_in;
427package Crossfire::Client::Widget::TextView; 753}
428 754
429use strict; 755sub mouse_motion {
430
431our @ISA = qw/Crossfire::Client::Widget/;
432
433use SDL::OpenGL;
434use SDL::OpenGL::Constants;
435
436sub new {
437 my ($class, $text, $h) = @_; 756 my ($self, $ev, $x, $y) = @_;
438 my $self = $class->SUPER::new (); 757 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
439
440 $self->{txt_height} = $h;
441 @{$self->{lines}} = split /\r?\n/, $text;
442
443 for (split /\r?\n/, $text) {
444 $self->add_line ($_);
445 }
446 $self
447} 758}
448 759
449#sub render_lines { 760sub _draw {
450# my ($self) = @_; 761 my ($self) = @_;
451# 762
452# $self->{txt_lines} = []; 763 if ($FOCUS == $self) {
453# 764 glColor 1, 1, 1;
454# for (@{$self->{lines}}) { 765 } else {
455# push @{$self->{txt_lines}}, 766 glColor 0.7, 0.7, 0.7;
456# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
457# } 767 }
458#}
459
460sub add_line {
461 my ($self, $line) = @_;
462 push @{$self->{lines}}, $line;
463
464 push @{$self->{txt_lines}},
465 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
466}
467
468sub size_request {
469 my ($self) = @_;
470
471 my $w = 0;
472 my $h = 0;
473
474 for (@{$self->{txt_lines}}) {
475 if ($w < $_->{width}) { $w = $_->{width} }
476 $h += $_->{height};
477 }
478
479 return ($w, $h);
480}
481
482sub draw_line {
483 my ($self, $tex, $y) = @_;
484
485 glBindTexture GL_TEXTURE_2D, $tex->{name};
486
487 glColor 1, 0, 1;
488 768
489 glBegin GL_QUADS; 769 glBegin GL_QUADS;
490 glTexCoord 0, 0; glVertex 0 , $y; 770 glVertex 0 , 0;
491 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height}; 771 glVertex 0 , $self->{h} - 1;
492 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height}; 772 glVertex $self->{w} - 1, $self->{h} - 1;
493 glTexCoord 1, 0; glVertex $tex->{width}, $y; 773 glVertex $self->{w} - 1, 0;
494 glEnd; 774 glEnd;
495}
496 775
497sub _draw { 776 $self->SUPER::_draw;
498 my ($self) = @_;
499
500 glEnable GL_BLEND;
501 glEnable GL_TEXTURE_2D;
502 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
503
504 my $l = 0;
505 for (@{$self->{txt_lines}}) {
506 $self->draw_line ($_, $l);
507 $l += $_->{height};
508 }
509
510 glDisable GL_BLEND;
511 glDisable GL_TEXTURE_2D;
512} 777}
513 778
779#############################################################################
780
514package Crossfire::Client::Widget::MapWidget; 781package CFClient::Widget::MapWidget;
515 782
516use strict; 783use strict;
517 784
518use List::Util qw(min max); 785use List::Util qw(min max);
519 786
520use SDL; 787use SDL;
521use SDL::OpenGL; 788use SDL::OpenGL;
522use SDL::OpenGL::Constants; 789use SDL::OpenGL::Constants;
523 790
524our @ISA = Crossfire::Client::Widget::; 791our @ISA = CFClient::Widget::;
792
793sub new {
794 my $class = shift;
795
796 $class->SUPER::new (
797 z => -1,
798 list => (glGenLists 1),
799 @_
800 )
801}
525 802
526sub key_down { 803sub key_down {
527 print "MAPKEYDOWN\n"; 804 print "MAPKEYDOWN\n";
528} 805}
529 806
530sub key_up { 807sub key_up {
531} 808}
532 809
810sub size_request {
811 (
812 1 + int $::WIDTH / 32,
813 1 + int $::HEIGHT / 32,
814 )
815}
816
817sub update {
818 my ($self) = @_;
819
820 $self->{need_update} = 1;
821}
822
533sub _draw { 823sub _draw {
534 my ($self) = @_; 824 my ($self) = @_;
535 825
826 if (delete $self->{need_update}) {
827 glNewList $self->{list}, GL_COMPILE;
828
536 my $mx = $::CONN->{mapx}; 829 my $mx = $::CONN->{mapx};
537 my $my = $::CONN->{mapy}; 830 my $my = $::CONN->{mapy};
538 831
539 my $map = $::CONN->{map}; 832 my $map = $::CONN->{map};
540 833
541 my ($xofs, $yofs); 834 my ($xofs, $yofs);
542 835
543 my $sw = 1 + int $::WIDTH / 32; 836 my $sw = 1 + int $::WIDTH / 32;
544 my $sh = 1 + int $::HEIGHT / 32; 837 my $sh = 1 + int $::HEIGHT / 32;
545 838
546 if ($::CONN->{mapw} > $sw) { 839 if ($::CONN->{mapw} > $sw) {
547 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 840 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
548 } else { 841 } else {
549 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 842 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
550 } 843 }
551 844
552 if ($::CONN->{maph} > $sh) { 845 if ($::CONN->{maph} > $sh) {
553 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 846 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
554 } else { 847 } else {
555 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 848 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
556 } 849 }
557 850
558 glEnable GL_TEXTURE_2D; 851 glEnable GL_TEXTURE_2D;
559 glEnable GL_BLEND; 852 glEnable GL_BLEND;
560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
561 854
855 my $sw4 = ($sw + 3) & ~3;
856 my $darkness = "\x00" x ($sw4 * $sh);
857
562 for my $x (0 .. $sw - 1) { 858 for my $x (0 .. $sw - 1) {
859 my $row = $map->[$x + $xofs];
563 for my $y (0 .. $sh - 1) { 860 for my $y (0 .. $sh - 1) {
564 861
565 my $cell = $map->[$x + $xofs][$y + $yofs] 862 my $cell = $row->[$y + $yofs]
566 or next; 863 or next;
567 864
568 my $darkness = $cell->[0] * (1 / 255); 865 my $dark = $cell->[0];
569 if ($darkness < 0) { 866 if ($dark < 0) {
570 glColor 0.3, 0.3, 0.3; 867 substr $darkness, $y * $sw4 + $x, 1, chr 224;
571 } else { 868 } else {
572 glColor $darkness, $darkness, $darkness; 869 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
573 } 870 }
574 871
575 for my $num (grep $_, @$cell[1,2,3]) { 872 for my $num (grep $_, @$cell[1,2,3]) {
576 my $tex = $::CONN->{face}[$num]{texture} || next; 873 my $tex = $::CONN->{face}[$num]{texture} || next;
577 874
578 glBindTexture GL_TEXTURE_2D, $tex->{name};
579
580 my $w = $tex->{width}; 875 my $w = $tex->{width};
581 my $h = $tex->{height}; 876 my $h = $tex->{height};
582 877
583 my $px = ($x + 1) * 32 - $w; 878 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
584 my $py = ($y + 1) * 32 - $h;
585
586 glBegin GL_QUADS;
587 glTexCoord 0, 0; glVertex $px , $py;
588 glTexCoord 0, 1; glVertex $px , $py + $h;
589 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
590 glTexCoord 1, 0; glVertex $px + $w, $py;
591 glEnd; 879 }
592 } 880 }
593 } 881 }
882
883# if (1) { # higher quality darkness
884# $lighting =~ s/(.)/$1$1$1/gs;
885# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
886#
887# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
888#
889# $lighting = $pb->get_pixels;
890# $lighting =~ s/(.)../$1/gs;
594 } 891# }
595 892
893 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
895
896 $darkness = new CFClient::Texture
897 width => $sw4,
898 height => $sh,
899 data => $darkness,
900 internalformat => GL_ALPHA,
901 format => GL_ALPHA;
902
903 glColor 0.45, 0.45, 0.45, 1;
904 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
905
596 glDisable GL_TEXTURE_2D; 906 glDisable GL_TEXTURE_2D;
597 glDisable GL_BLEND; 907 glDisable GL_BLEND;
908
909 glEndList;
910 }
911
912 glCallList $self->{list};
598} 913}
599 914
600my %DIR = ( 915my %DIR = (
601 SDLK_KP8, [1, "north"], 916 SDLK_KP8, [1, "north"],
602 SDLK_KP9, [2, "northeast"], 917 SDLK_KP9, [2, "northeast"],
646 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 961 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
647 $::CONN->send ("command run_stop"); 962 $::CONN->send ("command run_stop");
648 } 963 }
649} 964}
650 965
6511; 966#############################################################################
652 967
968package CFClient::Widget::Animator;
969
970use SDL::OpenGL;
971
972our @ISA = CFClient::Widget::Bin::;
973
974sub moveto {
975 my ($self, $x, $y) = @_;
976
977 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
978 $self->{speed} = 0.001;
979 $self->{time} = 1;
980
981 ::animation_start $self;
982}
983
984sub animate {
985 my ($self, $interval) = @_;
986
987 $self->{time} -= $interval * $self->{speed};
988 if ($self->{time} <= 0) {
989 $self->{time} = 0;
990 ::animation_stop $self;
991 }
992
993 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
994
995 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
996 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
997}
998
999sub _draw {
1000 my ($self) = @_;
1001
1002 glPushMatrix;
1003 glRotate $self->{time} * 1000, 0, 1, 0;
1004 $self->{children}[0]->draw;
1005 glPopMatrix;
1006}
1007
1008#############################################################################
1009
1010package CFClient::Widget::Toplevel;
1011
1012our @ISA = CFClient::Widget::Container::;
1013
1014sub size_request {
1015 ($::WIDTH, $::HEIGHT)
1016}
1017
1018sub size_allocate {
1019 my ($self, $w, $h) = @_;
1020
1021 $self->SUPER::size_allocate ($w, $h);
1022
1023 $_->size_allocate ($_->size_request)
1024 for @{$self->{children}};
1025}
1026
1027sub translate {
1028 my ($self, $x, $y) = @_;
1029
1030 ($x, $y)
1031}
1032
1033sub update {
1034 my ($self) = @_;
1035
1036 $self->size_allocate ($self->size_request);
1037 ::refresh ();
1038}
1039
1040sub add {
1041 my ($self, $widget) = @_;
1042
1043 $self->SUPER::add ($widget);
1044
1045 $widget->size_allocate ($widget->size_request);
1046}
1047
1048sub draw {
1049 my ($self) = @_;
1050
1051 $self->_draw;
1052}
1053
1054#############################################################################
1055
1056package CFClient::Widget;
1057
1058$TOPLEVEL = new CFClient::Widget::Toplevel;
1059
10601
1061

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines