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

Diff Legend

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