← Back to branch summary

~ubuntu-branches/ubuntu/trusty/compiz/trusty

« back to all changes in this revision

Viewing changes to gtk/window-decorator/metacity.c

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2013-08-22 06:58:07 UTC
  • mto: This revision was merged to the branch mainline in revision 3352.
  • Revision ID: package-import@ubuntu.com-20130822065807-17nlzez0d30y09so
Tags: upstream-0.9.10+13.10.20130822
Import upstream version 0.9.10+13.10.20130822

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/window-decorator/metacity.c
74
74
        if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
75
75
        {
76
76
            frame_win_extents.bottom += mutter_draggable_border_width;
 
77
            frame_win_extents.top += mutter_draggable_border_width;
77
78
            frame_max_win_extents.bottom += mutter_draggable_border_width;
 
79
            frame_max_win_extents.top += mutter_draggable_border_width;
78
80
        }
79
81
    }
80
82
 
202
204
 
203
205
    if (top_left_radius)
204
206
    {
205
 
        for (i = 0; i < top_left_radius; i++)
 
207
        for (i = 0; i < top_left_radius; ++i)
206
208
        {
207
209
            w = radius_to_width (top_left_radius, i);
208
210
 
217
219
 
218
220
    if (top_right_radius)
219
221
    {
220
 
        for (i = 0; i < top_right_radius; i++)
 
222
        for (i = 0; i < top_right_radius; ++i)
221
223
        {
222
224
            w = radius_to_width (top_right_radius, i);
223
225
 
268
270
 
269
271
    if (bottom_left_radius)
270
272
    {
271
 
        for (i = 0; i < bottom_left_radius; i++)
 
273
        for (i = 0; i < bottom_left_radius; ++i)
272
274
        {
273
275
            w = radius_to_width (bottom_left_radius, i);
274
276
 
283
285
 
284
286
    if (bottom_right_radius)
285
287
    {
286
 
        for (i = 0; i < bottom_right_radius; i++)
 
288
        for (i = 0; i < bottom_right_radius; ++i)
287
289
        {
288
290
            w = radius_to_width (bottom_right_radius, i);
289
291
 
481
483
 
482
484
        button_layout->left_buttons[0] = META_BUTTON_FUNCTION_MENU;
483
485
 
484
 
        for (i = 1; i < MAX_BUTTONS_PER_CORNER; i++)
 
486
        for (i = 1; i < MAX_BUTTONS_PER_CORNER; ++i)
485
487
            button_layout->left_buttons[i] = META_BUTTON_FUNCTION_LAST;
486
488
 
487
489
        button_layout->right_buttons[0] = META_BUTTON_FUNCTION_MINIMIZE;
488
490
        button_layout->right_buttons[1] = META_BUTTON_FUNCTION_MAXIMIZE;
489
491
        button_layout->right_buttons[2] = META_BUTTON_FUNCTION_CLOSE;
490
492
 
491
 
        for (i = 3; i < MAX_BUTTONS_PER_CORNER; i++)
 
493
        for (i = 3; i < MAX_BUTTONS_PER_CORNER; ++i)
492
494
            button_layout->right_buttons[i] = META_BUTTON_FUNCTION_LAST;
493
495
    }
494
496
 
649
651
    if ((d->prop_xid || !d->buffer_pixmap) && !d->frame_window)
650
652
        draw_shadow_background (d, cr, d->shadow, d->context);
651
653
 
652
 
    for (i = 0; i < META_BUTTON_TYPE_LAST; i++)
 
654
    for (i = 0; i < META_BUTTON_TYPE_LAST; ++i)
653
655
        button_states[i] = meta_button_state_for_button_type (d, i);
654
656
 
655
657
    frame_style = meta_theme_get_frame_style (theme,
951
953
            d->context->left_space - d->context->right_space;
952
954
    min_x = width;
953
955
 
954
 
    for (i = 0; i < 3; i++)
 
956
    for (i = 0; i < 3; ++i)
955
957
    {
956
958
        static guint button_actions[3] = {
957
959
            WNCK_WINDOW_ACTION_CLOSE,
1106
1108
        *x += d->frame->win_extents.left + 4;
1107
1109
        *y += d->frame->win_extents.top + 2;
1108
1110
    }
1109
 
    else if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
 
1111
    
 
1112
    if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
1110
1113
    {
1111
1114
        *x += mutter_draggable_border_width;
1112
1115
    }
1113
1116
 
 
1117
    if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
 
1118
    {
 
1119
        *y += mutter_draggable_border_width;
 
1120
    }
 
1121
 
1114
1122
    return TRUE;
1115
1123
}
1116
1124
 
1239
1247
{
1240
1248
    int i;
1241
1249
 
1242
 
    for (i = 0; i < MAX_BUTTONS_PER_CORNER; i++)
 
1250
    for (i = 0; i < MAX_BUTTONS_PER_CORNER; ++i)
1243
1251
        if (button_layout->left_buttons[i] == function)
1244
1252
            return TRUE;
1245
1253
 
1246
 
    for (i = 0; i < MAX_BUTTONS_PER_CORNER; i++)
 
1254
    for (i = 0; i < MAX_BUTTONS_PER_CORNER; ++i)
1247
1255
        if (button_layout->right_buttons[i] == function)
1248
1256
            return TRUE;
1249
1257
 
1305
1313
            if (!d->frame_window)
1306
1314
            {
1307
1315
                *x += mutter_draggable_border_width;
 
1316
                *y += mutter_draggable_border_width;
1308
1317
                *w += mutter_draggable_border_width;
1309
1318
                *h += mutter_draggable_border_width;
1310
1319
            }
1322
1331
            if (!d->frame_window)
1323
1332
            {
1324
1333
                *x -= mutter_draggable_border_width;
 
1334
                *y += mutter_draggable_border_width;
1325
1335
                *h += mutter_draggable_border_width;
1326
1336
                *w += mutter_draggable_border_width * 2;
1327
1337
            }
1341
1351
 
1342
1352
            if (!d->frame_window)
1343
1353
            {
 
1354
                *y += mutter_draggable_border_width;
1344
1355
                *w += mutter_draggable_border_width;
1345
1356
                *h += mutter_draggable_border_width;
1346
1357
            }
1362
1373
           if (!d->frame_window)
1363
1374
           {
1364
1375
               *x += mutter_draggable_border_width;
 
1376
               *y += mutter_draggable_border_width;           
1365
1377
               *w += mutter_draggable_border_width;
1366
1378
               *h += mutter_draggable_border_width;
1367
1379
           }
1377
1389
            if (!d->frame_window)
1378
1390
            {
1379
1391
                *x += mutter_draggable_border_width;
 
1392
                *y += mutter_draggable_border_width;
1380
1393
            }
1381
1394
 
1382
1395
            break;
1392
1405
 
1393
1406
            if (!d->frame_window)
1394
1407
            {
 
1408
                *y += mutter_draggable_border_width;
1395
1409
                *h += mutter_draggable_border_width;
1396
1410
                *w += mutter_draggable_border_width;
1397
1411
            }
1418
1432
            {
1419
1433
                *x += mutter_draggable_border_width;
1420
1434
                *w += mutter_draggable_border_width;
 
1435
                *h += mutter_draggable_border_width;
1421
1436
            }
1422
1437
            break;
1423
1438
        case 1: /* top */
1433
1448
            {
1434
1449
                *x -= mutter_draggable_border_width;
1435
1450
                *w += mutter_draggable_border_width * 2;
 
1451
                *h += mutter_draggable_border_width;
1436
1452
            }
1437
1453
 
1438
1454
            break;
1449
1465
            *h = fgeom.top_height + RESIZE_EXTENDS;
1450
1466
 
1451
1467
            if (!d->frame_window)
 
1468
            {
1452
1469
                *w += mutter_draggable_border_width;
 
1470
                *h += mutter_draggable_border_width;
 
1471
            }
1453
1472
 
1454
1473
            break;
1455
1474
        }
1534
1553
{
1535
1554
    int i;
1536
1555
 
1537
 
    for (i = 0; i < MAX_BUTTONS_PER_CORNER; i++)
 
1556
    for (i = 0; i < MAX_BUTTONS_PER_CORNER; ++i)
1538
1557
    {
1539
1558
        layout->left_buttons[i] = META_BUTTON_FUNCTION_LAST;
1540
1559
        layout->right_buttons[i] = META_BUTTON_FUNCTION_LAST;
1563
1582
        int      b;
1564
1583
        gboolean used[META_BUTTON_FUNCTION_LAST];
1565
1584
 
1566
 
        for (i = 0; i < META_BUTTON_FUNCTION_LAST; i++)
 
1585
        for (i = 0; i < META_BUTTON_FUNCTION_LAST; ++i)
1567
1586
           used[i] = FALSE;
1568
1587
 
1569
1588
        buttons = g_strsplit (sides[0], ",", -1);
1601
1620
                           "button name \"%s\"\n", program_name, buttons[b]);
1602
1621
               }
1603
1622
            }
1604
 
            b++;
 
1623
            ++b;
1605
1624
        }
1606
1625
 
1607
1626
        new_layout.left_buttons[i] = META_BUTTON_FUNCTION_LAST;
1610
1629
 
1611
1630
        if (sides[1] != NULL)
1612
1631
        {
1613
 
            for (i = 0; i < META_BUTTON_FUNCTION_LAST; i++)
 
1632
            for (i = 0; i < META_BUTTON_FUNCTION_LAST; ++i)
1614
1633
                used[i] = FALSE;
1615
1634
 
1616
1635
            buttons = g_strsplit (sides[1], ",", -1);
1647
1666
                                program_name, buttons[b]);
1648
1667
                   }
1649
1668
               }
1650
 
               b++;
 
1669
               ++b;
1651
1670
            }
1652
1671
            new_layout.right_buttons[i] = META_BUTTON_FUNCTION_LAST;
1653
1672
 
1667
1686
 
1668
1687
        i = 0;
1669
1688
        while (new_layout.left_buttons[i] != META_BUTTON_FUNCTION_LAST)
1670
 
            i++;
 
1689
            ++i;
1671
1690
 
1672
 
        for (j = 0; j < i; j++)
 
1691
        for (j = 0; j < i; ++j)
1673
1692
        {
1674
1693
            rtl_layout.right_buttons[j] = new_layout.left_buttons[i - j - 1];
1675
1694
#ifdef HAVE_METACITY_2_23_2
1684
1703
 
1685
1704
        i = 0;
1686
1705
        while (new_layout.right_buttons[i] != META_BUTTON_FUNCTION_LAST)
1687
 
            i++;
 
1706
            ++i;
1688
1707
 
1689
 
        for (j = 0; j < i; j++)
 
1708
        for (j = 0; j < i; ++j)
1690
1709
        {
1691
1710
            rtl_layout.left_buttons[j] = new_layout.right_buttons[i - j - 1];
1692
1711
#ifdef HAVE_METACITY_2_23_2