diff options
| author | Ruben Undheim <ruben.undheim@gmail.com> | 2018-10-20 17:54:32 +0200 |
|---|---|---|
| committer | Ruben Undheim <ruben.undheim@gmail.com> | 2018-10-20 17:54:32 +0200 |
| commit | ca2442640f4394296d9d6b0c42d41d399dbf9667 (patch) | |
| tree | 879c0a6065d6982d5a82b35dc3ff67299e2ea7d9 /libraries.c | |
| parent | 04d5d0ea0f65a434e568fe031f6396caec9b3a8d (diff) | |
New upstream version 3.9.73+dfsg.1
Diffstat (limited to 'libraries.c')
| -rw-r--r-- | libraries.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libraries.c b/libraries.c index ce57086..7962d7b 100644 --- a/libraries.c +++ b/libraries.c @@ -42,7 +42,6 @@ /*-------------------------------------------------------------------------*/ extern Display *dpy; /* Works well to make this globally accessible */ -extern int *appcolors; extern Cursor appcursors[NUM_CURSORS]; extern Globaldata xobjs; extern XCWindowData *areawin; @@ -50,6 +49,8 @@ extern char _STR[150]; extern short fontcount; extern fontinfo *fonts; extern Boolean was_preselected; +extern int number_colors; +extern colorindex *colorlist; /*---------------------------------------------------------*/ /* Find the Helvetica font for use in labeling the objects */ @@ -647,7 +648,7 @@ void composepagelib(short mode) strptr->type = TEXT_STRING; strptr->data.string = (char *) malloc(1 + strlen(libobj->name)); strcpy(strptr->data.string, libobj->name); - (*pagelabel)->justify = TOP | NOTBOTTOM | NOTLEFT; + (*pagelabel)->anchor = TOP | NOTBOTTOM | NOTLEFT; } } @@ -894,14 +895,14 @@ void composelib(short mode) strptr->type = TEXT_STRING; strptr->data.string = strdup(libobj->name); - (*drawname)->justify = TOP | NOTBOTTOM | NOTLEFT; + (*drawname)->anchor = TOP | NOTBOTTOM | NOTLEFT; /* If the label is longer than the object width, then */ /* adjust positions accordingly. Note that as an ad- */ /* hoc spacing rule, a padding of 30 is put between */ /* objects; this padding is reduced to 5 */ - tmpext = ULength(*drawname, drawinst, 0, NULL); + tmpext = ULength(*drawname, drawinst, NULL); /* Ad-hoc spacing rule is 5 for labels */ tmpext.width += 5; @@ -1546,6 +1547,7 @@ void copycat() if (areawin->topinstance == xobjs.libtop[USERLIB]) drawarea(NULL, NULL, NULL); else startcatalog(NULL, (pointertype)USERLIB, NULL); + zoomview(NULL, NULL, NULL); } /*--------------------------------------------------------*/ @@ -1709,7 +1711,6 @@ void catalog_op(int op, int x, int y) if (newselect == areawin->selectlist + areawin->selects) { newselect = allocselect(); *newselect = newinst; - XcSetFunction(GXcopy); XcTopSetForeground(SELECTCOLOR); UDrawObject(*libobj, SINGLE, SELECTCOLOR, xobjs.pagelist[areawin->page]->wirewidth, NULL); |